prevent issue.

Change-Id: I1f4bb9b8ce9e394ce2d4c0625daf69609d1e877b
Signed-off-by: Byounghui <byounghui.lim@samsung.com>

diff --git a/src/FMsgDetailedEmailMessage.cpp b/src/FMsgDetailedEmailMessage.cpp
index fc57553..248da2b 100644 (file)
--- a/src/FMsgDetailedEmailMessage.cpp
+++ b/src/FMsgDetailedEmailMessage.cpp
@@ -331,13 +331,8 @@ DetailedEmailMessage::SetFilePath(EmailMessageBodyType type, const Tizen::Base::
        isFileExist = File::IsFileExist(filePath);
 
        r = GetLastResult();
-       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_INVALID_ARG] Propagating.");
-
-       if (!isFileExist)
-       {
-               r = E_FILE_NOT_FOUND;
-               SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_FILE_NOT_FOUND] Propagating.");
-       }
+       SysTryCatch(NID_MSG, r == E_SUCCESS, r = E_INVALID_ARG , E_INVALID_ARG, "[E_INVALID_ARG] Propagating.");
+       SysTryCatch(NID_MSG, isFileExist == true, r = E_FILE_NOT_FOUND , E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] Propagating.");
 
        r = __pImpl->SetFilePath(type, filePath);
        return r;
@@ -480,13 +475,8 @@ DetailedEmailMessage::ParseMimeFile(const Tizen::Base::String& filePath, Detaile
        isFileExist = File::IsFileExist(filePath);
 
        r = GetLastResult();
-       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_INVALID_ARG] Propagating.");
-
-       if (!isFileExist)
-       {
-               r = E_FILE_NOT_FOUND;
-               SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_FILE_NOT_FOUND] Propagating.");
-       }
+       SysTryCatch(NID_MSG, r == E_SUCCESS, r = E_INVALID_ARG , E_INVALID_ARG, "[E_INVALID_ARG] Propagating.");
+       SysTryCatch(NID_MSG, isFileExist == true, r = E_FILE_NOT_FOUND , E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] Propagating.");
 
        r = _DetailedEmailMessageImpl::ParseMimeFile(filePath, message);
        return r;
@@ -510,13 +500,8 @@ DetailedEmailMessage::WriteToMimeFile(const DetailedEmailMessage& message, const
        isFileExist = File::IsFileExist(filePath);
 
        r = GetLastResult();
-       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_INVALID_ARG] Propagating.");
-
-       if (isFileExist)
-       {
-               r = E_FILE_ALREADY_EXIST;
-               SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_FILE_NOT_FOUND] Propagating.");
-       }
+       SysTryCatch(NID_MSG, r == E_SUCCESS, r = E_INVALID_ARG , E_INVALID_ARG, "[E_INVALID_ARG] Propagating.");
+       SysTryCatch(NID_MSG, isFileExist == false, r = E_FILE_ALREADY_EXIST , E_FILE_ALREADY_EXIST, "[E_FILE_ALREADY_EXIST] Propagating.");
 
        r = _DetailedEmailMessageImpl::WriteToMimeFile(message, filePath);
        return r;

diff --git a/src/FMsgEmailAttachment.cpp b/src/FMsgEmailAttachment.cpp
index e5f2ef1..5113543 100644 (file)
--- a/src/FMsgEmailAttachment.cpp
+++ b/src/FMsgEmailAttachment.cpp
@@ -158,13 +158,8 @@ EmailAttachment::SetFilePath(const Tizen::Base::String& filePath)
        isFileExist = File::IsFileExist(filePath);
 
        r = GetLastResult();
-       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_INVALID_ARG] Propagating.");
-
-       if (!isFileExist)
-       {
-               r = E_FILE_NOT_FOUND;
-               SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[E_FILE_NOT_FOUND] Propagating.");
-       }
+       SysTryCatch(NID_MSG, r == E_SUCCESS, r = E_INVALID_ARG , E_INVALID_ARG,"[E_INVALID_ARG] Propagating.");
+       SysTryCatch(NID_MSG, isFileExist == true, r = E_FILE_NOT_FOUND , E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] Propagating.");
 
        r = __pImpl->SetFilePath(filePath);
 

diff --git a/src/FMsg_MsgUtil.cpp b/src/FMsg_MsgUtil.cpp
index e84d934..eeeb393 100644 (file)
--- a/src/FMsg_MsgUtil.cpp
+++ b/src/FMsg_MsgUtil.cpp
@@ -1665,17 +1665,17 @@ _MsgUtil::SendEmail(const EmailMessage& message, const RecipientList& recipientL
        pMail->subject = _StringConverter::CopyToCharArrayN(message.GetSubject());
        
        r = AddEmailMessageBody(pMail,_StringConverter::CopyToCharArrayN(message.GetText()));
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "[%s] email add body failed", GetErrorMessage(r));       
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] email add body failed", GetErrorMessage(r));
        r = AddEmailMessageAddress(recipientList, RECIPIENT_TYPE_TO, pMail);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "[%s] email add recipient failed", GetErrorMessage(r));          
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] email add recipient failed", GetErrorMessage(r));
        r = AddEmailMessageAddress(recipientList, RECIPIENT_TYPE_CC, pMail);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "[%s] email add recipient failed", GetErrorMessage(r));  
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] email add recipient failed", GetErrorMessage(r));
        r = AddEmailMessageAddress(recipientList, RECIPIENT_TYPE_BCC, pMail);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "[%s] email add recipient failed", GetErrorMessage(r));  
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] email add recipient failed", GetErrorMessage(r));
 
 
        r = AddEmailMessageAttachment(message, &pAttach, pMail);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "[%s] email add recipient failed", GetErrorMessage(r));  
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] email add recipient failed", GetErrorMessage(r));
 
 
        if( null != pAttach)
@@ -1688,11 +1688,11 @@ _MsgUtil::SendEmail(const EmailMessage& message, const RecipientList& recipientL
        }
 
        r = _MsgUtil::EmailConvertException(err);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "To make email body is failed."); 
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] To make email body is failed.", GetErrorMessage(r));
 
        err = email_send_mail(pMail->mail_id, &requestId);
        r = _MsgUtil::EmailConvertException(err);
-       SysTryReturnResult(NID_MSG, r == E_SUCCESS, r, "The sent mail is failed."); 
+       SysTryCatch(NID_MSG, r == E_SUCCESS, , r, "[%s] The sent mail is failed.", GetErrorMessage(r));
 
        mailId = pMail->mail_id;
 
@@ -1731,8 +1731,8 @@ _MsgUtil::SendEmail(const EmailMessage& message, const RecipientList& recipientL
        }
        email_free_mail_data(&pMail, 1);
        email_free_mailbox(&pMailbox, 1);
+       email_free_account(&pAccount, 1); 
        email_service_end();
-
        return r;
 
 CATCH:
@@ -1769,8 +1769,8 @@ CATCH:
        }
        email_free_mail_data(&pMail, 1);
        email_free_mailbox(&pMailbox, 1);
+       email_free_account(&pAccount, 1); 
        email_service_end();
-
        return r;
 }