From: Byounghui <byounghui.lim@samsung.com>
Date: Tue, 2 Apr 2013 16:23:43 +0000 (+0900)
Subject: fixed tc fail.
X-Git-Tag: accepted/tizen_2.1/20130425.034728~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e46ab1b20711e85c09a91a353356c759cf08b4c;p=framework%2Fosp%2Fmessaging.git

fixed tc fail.

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

diff --git a/src/FMsg_DetailedEmailMessageImpl.cpp b/src/FMsg_DetailedEmailMessageImpl.cpp
index c7e1f61..8285766 100644
--- a/src/FMsg_DetailedEmailMessageImpl.cpp
+++ b/src/FMsg_DetailedEmailMessageImpl.cpp
@@ -875,6 +875,7 @@ _DetailedEmailMessageImpl::WriteToMimeFile(const DetailedEmailMessage& message,
 
 	ClearLastResult();
 
+	email_service_begin();
 	pEmlFilePath = _StringConverter::CopyToCharArrayN(filePath);
 	SysTryCatch(NID_MSG, pEmlFilePath != null, r = E_OUT_OF_MEMORY, r, "memory allocation failed.");
 
diff --git a/src/FMsg_SmsMmsCallbackHandler.cpp b/src/FMsg_SmsMmsCallbackHandler.cpp
index f08dbce..d3711dc 100644
--- a/src/FMsg_SmsMmsCallbackHandler.cpp
+++ b/src/FMsg_SmsMmsCallbackHandler.cpp
@@ -167,8 +167,33 @@ _SmsMmsCallbackHandler::AddCbsChannel(int from, int to, Tizen::Base::String& nam
 {
 	int err = MSG_SUCCESS;
 	result r = E_SUCCESS;
-	CbsChannel* pCbsChannel = NULL;
+	CbsChannel* pCbsChannel = null;
+	int fromId = 0;
+	int toId = 0;
+	bool channelFound = false;
+	SysLog(NID_MSG, "AddCbsChannel from %d to %d name %s activate %d ",from, to, name.GetPointer(), activate);
+
+	for (int index = 0; index < __pTempCbsChannelList->GetCount(); index++)
+	{
+		CbsChannel* pCbsChannel = null;
+		pCbsChannel = dynamic_cast< Tizen::Messaging::CbsChannel* >(__pTempCbsChannelList->GetAt(index));
+		SysTryReturn(NID_MSG, pCbsChannel != null, r = E_SYSTEM, E_SYSTEM, "Failed to get the channel.");
+
+		pCbsChannel->GetRange(fromId, toId);
+		if (from == fromId && to == toId && pCbsChannel->GetName() == name)
+		{
+			channelFound = true;
+			_CbsChannelImpl::GetInstance(*pCbsChannel)->SetCbsChannelState(activate);
+			break;  // found channel to be updated.
+		}
+
+		
+	}
+
 
+	if (!channelFound)
+	{
+		CbsChannel* pCbsChannel = null;
 	pCbsChannel = _CbsChannelImpl::GetCbsChannelN(from, to, name);
 	SysTryReturn(NID_MSG, pCbsChannel != null, r = E_SYSTEM, E_SYSTEM, "Failed to get the channel.");
 
@@ -176,12 +201,15 @@ _SmsMmsCallbackHandler::AddCbsChannel(int from, int to, Tizen::Base::String& nam
 	{
 		_CbsChannelImpl::GetInstance(*pCbsChannel)->SetCbsChannelState(activate);
 	}
-
 	r =__pTempCbsChannelList->Add(*pCbsChannel);
+		SysTryReturn(NID_MSG,r == E_SUCCESS, r = E_SYSTEM, E_SYSTEM, "Failed to set the channel.");
+
+	}
+
 
-	err = SaveCbsSettings();
-	r = ConvertException(err);
 
+
+	r = SaveCbsSettings();
 	return r;
 }
 
@@ -194,6 +222,7 @@ _SmsMmsCallbackHandler::RemoveCbsChannel(int from, int to)
 	int toId = 0;
 	bool channelFound = false;
 	CbsChannel* pCbsChannel = NULL;
+	SysLog(NID_MSG, "RemoveCbsChannel from %d %d ",from, to);
 
 	for (int index = 0; index < __pTempCbsChannelList->GetCount(); index++)
 	{
@@ -205,18 +234,19 @@ _SmsMmsCallbackHandler::RemoveCbsChannel(int from, int to)
 		{
 			channelFound = true;  // found channel to be removed.
 			__pTempCbsChannelList->RemoveAt(index);
-
-			err = SaveCbsSettings();
-			r = ConvertException(err);
+			index--;
 			delete pCbsChannel;
-			break;
+
 		}
 	}
 
+
         if (!channelFound)
 	{
 		return E_OBJ_NOT_FOUND;
 	}
+	r = SaveCbsSettings();
+	SysTryReturn(NID_MSG, r == E_SUCCESS, r = E_SYSTEM, E_SYSTEM, "Failed to remove the channel.");
 
 	return r;
 }
@@ -229,6 +259,7 @@ _SmsMmsCallbackHandler::SearchCbsChannel(int from, int to, int& index)
 	int toId = 0;
 	bool channelFound = false;
 	CbsChannel* pCbsChannel = NULL;
+	SysLog(NID_MSG, "SearchCbsChannel from %d %d ",from, to);
 
 	for (int tempIndex = 0; tempIndex < __pTempCbsChannelList->GetCount(); tempIndex++)
 	{
@@ -260,17 +291,20 @@ _SmsMmsCallbackHandler::UpdateCbsChannel(int from, int to, Tizen::Base::String n
 	int fromId = 0;
 	int toId = 0;
 	bool channelFound = false;
+	int index = 0;
 	CbsChannel* pCbsChannel = NULL;
+	SysLog(NID_MSG, "UpdateCbsChannel from %d to %d name %s activate %d ",from, to, name.GetPointer(), activate);
 
-	for (int index = 0; index < __pTempCbsChannelList->GetCount(); index++)
+	for (int i = 0; i < __pTempCbsChannelList->GetCount(); i++)
 	{
-		pCbsChannel = dynamic_cast< Tizen::Messaging::CbsChannel* >(__pTempCbsChannelList->GetAt(index));
+		pCbsChannel = dynamic_cast< Tizen::Messaging::CbsChannel* >(__pTempCbsChannelList->GetAt(i));
 		SysTryReturn(NID_MSG, pCbsChannel != null, r = E_SYSTEM, E_SYSTEM, "Failed to get the channel.");
 
 		pCbsChannel->GetRange(fromId, toId);
 		if (from == fromId && to == toId)
 		{
 			channelFound = true;
+			index = i;
 			break;  // found channel to be updated.
 		}
 	}
@@ -291,9 +325,13 @@ _SmsMmsCallbackHandler::UpdateCbsChannel(int from, int to, Tizen::Base::String n
 	{
 		_CbsChannelImpl::GetInstance(*pCbsChannel)->SetCbsChannelState(false);
 	}
+	//For changing to latest 
+	__pTempCbsChannelList->RemoveAt(index);
+	__pTempCbsChannelList->Add(*pCbsChannel);	
+
+	r = SaveCbsSettings();
+	SysTryReturn(NID_MSG, r == E_SUCCESS, r = E_SYSTEM, E_SYSTEM, "Failed to save the channel.");
 
-	err = SaveCbsSettings();
-	r = ConvertException(err);
 	return r;
 }