Optimize uploads during media composition.

By uploading in advance (when on unmetered connections), media messages
can send almost instantly.

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java

@@ -1,12 +1,15 @@
 package org.thoughtcrime.securesms.attachments;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.thoughtcrime.securesms.util.Util;
 
-public class AttachmentId {
+public class AttachmentId implements Parcelable {
 
   @JsonProperty
   private final long rowId;
@@ -19,6 +22,11 @@ public class AttachmentId {
     this.uniqueId = uniqueId;
   }
 
+  private AttachmentId(Parcel in) {
+    this.rowId    = in.readLong();
+    this.uniqueId = in.readLong();
+  }
+
   public long getRowId() {
     return rowId;
   }
@@ -54,4 +62,28 @@ public class AttachmentId {
   public int hashCode() {
     return Util.hashCode(rowId, uniqueId);
   }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(rowId);
+    dest.writeLong(uniqueId);
+  }
+
+  public static final Creator<AttachmentId> CREATOR = new Creator<AttachmentId>() {
+    @Override
+    public AttachmentId createFromParcel(Parcel in) {
+      return new AttachmentId(in);
+    }
+
+    @Override
+    public AttachmentId[] newArray(int size) {
+      return new AttachmentId[size];
+    }
+  };
+
 }

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java

@@ -11,12 +11,15 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformPropertie
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
+import java.util.Comparator;
+
 public class DatabaseAttachment extends Attachment {
 
   private final AttachmentId attachmentId;
   private final long         mmsId;
   private final boolean      hasData;
   private final boolean      hasThumbnail;
+  private final int          displayOrder;
 
   public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
                             boolean hasData, boolean hasThumbnail,
@@ -25,13 +28,14 @@ public class DatabaseAttachment extends Attachment {
                             byte[] digest, String fastPreflightId, boolean voiceNote,
                             int width, int height, boolean quote, @Nullable String caption,
                             @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash,
-                            @Nullable TransformProperties transformProperties)
+                            @Nullable TransformProperties transformProperties, int displayOrder)
   {
     super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;
     this.mmsId        = mmsId;
+    this.displayOrder = displayOrder;
   }
 
   @Override
@@ -58,6 +62,10 @@ public class DatabaseAttachment extends Attachment {
     return attachmentId;
   }
 
+  public int getDisplayOrder() {
+    return displayOrder;
+  }
+
   @Override
   public boolean equals(Object other) {
     return other != null &&
@@ -81,4 +89,11 @@ public class DatabaseAttachment extends Attachment {
   public boolean hasThumbnail() {
     return hasThumbnail;
   }
+
+  public static class DisplayOrderComparator implements Comparator<DatabaseAttachment> {
+    @Override
+    public int compare(DatabaseAttachment lhs, DatabaseAttachment rhs) {
+      return Integer.compare(lhs.getDisplayOrder(), rhs.getDisplayOrder());
+    }
+  }
 }