wrt-plugins-tizen_0.4.23

[framework/web/wrt-plugins-tizen.git] / src / Messaging / MailSender.cpp

diff --git a/src/Messaging/MailSender.cpp b/src/Messaging/MailSender.cpp
index 521e8a3..adc8a83 100644 (file)
--- a/src/Messaging/MailSender.cpp
+++ b/src/Messaging/MailSender.cpp
@@ -22,7 +22,6 @@
 #include <email-api-init.h>
 #include <email-api-account.h>
 
-#include <dpl/log/log.h>
 #include <dpl/assert.h>
 #include <Commons/Exception.h>
 #include <Commons/ThreadPool.h>
@@ -33,6 +32,7 @@
 #include "MailSender.h"
 #include "NetworkStatus.h"
 #include "Messaging.h"
+#include <Logger.h>
 
 namespace {
 const char* DBUS_FILTER_NETWORK_STATUS =
@@ -55,7 +55,7 @@ int MailSender::send(const IEmailPtr& mail)
     Assert(mail && "Mail must not be NULL.");
 
     int mailId = mail->convertId(mail->getIdRef());
-    LogDebug("send mailId = " << mailId);
+    LoggerD("send mailId = " << mailId);
     SendRequestsIterator it = m_requests.find(mailId);
     if (m_requests.end() != it) {
         ThrowMsg(WrtDeviceApis::Commons::PlatformException,
@@ -71,7 +71,7 @@ void MailSender::cancel(int handle)
     if (m_requests.end() == it) {
         //ThrowMsg(WrtDeviceApis::Commons::PlatformException,
         //         "Email handle : " << handle << " not found.");
-        LogDebug("Email handle" << handle  << " not found!");
+        LoggerD("Email handle" << handle  << " not found!");
          return;
     }
     else
@@ -83,10 +83,10 @@ void MailSender::cancel(int handle)
 // TODO Copied from former solution, refactor it.
 void MailSender::OnEventReceived(const DBus::MessageEvent& event)
 {
-    LogDebug("enter");
+    LoggerD("enter");
     NetworkStatusPtr msg(new NetworkStatus(event.GetArg0()));
     int mailId = msg->getMailId();
-    LogDebug("status : " << msg->getStatus() << " mailId : " << mailId);
+    LoggerD("status : " << msg->getStatus() << " mailId : " << mailId);
     int handle = 0;
 
     if ( msg->getStatus() == NOTI_SEND_FINISH || msg->getStatus() == NOTI_SEND_FAIL)
@@ -98,37 +98,37 @@ void MailSender::OnEventReceived(const DBus::MessageEvent& event)
                        if ( it->second.mail->getUID() == mailId)
                        {
                                handle = it->first;
-                               LogDebug("handle : " << handle);
+                               LoggerD("handle : " << handle);
                                break;
                        }
                }
 
                if (msg->getStatus() == NOTI_SEND_FAIL)
                {
-                       LogDebug(" Error Code : " << msg->getErrorCode());
+                       LoggerD(" Error Code : " << msg->getErrorCode());
                }
     }
     else 
     {
                if ( msg->getStatus() == NOTI_SEND_START )
                {
-                       LogDebug("NOTI_SEND_START");
+                       LoggerD("NOTI_SEND_START");
                }
                else if ( msg->getStatus() == NOTI_SEND_CANCEL )
                {
-                       LogDebug("NOTI_SEND_CANCEL");
+                       LoggerD("NOTI_SEND_CANCEL");
                }
 
                return ;
     }
        
-    LogDebug("handle : " << handle);
+    LoggerD("handle : " << handle);
        
     SendRequestsIterator it = m_requests.find(handle); //find reqeuset
     if (m_requests.end() != it) {
         switch (msg->getStatus()) {
         case NOTI_SEND_START:
-            LogInfo("Start sending e-mail: " << mailId);
+            LoggerI("Start sending e-mail: " << mailId);
             break;
 
         case NOTI_SEND_FINISH:
@@ -157,7 +157,7 @@ void MailSender::OnEventReceived(const DBus::MessageEvent& event)
                 
             }
                 mail->setMessageStatus(MESSAGE_STATUS_SENT);
-            LogInfo("E-mail sent: " << mailId);
+            LoggerI("E-mail sent: " << mailId);
             m_requests.erase(mailId);
             break;
         }
@@ -205,7 +205,7 @@ void MailSender::OnEventReceived(const DBus::MessageEvent& event)
             }
                 mail->setMessageStatus(MESSAGE_STATUS_FAILED);
                 
-            LogInfo("Sending e-mail: " << mailId <<
+            LoggerI("Sending e-mail: " << mailId <<
                     " failed with error: " << msg->getErrorCode());
             m_requests.erase(mailId);
             break;
@@ -218,7 +218,7 @@ MailSender::MailSender() :
     m_dbusThread(new DPL::Thread()),
     m_dbus(new DBus::Connection())
 {
-    LogDebug("enter");
+    LoggerD("enter");
     m_dbusThread->Run();
 
     m_dbus->setWorkerThread(m_dbusThread.Get());
@@ -231,16 +231,16 @@ MailSender::MailSender() :
 
     //start email service
        if (EMAIL_ERROR_NONE == email_service_begin()) {
-           LogDebug("Email service Begin\n");
+           LoggerD("Email service Begin\n");
            if (EMAIL_ERROR_NONE == email_open_db()) {
-                   LogDebug("Email open DB success\n");
+                   LoggerD("Email open DB success\n");
            }
            else{
-                   LogDebug("Email open DB failed\n");
+                   LoggerD("Email open DB failed\n");
        }
        }
        else{
-           LogDebug("Email service not started\n");
+           LoggerD("Email service not started\n");
        }
 
 }
@@ -255,16 +255,16 @@ MailSender::~MailSender()
 
     //close email service
        if (EMAIL_ERROR_NONE == email_close_db()) {
-               LogDebug("Email Close DB Success\n");
+               LoggerD("Email Close DB Success\n");
                if (EMAIL_ERROR_NONE == email_service_end()){
-               LogDebug("Email service close Success\n");
+               LoggerD("Email service close Success\n");
                }
                else{
-               LogDebug("Email service end failed\n");
+               LoggerD("Email service end failed\n");
        }
        }
        else{
-               LogDebug("Email Close DB failed\n");
+               LoggerD("Email Close DB failed\n");
        }
        
 }
@@ -281,7 +281,7 @@ int MailSender::sendInternal(const IEmailPtr& mail)
                                 &email_handle);
        
     if (EMAIL_ERROR_NONE != error) {
-               LogDebug("Send Fail error = " << error );
+               LoggerD("Send Fail error = " << error );
                m_requests.erase(mailId);
                mail->setMessageStatus(MESSAGE_STATUS_SENDING); 
                ThrowMsg(WrtDeviceApis::Commons::PlatformException,
@@ -293,7 +293,7 @@ int MailSender::sendInternal(const IEmailPtr& mail)
                m_requests.insert(std::make_pair(email_handle, SendRequestData(email_handle, mail)));
     }
 
-    LogDebug("emf Handle : " << email_handle 
+    LoggerD("emf Handle : " << email_handle 
 << "requests size :" << m_requests.size() );
   
     return email_handle;