From: Kyeonghun Lee Date: Fri, 23 Dec 2016 07:34:07 +0000 (+0900) Subject: fix coding convention X-Git-Tag: submit/tizen_3.0/20161226.023614~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed2d59344fb926a5a4e26905708da16f81b35453;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git fix coding convention Change-Id: I46695881179e8d6472116212cb082b0186651d23 Signed-off-by: Kyeonghun Lee --- diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp index 436b86c..71498da 100755 --- a/framework/storage-handler/MsgStorageMessage.cpp +++ b/framework/storage-handler/MsgStorageMessage.cpp @@ -1017,10 +1017,12 @@ msg_error_t MsgStoDeleteMessage(msg_message_id_t msgId, bool bCheckIndication) dbHandle->endTrans(true); /* Update Thread Callback */ - if (bCheckIndication == true && MsgExistConversation(dbHandle, convId) == true && MsgExistInThreadViewList(dbHandle, convId) == true) - MsgTransactionManager::instance()->broadcastThreadChangeCB(MSG_SUCCESS, MSG_STORAGE_CHANGE_UPDATE, convId); - else if (bCheckIndication == true) - MsgTransactionManager::instance()->broadcastThreadChangeCB(MSG_SUCCESS, MSG_STORAGE_CHANGE_DELETE, convId); + if (bCheckIndication == true) { + if (MsgExistConversation(dbHandle, convId) == true && MsgExistInThreadViewList(dbHandle, convId) == true) + MsgTransactionManager::instance()->broadcastThreadChangeCB(MSG_SUCCESS, MSG_STORAGE_CHANGE_UPDATE, convId); + else + MsgTransactionManager::instance()->broadcastThreadChangeCB(MSG_SUCCESS, MSG_STORAGE_CHANGE_DELETE, convId); + } if (msgType.mainType == MSG_SMS_TYPE && folderId == MSG_INBOX_ID) { msgType.classType = MSG_CLASS_NONE; diff --git a/framework/submit-handler/MsgSubmitHandler.cpp b/framework/submit-handler/MsgSubmitHandler.cpp index aba0c2d..1f48ce8 100755 --- a/framework/submit-handler/MsgSubmitHandler.cpp +++ b/framework/submit-handler/MsgSubmitHandler.cpp @@ -289,7 +289,7 @@ msg_error_t MsgSubmitReqMMS(MSG_REQUEST_INFO_S *pReqInfo) MsgStoSetReadReportSendStatus(pReqInfo->msgInfo.msgId, MMS_RECEIVE_READ_REPORT_SENT); if (err != MSG_SUCCESS) { - if(pReqInfo->msgInfo.msgType.subType == MSG_RETRIEVE_MMS ) + if(pReqInfo->msgInfo.msgType.subType == MSG_RETRIEVE_MMS) MsgStoUpdateNetworkStatus(dbHandle, &(pReqInfo->msgInfo), MSG_NETWORK_RETRIEVE_FAIL); else MsgStoUpdateNetworkStatus(dbHandle, &(pReqInfo->msgInfo), MSG_NETWORK_SEND_FAIL); diff --git a/framework/transaction-manager/MsgCmdHandlerTransport.cpp b/framework/transaction-manager/MsgCmdHandlerTransport.cpp index 9f5da09..90ffdc0 100755 --- a/framework/transaction-manager/MsgCmdHandlerTransport.cpp +++ b/framework/transaction-manager/MsgCmdHandlerTransport.cpp @@ -128,9 +128,9 @@ int MsgSubmitReqHandler(const MSG_CMD_S *pCmd, char **ppEvent) tm->setJavaMMSList(&trId); } - ret[0] = reqId; - ret[1] = reqInfo.msgInfo.msgId; - ret[2] = reqInfo.msgInfo.threadId; + ret[0] = reqId; + ret[1] = reqInfo.msgInfo.msgId; + ret[2] = reqInfo.msgInfo.threadId; /* Make Event Data */ eventSize = MsgMakeEvent(ret, sizeof(ret), MSG_EVENT_SUBMIT_REQ, err, (void**)ppEvent);