Update change log and spec for wrt-plugins-tizen_0.4.76

Change-Id: Ib0b5c1a3e2d1d39fbae241f77e32d95b132cc776

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eef951..ec1fb51 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(
 # Determine the log option
 # -----------------------------------------------------------------------------
 
-OPTION(DPL_LOG "DPL logs status" ON)
+OPTION(DPL_LOG "DPL logs status" OFF)
 
 IF(DPL_LOG)
     MESSAGE(STATUS "Logging enabled for DPL")

diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index 24d493e..05f2074 100755 (executable)
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -1,6 +1,6 @@
 Name:       wrt-plugins-tizen
 Summary:    JavaScript plugins for WebRuntime
-Version:    0.4.75
+Version:    0.4.76
 Release:    0
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/Messaging/Conversation.cpp b/src/Messaging/Conversation.cpp
index 4a04bd6..effe4a3 100644 (file)
--- a/src/Messaging/Conversation.cpp
+++ b/src/Messaging/Conversation.cpp
@@ -40,7 +40,6 @@ Conversation::Conversation()
 
 Conversation::Conversation(unsigned int threadId, MessageType msgType)
 {
-       LoggerD("Enter");
        bool result = false;
        
        if (msgType == EMAIL)
@@ -705,12 +704,11 @@ bool Conversation::makeConversationFromMsgId(unsigned int msgId, MessageType msg
 
 bool Conversation::makeConversationFromEmailThreadId(unsigned int emailTreadId)
 {
-       LoggerD("Enter");
-       
        email_mail_list_item_t *resultMail = NULL;
        email_mail_list_item_t *mailList = NULL;
        int index = 0;
        int count = 0;
+       int err = 0;
 
        email_mail_data_t* mailData = NULL;
        m_result = true;
@@ -720,30 +718,41 @@ bool Conversation::makeConversationFromEmailThreadId(unsigned int emailTreadId)
                // Todo : will be re-implemented as using email_get_thread_information_ex 
                if(email_get_thread_information_ex(emailTreadId, &resultMail) != EMAIL_ERROR_NONE) 
                {
-                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "get email thread fail" );
+                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "email_get_thread_information_ex fail" );
                }
 
                if (!resultMail)
                {
-                       return NULL;
+                       m_result = false;
+                       ThrowMsg(WrtDeviceApis::Commons::NotFoundException, "email_get_thread_information_ex result is NULL" );
                }
 
                //get mail data
-               if (email_get_mail_data(resultMail->mail_id,&mailData) != EMAIL_ERROR_NONE)
+               err = email_get_mail_data(resultMail->mail_id,&mailData);
+               if (err != EMAIL_ERROR_NONE)
                {
-                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "get email data fail" );
+                       if(err == EMAIL_ERROR_MAIL_NOT_FOUND)
+                       {
+                               m_result = false;
+                               ThrowMsg(WrtDeviceApis::Commons::NotFoundException, "email_get_mail_data not found" );
+                       }
+                       LoggerD("email_get_mail_data failed " << resultMail->mail_id);
+                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "email_get_mail_data fail" );
                }
        
                // account Id
                m_unreadMessages = 0;
 
-               LoggerD("start email_get_mail_list");
-               if (email_get_mail_list(mailData->account_id, 0, emailTreadId, 0, resultMail->thread_item_count, 
-                       EMAIL_SORT_DATETIME_HIGH, &mailList, &count) != EMAIL_ERROR_NONE)
+               err = email_get_mail_list(mailData->account_id, 0, emailTreadId, 0, resultMail->thread_item_count, EMAIL_SORT_DATETIME_HIGH, &mailList, &count);
+               if ( err != EMAIL_ERROR_NONE)
                {
-                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "get email data fail" );
+                       if(err == EMAIL_ERROR_MAIL_NOT_FOUND)
+                       {
+                               m_result = false;
+                               ThrowMsg(WrtDeviceApis::Commons::NotFoundException, "email_get_mail_list not found" );
+                       }
+                       ThrowMsg(WrtDeviceApis::Commons::UnknownException, "email_get_mail_list fail" );
                }
-               LoggerD("end email_get_mail_list");
                
                // unread msg count
                for (index = 0; index < count; index++)
@@ -799,6 +808,23 @@ bool Conversation::makeConversationFromEmailThreadId(unsigned int emailTreadId)
                m_lastMessageId = resultMail->mail_id;
                m_result = true;
        }
