commit 13848bd88f29a358d13c2ce49f5c90c5858296f2
author Tom Taylor <tomtaylor@google.com> Tue Aug 03 10:23:24 2010 -0700
committer Tom Taylor <tomtaylor@google.com> Tue Aug 03 10:23:24 2010 -0700
tree ee9545eeef06cd946f0854294d9942e20730bdd4
parent 80730e85d35d6e08d72145f56ca432c83f840055

Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user. Bug 2885780.

Change-Id: Ic2ba789c24a9ed0842c51102c2e424ce1a2d9905

src/com/android/mms/transaction/SmsReceiverService.java

diff --git a/src/com/android/mms/transaction/SmsReceiverService.java b/src/com/android/mms/transaction/SmsReceiverService.java
index 3e2dd61..4cc86cb 100755
--- a/src/com/android/mms/transaction/SmsReceiverService.java
+++ b/src/com/android/mms/transaction/SmsReceiverService.java
@@ -235,6 +235,8 @@
                     } catch (MmsException e) {
                         Log.e(TAG, "sendFirstQueuedMessage: failed to send message " + msgUri
                                 + ", caught ", e);
+                        mSending = false;
+                        messageFailedToSend(msgUri, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
                         success = false;
                     }
                 }
@@ -292,17 +294,21 @@
                 }
             });
         } else {
-            if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                Log.v(TAG, "handleSmsSent msg failed uri: " + uri);
-            }
-            Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_FAILED, error);
-            MessagingNotification.notifySendFailed(getApplicationContext(), true);
+            messageFailedToSend(uri, error);
             if (sendNextMsg) {
                 sendFirstQueuedMessage();
             }
         }
     }
 
+    private void messageFailedToSend(Uri uri, int error) {
+        if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
+            Log.v(TAG, "messageFailedToSend msg failed uri: " + uri);
+        }
+        Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_FAILED, error);
+        MessagingNotification.notifySendFailed(getApplicationContext(), true);
+    }
+
     private void handleSmsReceived(Intent intent, int error) {
         SmsMessage[] msgs = Intents.getMessagesFromIntent(intent);
         Uri messageUri = insertMessage(this, msgs, error);