resolve TSAM-4511: update IDS string for sending fail with network issue case

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

diff --git a/include/externals/MsgNotificationWrapper.h b/include/externals/MsgNotificationWrapper.h
index b4e7919..f7776ad 100755 (executable)
--- a/include/externals/MsgNotificationWrapper.h
+++ b/include/externals/MsgNotificationWrapper.h
@@ -38,7 +38,7 @@
 #define MESSAGE_RETRIEVED                                                              "IDS_MSGF_BODY_MESSAGE_RETRIEVED"
 #define SMS_MESSAGE_SENT                                                               "IDS_MSGC_POP_MESSAGESENT"
 #define SMS_MESSAGE_SENDING_FAIL                                       "IDS_MSGF_POP_SENDING_MESSAGE_FAILED"
-#define SMS_MESSAGE_SENDING_PENDING                                    "IDS_MSG_POP_UNABLE_TO_SEND_MESSAGE_IT_WILL_BE_SENT_WHEN_SERVICE_AVAILABLE"
+#define SMS_MESSAGE_SENDING_PENDING                                    "IDS_MSG_TPOP_NETWORK_NOT_AVAILABLE_MESSAGE_WILL_BE_SENT_WHEN_CONNECTED_TO_NETWORK"
 #define SMS_MESSAGE_SIM_MESSAGE_FULL                           "IDS_MSGF_BODY_SIM_MEMORY_FULL_DELETE_SOME_ITEMS"
 #define SMS_MESSAGE_MEMORY_FULL                        "IDS_MSGF_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS"
 #define SMS_FDN_RESTRICTED                             "IDS_MSGF_POP_FDN_ENABLED_CANT_SEND_MSG"
@@ -52,7 +52,7 @@
 #define MESSAGE_RETRIEVED                                                              "Message retrieved"
 #define SMS_MESSAGE_SENT                                                               "Message sent."
 #define SMS_MESSAGE_SENDING_FAIL                                       "Sending message failed."
-#define SMS_MESSAGE_SENDING_PENDING                                    "Unable to send message. It will be sent when service available."
+#define SMS_MESSAGE_SENDING_PENDING                                    "Network not available. Message will be sent when connected to network."
 #define SMS_MESSAGE_SIM_MESSAGE_FULL                           "SIM memory full. Delete some items."
 #define SMS_MESSAGE_MEMORY_FULL                        "Not enough memory. Delete some items."
 #define SMS_FDN_RESTRICTED                             "Unable to send the message while Fixed dialling mode is enabled."

diff --git a/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp b/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
index bb1457b..81ed75d 100755 (executable)
--- a/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
+++ b/plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
@@ -371,7 +371,7 @@ void SmsPluginTransport::submitRequest(sms_request_info_s *pReqInfo)
                if (retStatus == SMS_NETWORK_SEND_FAIL_FDN_RESTRICED)
                        MsgInsertTicker("Unable to send the message while Fixed dialling mode is enabled", SMS_FDN_RESTRICTED, true, 0);
                else if (retStatus == SMS_NETWORK_SEND_PENDING)
-                       MsgInsertTicker("Unable to send message. It will be sent when service available.", SMS_MESSAGE_SENDING_PENDING, true, 0);
+                       MsgInsertTicker("Network not available. Message will be sent when connected to network.", SMS_MESSAGE_SENDING_PENDING, true, 0);
                else
                        MsgInsertTicker("Sending SMS is failed", SMS_MESSAGE_SENDING_FAIL, true, pReqInfo->msgInfo.msgId);
        }

diff --git a/plugin/sms_plugin/SmsPluginTransport.cpp b/plugin/sms_plugin/SmsPluginTransport.cpp
index 0fa9936..c0501b7 100755 (executable)
--- a/plugin/sms_plugin/SmsPluginTransport.cpp
+++ b/plugin/sms_plugin/SmsPluginTransport.cpp
@@ -250,7 +250,7 @@ void SmsPluginTransport::submitRequest(SMS_REQUEST_INFO_S *pReqInfo)
                                if (svc_type < TAPI_NETWORK_SERVICE_TYPE_2G) {
                                        MSG_DEBUG("Network service is not available : [%d]", svc_type);
                                        SmsPluginEventHandler::instance()->handleSentStatus(MSG_NETWORK_SEND_PENDING);
-                                       MsgInsertTicker("Unable to send message. It will be sent when service available.", SMS_MESSAGE_SENDING_PENDING, false, 0);
+                                       MsgInsertTicker("Network not available. Message will be sent when connected to network.", SMS_MESSAGE_SENDING_PENDING, false, 0);
                                        goto _RETURN_FUNC;
                                }