Remove dedicated MMS download controls

// FREEBIE

src/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.attachments.MmsNotificationAttachment;
 import org.thoughtcrime.securesms.crypto.AsymmetricMasterCipher;
 import org.thoughtcrime.securesms.crypto.MasterCipher;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -1075,28 +1076,6 @@ public class MmsDatabase extends MessagingDatabase {
     public static final int DOWNLOAD_SOFT_FAILURE    = 4;
     public static final int DOWNLOAD_HARD_FAILURE    = 5;
     public static final int DOWNLOAD_APN_UNAVAILABLE = 6;
-
-    public static boolean isDisplayDownloadButton(int status) {
-      return
-          status == DOWNLOAD_INITIALIZED     ||
-          status == DOWNLOAD_NO_CONNECTIVITY ||
-          status == DOWNLOAD_SOFT_FAILURE;
-    }
-
-    public static String getLabelForStatus(Context context, int status) {
-      switch (status) {
-        case DOWNLOAD_CONNECTING:      return context.getString(R.string.MmsDatabase_connecting_to_mms_server);
-        case DOWNLOAD_INITIALIZED:     return context.getString(R.string.MmsDatabase_downloading_mms);
-        case DOWNLOAD_HARD_FAILURE:    return context.getString(R.string.MmsDatabase_mms_download_failed);
-        case DOWNLOAD_APN_UNAVAILABLE: return context.getString(R.string.MmsDatabase_mms_pending_download);
-      }
-
-      return context.getString(R.string.MmsDatabase_downloading);
-    }
-
-    public static boolean isHardError(int status) {
-      return status == DOWNLOAD_HARD_FAILURE;
-    }
   }
 
   public class Reader {
@@ -1157,11 +1136,13 @@ public class MmsDatabase extends MessagingDatabase {
       if (!TextUtils.isEmpty(transactionId))
         transactionIdBytes = org.thoughtcrime.securesms.util.Util.toIsoBytes(transactionId);
 
+      SlideDeck slideDeck = new SlideDeck(context, new MmsNotificationAttachment(status, messageSize));
+
 
       return new NotificationMmsMessageRecord(context, id, recipients, recipients.getPrimaryRecipient(),
                                               addressDeviceId, dateSent, dateReceived, receiptCount, threadId,
                                               contentLocationBytes, messageSize, expiry, status,
-                                              transactionIdBytes, mailbox, subscriptionId);
+                                              transactionIdBytes, mailbox, subscriptionId, slideDeck);
     }
 
     private MediaMmsMessageRecord getMediaMmsMessageRecord(Cursor cursor) {

src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java

@@ -25,7 +25,6 @@ import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase.Status;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
-import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
@@ -40,12 +39,11 @@ import java.util.List;
  *
  */
 
-public class MediaMmsMessageRecord extends MessageRecord {
+public class MediaMmsMessageRecord extends MmsMessageRecord {
   private final static String TAG = MediaMmsMessageRecord.class.getSimpleName();
 
   private final Context context;
-  private final int partCount;
-  private final @NonNull SlideDeck slideDeck;
+  private final int     partCount;
 
   public MediaMmsMessageRecord(Context context, long id, Recipients recipients,
                                Recipient individualRecipient, int recipientDeviceId,
@@ -59,46 +57,21 @@ public class MediaMmsMessageRecord extends MessageRecord {
   {
     super(context, id, body, recipients, individualRecipient, recipientDeviceId, dateSent,
           dateReceived, threadId, Status.STATUS_NONE, receiptCount, mailbox, mismatches, failures,
-          subscriptionId, expiresIn, expireStarted);
+          subscriptionId, expiresIn, expireStarted, slideDeck);
 
     this.context   = context.getApplicationContext();
     this.partCount = partCount;
-    this.slideDeck = slideDeck;
-  }
-
-  public @NonNull SlideDeck getSlideDeck() {
-    return slideDeck;
-  }
-
-  public boolean containsMediaSlide() {
-    return slideDeck.containsMediaSlide();
   }
 
   public int getPartCount() {
     return partCount;
   }
 
-  @Override
-  public boolean isMms() {
-    return true;
-  }
-
   @Override
   public boolean isMmsNotification() {
     return false;
   }
 
-  @Override
-  public boolean isMediaPending() {
-    for (Slide slide : getSlideDeck().getSlides()) {
-      if (slide.isInProgress() || slide.isPendingDownload()) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   @Override
   public SpannableString getDisplayBody() {
     if (MmsDatabase.Types.isDecryptInProgressType(type)) {

src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java

@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms.database.model;
+
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
+import org.thoughtcrime.securesms.database.documents.NetworkFailure;
+import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.mms.SlideDeck;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.Recipients;
+
+import java.util.List;
+
+public abstract class MmsMessageRecord extends MessageRecord {
+
+  private final @NonNull SlideDeck slideDeck;
+
+  MmsMessageRecord(Context context, long id, Body body, Recipients recipients,
+                   Recipient individualRecipient, int recipientDeviceId, long dateSent,
+                   long dateReceived, long threadId, int deliveryStatus, int receiptCount,
+                   long type, List<IdentityKeyMismatch> mismatches,
+                   List<NetworkFailure> networkFailures, int subscriptionId, long expiresIn,
+                   long expireStarted, @NonNull SlideDeck slideDeck)
+  {
+    super(context, id, body, recipients, individualRecipient, recipientDeviceId, dateSent, dateReceived, threadId, deliveryStatus, receiptCount, type, mismatches, networkFailures, subscriptionId, expiresIn, expireStarted);
+    this.slideDeck = slideDeck;
+  }
+
+  @Override
+  public boolean isMms() {
+    return true;
+  }
+
+  @NonNull
+  public SlideDeck getSlideDeck() {
+    return slideDeck;
+  }
+
+  @Override
+  public boolean isMediaPending() {
+    for (Slide slide : getSlideDeck().getSlides()) {
+      if (slide.isInProgress() || slide.isPendingDownload()) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  public boolean containsMediaSlide() {
+    return slideDeck.containsMediaSlide();
+  }
+
+
+}

src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java

@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.database.SmsDatabase.Status;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
+import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
 
@@ -37,12 +38,12 @@ import java.util.LinkedList;
  *
  */
 
-public class NotificationMmsMessageRecord extends MessageRecord {
+public class NotificationMmsMessageRecord extends MmsMessageRecord {
 
   private final byte[] contentLocation;
-  private final long messageSize;
-  private final long expiry;
-  private final int status;
+  private final long   messageSize;
+  private final long   expiry;
+  private final int    status;
   private final byte[] transactionId;
 
   public NotificationMmsMessageRecord(Context context, long id, Recipients recipients,
@@ -50,12 +51,12 @@ public class NotificationMmsMessageRecord extends MessageRecord {
                                       long dateSent, long dateReceived, int receiptCount,
                                       long threadId, byte[] contentLocation, long messageSize,
                                       long expiry, int status, byte[] transactionId, long mailbox,
-                                      int subscriptionId)
+                                      int subscriptionId, SlideDeck slideDeck)
   {
     super(context, id, new Body("", true), recipients, individualRecipient, recipientDeviceId,
           dateSent, dateReceived, threadId, Status.STATUS_NONE, receiptCount, mailbox,
           new LinkedList<IdentityKeyMismatch>(), new LinkedList<NetworkFailure>(), subscriptionId,
-          0, 0);
+          0, 0, slideDeck);
 
     this.contentLocation = contentLocation;
     this.messageSize     = messageSize;
@@ -89,11 +90,6 @@ public class NotificationMmsMessageRecord extends MessageRecord {
     return false;
   }
 
-  @Override
-  public boolean isFailed() {
-    return MmsDatabase.Status.isHardError(status);
-  }
-
   @Override
   public boolean isSecure() {
     return false;
@@ -104,11 +100,6 @@ public class NotificationMmsMessageRecord extends MessageRecord {
     return false;
   }
 
-  @Override
-  public boolean isMms() {
-    return true;
-  }
-
   @Override
   public boolean isMmsNotification() {
     return true;
@@ -121,6 +112,12 @@ public class NotificationMmsMessageRecord extends MessageRecord {
 
   @Override
   public SpannableString getDisplayBody() {
-    return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_multimedia_message));
+    if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED) {
+      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_multimedia_message));
+    } else if (status == MmsDatabase.Status.DOWNLOAD_CONNECTING) {
+      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_downloading_mms_message));
+    } else {
+      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_error_downloading_mms_message));
+    }
   }
 }