summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkamaljeet <kamal.jc@samsung.com>2019-02-16 18:57:26 +0530
committerkamaljeet <kamal.jc@samsung.com>2019-02-16 18:57:26 +0530
commitb797d948a06f6b91718773606addda16b8f50bbd (patch)
tree896f65ec8e51a6356045bc93a3f9556a9ee13b08
parent0f5d63e576b502e752fc739df2c68b39f8229be9 (diff)
downloadmsg-service-b797d948a06f6b91718773606addda16b8f50bbd.tar.gz
msg-service-b797d948a06f6b91718773606addda16b8f50bbd.tar.bz2
msg-service-b797d948a06f6b91718773606addda16b8f50bbd.zip
Change-Id: I83a34434e2a340362ea5f660925e27ea764ae3f9 Signed-off-by: kamaljeet <kamal.jc@samsung.com>
-rwxr-xr-xframework/storage-handler/MsgStorageMessage.cpp5
-rw-r--r--utils/MsgCallStatusManager.cpp12
2 files changed, 9 insertions, 8 deletions
diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp
index 1957858..477d4b6 100755
--- a/framework/storage-handler/MsgStorageMessage.cpp
+++ b/framework/storage-handler/MsgStorageMessage.cpp
@@ -1752,10 +1752,7 @@ msg_error_t MsgStoMoveMessageToFolder(msg_message_id_t msgId, msg_folder_id_t de
memset(sqlQuery, 0x00, sizeof(sqlQuery));
- if (msgType.mainType == MSG_SMS_TYPE)
- snprintf(sqlQuery, sizeof(sqlQuery), "UPDATE %s SET FOLDER_ID = %d WHERE MSG_ID = %d;", MSGFW_MESSAGE_TABLE_NAME, destFolderId, msgId);
- else
- snprintf(sqlQuery, sizeof(sqlQuery), "UPDATE %s SET FOLDER_ID = %d WHERE MSG_ID = %d;", MSGFW_MESSAGE_TABLE_NAME, destFolderId, msgId);
+ snprintf(sqlQuery, sizeof(sqlQuery), "UPDATE %s SET FOLDER_ID = %d WHERE MSG_ID = %d;", MSGFW_MESSAGE_TABLE_NAME, destFolderId, msgId);
if (dbHandle->execQuery(sqlQuery) != MSG_SUCCESS)
return MSG_ERR_DB_EXEC;
diff --git a/utils/MsgCallStatusManager.cpp b/utils/MsgCallStatusManager.cpp
index 6a44693..2c79093 100644
--- a/utils/MsgCallStatusManager.cpp
+++ b/utils/MsgCallStatusManager.cpp
@@ -33,10 +33,14 @@ static void call_status_change_received(GDBusConnection *connection, const gchar
if (g_strcmp0(signal_name, CALL_MGR_MEMBER_NAME) == 0) {
g_variant_get(parameters, "(iis)", &call_status, NULL, NULL);
MSG_INFO("callStatus = [%d]", call_status);
- if (call_status == 0)
- MsgSettingSetInt(MSG_MESSAGE_DURING_CALL, 0); //call not active
- else
- MsgSettingSetInt(MSG_MESSAGE_DURING_CALL, 1); //call active ( call_status: 2 [Ringing], call_status: 1 [In call])
+ if (call_status == 0) {
+ if (MsgSettingSetInt(MSG_MESSAGE_DURING_CALL, 0) != 0)
+ MSG_FATAL("Fail to set value \n"); //call not active
+ }
+ else {
+ if (MsgSettingSetInt(MSG_MESSAGE_DURING_CALL, 1) != 0)
+ MSG_FATAL("Fail to set value \n"); //call active ( call_status: 2 [Ringing], call_status: 1 [In call])
+ }
}
}