+       catch (const WrtDeviceApis::Commons::NotFoundException& ex)
+       {
+               LoggerE("Exception: " << ex.GetMessage());
+               if (mailData != NULL)
+               {
+                       email_free_mail_data(&mailData , 1);
+               }
+               if (resultMail != NULL)
+               {
+                       free(resultMail);
+               }
+               if (mailList != NULL)
+               {
+                       free(mailList);
+               }
+               return !m_result;
+       }
        catch (const WrtDeviceApis::Commons::Exception& ex) 
        {
                m_result = false;
@@ -809,11 +835,14 @@ bool Conversation::makeConversationFromEmailThreadId(unsigned int emailTreadId)
        {
                email_free_mail_data(&mailData , 1);
        }
-       
        if (resultMail != NULL)
        {
                free(resultMail);
        }
+       if (mailList != NULL)
+       {
+               free(mailList);
+       }
 
        return m_result;
 

diff --git a/src/Messaging/JSConversation.cpp b/src/Messaging/JSConversation.cpp
index 61cdb03..62f39d6 100755 (executable)
--- a/src/Messaging/JSConversation.cpp
+++ b/src/Messaging/JSConversation.cpp
@@ -120,10 +120,6 @@ void JSConversation::initialize(JSContextRef context, JSObjectRef object)
        {
                LoggerD("Private data is null ");
        }
-       else
-       {
-               LoggerD("JSConversation::already exist ");
-       }
 }
 
 

diff --git a/src/Messaging/JSMessageFolder.cpp b/src/Messaging/JSMessageFolder.cpp
index c3e8a59..1805cba 100644 (file)
--- a/src/Messaging/JSMessageFolder.cpp
+++ b/src/Messaging/JSMessageFolder.cpp
@@ -122,10 +122,6 @@ void JSMessageFolder::initialize(JSContextRef context, JSObjectRef object)
        {
 
        }
-       else
-       {
-               LoggerD("JSMessageFolder::already exist ");
-       }
 }
 
 JSObjectRef JSMessageFolder::createJSObject(JSContextRef context, IMessageFolderPtr object)

diff --git a/src/Messaging/JSMessagingServiceManager.cpp b/src/Messaging/JSMessagingServiceManager.cpp
index 62ff869..06dae75 100644 (file)
--- a/src/Messaging/JSMessagingServiceManager.cpp
+++ b/src/Messaging/JSMessagingServiceManager.cpp
@@ -111,7 +111,6 @@ namespace Messaging {
         }
         else
         {
-            LoggerD("already exist");
             LoggerD("global context=" << priv->getContext());
         }
 

diff --git a/src/Messaging/Messaging.cpp b/src/Messaging/Messaging.cpp
index c9dbf6d..c45bda7 100644 (file)
--- a/src/Messaging/Messaging.cpp
+++ b/src/Messaging/Messaging.cpp
@@ -484,24 +484,13 @@ vector<IConversationPtr> Messaging::queryEmailConversation(const std::string& sq
                for(int i=0; i<mailListCount; i++){
                        if(mailList[i].mail_id != mailList[i].thread_id)
                        {
-                               LoggerD("skip mail");
-                               LoggerD("mailList[i].mail_id: " << mailList[i].mail_id);
-                               LoggerD("mailList[i].thread_id:" << mailList[i].thread_id);
+                               LoggerD("skip mail - mail_id : " << mailList[i].mail_id << " , thread_id : " << mailList[i].thread_id);
                                continue;
                        }
                        if (checkUnique.find(mailList[i].thread_id) == checkUnique.end()){
                                checkUnique.insert(mailList[i].thread_id);
                                IConversationPtr convPtr(new Conversation(mailList[i].thread_id, EMAIL));
 
-                               //TODO for debug
-                               LoggerD("mailList[i].thread_id:[" << mailList[i].thread_id << "]");
-                               LoggerD("mailList[i].full_address_from:[" << mailList[i].full_address_from << "]");
-                               LoggerD("mailList[i].email_address_sender : [" << mailList[i].email_address_sender <<"]");
-                               LoggerD("mailList[i].subject:[" << mailList[i].subject << "]");
-                               LoggerD("mailList[i].preview_text:[" << mailList[i].preview_text << "]");
-                               LoggerD("mailList[i].flags_seen_field:[" << mailList[i].flags_seen_field << "]");
-                               LoggerD("mailList[i].priority:[" << mailList[i].priority<< "]");
-
                                if (convPtr->getResult() == true)
                                {
                                        emailResultVector.push_back(convPtr);