From ce710b378f34fd18310f4c53ab74b6830d8ad129 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 25 Feb 2014 17:15:30 -0800
Subject: [PATCH] Fix for stalled retries.

---
 src/org/thoughtcrime/securesms/service/MmsSender.java | 2 --
 src/org/thoughtcrime/securesms/service/SmsSender.java | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/service/MmsSender.java b/src/org/thoughtcrime/securesms/service/MmsSender.java
index 65dd94869..2537816a5 100644
--- a/src/org/thoughtcrime/securesms/service/MmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/MmsSender.java
@@ -40,8 +40,6 @@ import org.whispersystems.textsecure.crypto.MasterSecret;
 import ws.com.google.android.mms.MmsException;
 import ws.com.google.android.mms.pdu.SendReq;
 
-import static org.thoughtcrime.securesms.database.SmsDatabase.Status;
-
 public class MmsSender {
 
   private final Context             context;
diff --git a/src/org/thoughtcrime/securesms/service/SmsSender.java b/src/org/thoughtcrime/securesms/service/SmsSender.java
index e0c262415..197d8c787 100644
--- a/src/org/thoughtcrime/securesms/service/SmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/SmsSender.java
@@ -94,6 +94,7 @@ public class SmsSender {
           DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
         } catch (RetryLaterException rle) {
           Log.w("SmsSender", rle);
+          DatabaseFactory.getSmsDatabase(context).markAsOutbox(messageId);
           if (systemStateListener.isConnected()) scheduleQuickRetryAlarm();
           else                                   systemStateListener.registerForConnectivityChange();
         }