wrt-plugins-tizen_0.4.23

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

diff --git a/src/SecureElement/SESession.cpp b/src/SecureElement/SESession.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 5ecf8e8..ff69b86
--- a/src/SecureElement/SESession.cpp
+++ b/src/SecureElement/SESession.cpp
@@ -18,12 +18,12 @@
 
 
 #include <Ecore.h>
-#include <dpl/log/log.h>
 
 #include <Commons/Exception.h>
 #include <JSTizenException.h>
 #include "SESession.h"
 #include "SEUtil.h"
+#include <Logger.h>
 
 
 using namespace WrtDeviceApis;
@@ -34,7 +34,7 @@ namespace SecureElement {
 namespace
 {
        static void openChannelCallback(Channel *channel, int error, void *userData) {
-               LogDebug("Callback openChannelCallback.");
+               LoggerD("Callback openChannelCallback.");
                if (userData) {
                        SESession *seSessionPtr = (SESession *)((EventSEPtrs<EventSEOpenChannel> *)userData)->getThisPtr();
                        if (seSessionPtr) {
@@ -42,14 +42,14 @@ namespace
                                seSessionPtr->openChannelManualAnswer((void *)channel, error, event);
                        }
                } else {
-                       LogError("Callback private data is NULL.");
+                       LoggerE("Callback private data is NULL.");
                }
        }
 }//private namespace
 
 SESession::SESession(void *session)
 {
-       LogDebug("entered");
+       LoggerD("entered");
 
        if (session == NULL)
                ThrowMsg(Commons::UnknownException, "SecureElement Handler is Null Pointer.");
@@ -59,36 +59,36 @@ SESession::SESession(void *session)
 
 SESession::~SESession()
 {
-       LogDebug("entered");
+       LoggerD("entered");
        if (!isClosed())
                close();
        m_session = NULL;
 }
 
 bool SESession::isClosed() {
-       LogDebug("Enter" << m_session->isClosed());
+       LoggerD("Enter" << m_session->isClosed());
        return m_session->isClosed();
 }
 
 std::vector<unsigned char> SESession::getATR() {
-       LogDebug("Enter");
+       LoggerD("Enter");
        ByteArray atrByteArray = m_session->getATRSync();
        SEUtil util;
        return util.toVector(atrByteArray.getBuffer(), atrByteArray.getLength());
 }
 
 void SESession::close() {
-       LogDebug("Enter");
+       LoggerD("Enter");
        m_session->closeSync();
 }
 
 void SESession::closeChannels() {
-       LogDebug("Enter");
+       LoggerD("Enter");
        m_session->closeChannels();
 }
 
 void SESession::openChannel(const EventSEOpenChannelPtr& event) {
-       LogDebug("Enter");
+       LoggerD("Enter");
        EventRequestReceiver<EventSEOpenChannel>::PostRequest(event);
 }
 
@@ -113,14 +113,14 @@ void SESession::openChannelManualAnswer(void * channel, int error, const EventSE
        for (it = EventSEOpenChannels.begin(); it != EventSEOpenChannels.end(); ++it) {
                if ((*it)->getEventPtrs() == event) {
                        EventSEOpenChannels.erase(it);
-                       LogDebug("event is removed. (" << EventSEOpenChannels.size() << ")");
+                       LoggerD("event is removed. (" << EventSEOpenChannels.size() << ")");
                        break;
                }
        }
 }
 
 void SESession::OnRequestReceived(const EventSEOpenChannelPtr& event) {
-       LogDebug("Enter");
+       LoggerD("Enter");
        
        try {
                event->switchToManualAnswer();
@@ -138,7 +138,7 @@ void SESession::OnRequestReceived(const EventSEOpenChannelPtr& event) {
                if (channelAid)
                        free(channelAid);
        } catch (const WrtDeviceApis::Commons::Exception& ex) {
-               LogError("Exception: " << ex.GetMessage());
+               LoggerE("Exception: " << ex.GetMessage());
                event->setResult(false);
                event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");