[TNEXT-639] block codes related with group message feature

Change-Id: Ica32c4b2e342a245963137270a10769e1d57f7db
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>

diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp
index e5e9ce4..9864e58 100755 (executable)
--- a/framework/storage-handler/MsgStorageMessage.cpp
+++ b/framework/storage-handler/MsgStorageMessage.cpp
@@ -2157,6 +2157,7 @@ msg_error_t MsgStoGetMessage(msg_message_id_t msgId, MSG_MESSAGE_INFO_S *pMsg, M
 
        dbHandle->finalizeQuery();
 
+#if 0 /* This block will be activated after find way to get own number with any SIMs */
        if (pMsg->msgType.mainType == MSG_MMS_TYPE && pMsg->networkStatus == MSG_NETWORK_RETRIEVE_SUCCESS) {
                /* get recipients information. */
                MsgStoGetRecipientsByMsgId(dbHandle, pMsg->msgId, &pMsg->nAddressCnt, &pMsg->addressList);
@@ -2164,7 +2165,10 @@ msg_error_t MsgStoGetMessage(msg_message_id_t msgId, MSG_MESSAGE_INFO_S *pMsg, M
                /* get address information. */
                MsgStoGetAddressByMsgId(dbHandle, pMsg->msgId, &pMsg->nAddressCnt, &pMsg->addressList);
        }
-
+#else
+       /* get address information. */
+       MsgStoGetAddressByMsgId(dbHandle, pMsg->msgId, &pMsg->nAddressCnt, &pMsg->addressList);
+#endif
        /* Get MMS body if it is MMS. */
        if ((pMsg->networkStatus == MSG_NETWORK_RETRIEVE_SUCCESS &&
                        (pMsg->msgType.subType == MSG_RETRIEVE_MMS || pMsg->msgType.subType == MSG_RETRIEVE_AUTOCONF_MMS || pMsg->msgType.subType == MSG_RETRIEVE_MANUALCONF_MMS)) ||

diff --git a/plugin/mms_plugin/MmsPluginInternal.cpp b/plugin/mms_plugin/MmsPluginInternal.cpp
index 95ed6a1..f50d68d 100755 (executable)
--- a/plugin/mms_plugin/MmsPluginInternal.cpp
+++ b/plugin/mms_plugin/MmsPluginInternal.cpp
@@ -626,7 +626,7 @@ void MmsPluginInternal::processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTra
                addr_cnt++;
                iter = iter->pNext;
        }
-
+#if 0 /* This block will be activated after find way to get own number with any SIMs */
        iter = mmsHeader.pTo;
        while (iter) {
                MmsAddrUtilRemovePlmnString(iter->szAddr);
@@ -644,7 +644,7 @@ void MmsPluginInternal::processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTra
                        addr_cnt++;
                iter = iter->pNext;
        }
-
+#endif
        MSG_ADDRESS_INFO_S *recipients_addr_info = NULL;
        if (recipients_cnt > 0) {
                recipients_addr_info = (MSG_ADDRESS_INFO_S *)new char[sizeof(MSG_ADDRESS_INFO_S)*recipients_cnt];
@@ -667,7 +667,7 @@ void MmsPluginInternal::processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTra
                        __fillAddressInfo(&(pMsgInfo->addressList[0]), mmsHeader.pFrom->szAddr, MSG_RECIPIENTS_TYPE_UNKNOWN);
                        __fillAddressInfo(&recipients_addr_info[0], mmsHeader.pFrom->szAddr, MSG_RECIPIENTS_TYPE_UNKNOWN);
                }
-
+#if 0 /* This block will be activated after find way to get own number with any SIMs */
                int addr_idx = 0;
                int recipients_idx = 0;
                if (mmsHeader.pTo) {
@@ -697,6 +697,7 @@ void MmsPluginInternal::processRetrieveConf(MSG_MESSAGE_INFO_S *pMsgInfo, mmsTra
                                iter = iter->pNext;
                        }
                }
+#endif
        }
 
        MSG_SEC_DEBUG("%d, MMS Receive %s End %s->%s %s", pMsgInfo->msgId