wrt-plugins-tizen_0.4.23

[framework/web/wrt-plugins-tizen.git] / src / SecureElement / JSSESession.cpp

diff --git a/src/SecureElement/JSSESession.cpp b/src/SecureElement/JSSESession.cpp
old mode 100755 (executable)
new mode 100644 (file)
index ec0230b..29cae58
--- a/src/SecureElement/JSSESession.cpp
+++ b/src/SecureElement/JSSESession.cpp
@@ -15,8 +15,6 @@
 // limitations under the License.
 //
 
-
-#include <dpl/log/log.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/Validator.h>
 #include <Commons/Exception.h>
@@ -35,7 +33,7 @@
 #include "SEConverter.h"
 #include "SEAsyncCallbackManager.h"
 #include "plugin_config.h"
-
+#include <Logger.h>
 
 using namespace DeviceAPI::Common;
 using namespace WrtDeviceApis::Commons;
@@ -88,7 +86,7 @@ JSClassRef JSSESession::m_jsClassRef = JSClassCreate(JSSESession::getClassInfo()
 JSValueRef JSSESession::getProperty(JSContextRef context, JSObjectRef object,
         JSStringRef propertyName, JSValueRef* exception)
 {
-       LogDebug("Enter");
+       LoggerD("Enter");
 
        Try     {
                Converter convert(context);
@@ -103,22 +101,22 @@ JSValueRef JSSESession::getProperty(JSContextRef context, JSObjectRef object,
                        return convert.toJSValueRef(seSession->isClosed());
                }
        } Catch (ConversionException) {
-               LogError("ConversionException: " << _rethrown_exception.GetMessage());
+               LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
        } Catch (NullPointerException) {
-               LogError("NullPointerException: " << _rethrown_exception.GetMessage());
+               LoggerE("NullPointerException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::UnknownException) {
-               LogError("UnknownExceptionException: " << _rethrown_exception.GetMessage());
+               LoggerE("UnknownExceptionException: " << _rethrown_exception.GetMessage());
        } Catch (PlatformException) {
-               LogError("PlatformExceptionException: " << _rethrown_exception.GetMessage());
+               LoggerE("PlatformExceptionException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
     return JSValueMakeUndefined(context);
 }
 
 JSObjectRef JSSESession::createJSObject(JSContextRef context, void *session) {
-       LogDebug("entered");
+       LoggerD("entered");
 
        ISESessionPtr seSession = SEFactory::getInstance().createSESessionObject(session);
        
@@ -137,10 +135,10 @@ void JSSESession::initialize(JSContextRef context, JSObjectRef object)
 
 void JSSESession::finalize(JSObjectRef object)
 {
-       LogDebug( "entered" );
+       LoggerD( "entered" );
        SESessionPrivObject *priv = static_cast<SESessionPrivObject*>( JSObjectGetPrivate( object ) ) ;
        JSObjectSetPrivate(object, NULL);
-       LogDebug("Deleting SecureElement object");
+       LoggerD("Deleting SecureElement object");
        delete priv;
 }
 
@@ -179,7 +177,7 @@ JSValueRef JSSESession::getATR(JSContextRef context,
        Try {
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
-                       LogError("private object is null");
+                       LoggerE("private object is null");
                        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
@@ -187,7 +185,7 @@ JSValueRef JSSESession::getATR(JSContextRef context,
                SEConverter convert(context);
                return convert.toJSValueRef(seSession->getATR());
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
 }
@@ -205,7 +203,7 @@ JSValueRef JSSESession::close(JSContextRef context,
        Try {
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
-                       LogError("private object is null");
+                       LoggerE("private object is null");
                        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
@@ -213,7 +211,7 @@ JSValueRef JSSESession::close(JSContextRef context,
                seSession->close();
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
 }
@@ -231,7 +229,7 @@ JSValueRef JSSESession::closeChannels(JSContextRef context,
        Try {
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
-                       LogError("private object is null");
+                       LoggerE("private object is null");
                        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
@@ -239,7 +237,7 @@ JSValueRef JSSESession::closeChannels(JSContextRef context,
                seSession->closeChannels();
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
 }
@@ -251,14 +249,14 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
         const JSValueRef arguments[],
         JSValueRef* exception)
 {
-       LogDebug("Entered ");
+       LoggerD("Entered ");
 
     AceSecurityStatus status = SECURE_ELEMENT_CHECK_ACCESS(SECUREELEMENT_FUNCTION_API_FUNCS);
     TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
        if ((argumentCount < 2) || JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0]) || !JSIsArrayValue(context, arguments[0])) {
                /* 1st argument is mandatory. And 1st argument must be Array. */
-               LogError("AID TypeMismatchException!");
+               LoggerE("AID TypeMismatchException!");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
@@ -276,13 +274,13 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
                        onErrorForCbm = arguments[2];
                }
        } catch (const BasePlatformException &err) {
-        LogError(err.getName() << ": " << err.getMessage());
+        LoggerE(err.getName() << ": " << err.getMessage());
         return JSWebAPIException::throwException(context, exception, err);
     }
 
        SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
-               LogError("private object is null");
+               LoggerE("private object is null");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
@@ -292,7 +290,7 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
        Try {
                std::vector<unsigned char> aid = convert.toVectorOfUChars(arguments[0]);
                if ((aid.size() < 5) || (aid.size() > 16)) {
-                       LogError("wrong aid length : " << aid.size());
+                       LoggerE("wrong aid length : " << aid.size());
                        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Wrong AID length");
                }
                EventSEOpenChannelPtr event(new EventSEOpenChannel(aid, true));
@@ -305,12 +303,12 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
 
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
-               LogError("ConversionException");
+               LoggerE("ConversionException");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
-               LogError("UnknownException: " << _rethrown_exception.GetMessage());
+               LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
@@ -324,14 +322,14 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
         const JSValueRef arguments[],
         JSValueRef* exception)
 {
-       LogDebug("Entered ");
+       LoggerD("Entered ");
 
     AceSecurityStatus status = SECURE_ELEMENT_CHECK_ACCESS(SECUREELEMENT_FUNCTION_API_FUNCS);
     TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
        if ((argumentCount < 2) || JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0]) || !JSIsArrayValue(context, arguments[0])) {
                /* 1st argument is mandatory. And 1st argument must be Array. */
-               LogError("AID TypeMismatchException!");
+               LoggerE("AID TypeMismatchException!");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
@@ -349,13 +347,13 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
                        onErrorForCbm = arguments[2];
                }
        } catch (const BasePlatformException &err) {
-        LogError(err.getName() << ": " << err.getMessage());
+        LoggerE(err.getName() << ": " << err.getMessage());
         return JSWebAPIException::throwException(context, exception, err);
     }
 
        SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
-               LogError("private object is null");
+               LoggerE("private object is null");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
@@ -365,7 +363,7 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
        Try {
                std::vector<unsigned char> aid = convert.toVectorOfUChars(arguments[0]);
                if ((aid.size() < 5) || (aid.size() > 16)) {
-                       LogError("wrong aid length : " << aid.size());
+                       LoggerE("wrong aid length : " << aid.size());
                        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Wrong AID length");
                }
                EventSEOpenChannelPtr event(new EventSEOpenChannel(aid, false));
@@ -378,12 +376,12 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
 
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
-               LogError("ConversionException");
+               LoggerE("ConversionException");
                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
-               LogError("UnknownException: " << _rethrown_exception.GetMessage());
+               LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));