Merge branch 'dev' into shared-sender-keys

build.gradle

@@ -185,8 +185,8 @@ dependencies {
     implementation "com.opencsv:opencsv:4.6"
 }
 
-def canonicalVersionCode = 75
+def canonicalVersionCode = 80
-def canonicalVersionName = "1.4.6"
+def canonicalVersionName = "1.4.7"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

res/layout/conversation_item_thumbnail.xml

@@ -42,7 +42,7 @@
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-        app:footer_text_color="@color/core_white"
+        app:footer_text_color="@android:color/white"
-        app:footer_icon_color="@color/core_white"/>
+        app:footer_icon_color="@android:color/white"/>
 
 </merge>

res/layout/thumbnail_view.xml

@@ -22,6 +22,17 @@
         android:src="@drawable/ic_caption_28"
         android:visibility="gone" />
 
+    <ProgressBar
+        android:id="@+id/thumbnail_load_indicator"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone"
+        android:indeterminateTint="@android:color/white"
+        android:indeterminateTintMode="src_in"
+        tools:visibility="visible" />
+
     <FrameLayout
         android:id="@+id/play_overlay"
         android:layout_width="48dp"

src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java

@@ -73,7 +73,7 @@ public class AlbumThumbnailView extends FrameLayout {
       }
     }
 
-    int sizeClass = sizeClass(slides.size());
+    int sizeClass = Math.min(slides.size(), 6);
 
     if (sizeClass != currentSizeClass) {
       inflateLayout(sizeClass);
@@ -148,11 +148,8 @@ public class AlbumThumbnailView extends FrameLayout {
   private void setSlide(@NonNull GlideRequests glideRequests, @NonNull Slide slide, @IdRes int id) {
     ThumbnailView cell = findViewById(id);
     cell.setImageResource(glideRequests, slide, false, false);
+    cell.setLoadIndicatorVisibile(slide.isInProgress());
     cell.setThumbnailClickListener(defaultThumbnailClickListener);
     cell.setOnLongClickListener(defaultLongClickListener);
   }
-
-  private int sizeClass(int size) {
-    return Math.min(size, 6);
-  }
 }

src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java

@@ -3,15 +3,15 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import network.loki.messenger.R;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -21,6 +21,8 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class ConversationItemThumbnail extends FrameLayout {
 
   private ThumbnailView          thumbnail;
@@ -49,12 +51,12 @@ public class ConversationItemThumbnail extends FrameLayout {
   private void init(@Nullable AttributeSet attrs) {
     inflate(getContext(), R.layout.conversation_item_thumbnail, this);
 
-    this.thumbnail  = findViewById(R.id.conversation_thumbnail_image);
+    this.thumbnail     = findViewById(R.id.conversation_thumbnail_image);
-    this.album      = findViewById(R.id.conversation_thumbnail_album);
+    this.album         = findViewById(R.id.conversation_thumbnail_album);
-    this.shade      = findViewById(R.id.conversation_thumbnail_shade);
+    this.shade         = findViewById(R.id.conversation_thumbnail_shade);
-    this.footer     = findViewById(R.id.conversation_thumbnail_footer);
+    this.footer        = findViewById(R.id.conversation_thumbnail_footer);
-    this.cornerMask = new CornerMask(this);
+    this.cornerMask    = new CornerMask(this);
-    this.outliner   = new Outliner();
+    this.outliner      = new Outliner();
 
     outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color));
 
@@ -126,8 +128,10 @@ public class ConversationItemThumbnail extends FrameLayout {
       thumbnail.setVisibility(VISIBLE);
       album.setVisibility(GONE);
 
-      Attachment attachment = slides.get(0).asAttachment();
+      Slide slide = slides.get(0);
-      thumbnail.setImageResource(glideRequests, slides.get(0), showControls, isPreview, attachment.getWidth(), attachment.getHeight());
+      Attachment attachment = slide.asAttachment();
+      thumbnail.setImageResource(glideRequests, slide, showControls, isPreview, attachment.getWidth(), attachment.getHeight());
+      thumbnail.setLoadIndicatorVisibile(slide.isInProgress());
       setTouchDelegate(thumbnail.getTouchDelegate());
     } else {
       thumbnail.setVisibility(GONE);

src/org/thoughtcrime/securesms/components/ThumbnailView.java

@@ -52,6 +52,7 @@ public class ThumbnailView extends FrameLayout {
   private ImageView       image;
   private View            playOverlay;
   private View            captionIcon;
+  private View            loadIndicator;
   private OnClickListener parentClickListener;
 
   private final int[] dimens        = new int[2];
@@ -78,9 +79,10 @@ public class ThumbnailView extends FrameLayout {
 
     inflate(context, R.layout.thumbnail_view, this);
 
-    this.image       = findViewById(R.id.thumbnail_image);
+    this.image          = findViewById(R.id.thumbnail_image);
-    this.playOverlay = findViewById(R.id.play_overlay);
+    this.playOverlay    = findViewById(R.id.play_overlay);
-    this.captionIcon = findViewById(R.id.thumbnail_caption_icon);
+    this.captionIcon    = findViewById(R.id.thumbnail_caption_icon);
+    this.loadIndicator  = findViewById(R.id.thumbnail_load_indicator);
     super.setOnClickListener(new ThumbnailClickDispatcher());
 
     if (attrs != null) {
@@ -336,6 +338,10 @@ public class ThumbnailView extends FrameLayout {
     getTransferControls().showProgressSpinner();
   }
 
+  public void setLoadIndicatorVisibile(boolean visible) {
+    this.loadIndicator.setVisibility(visible ? VISIBLE : GONE);
+  }
+
   protected void setRadius(int radius) {
     this.radius = radius;
   }

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

@@ -374,7 +374,7 @@ public class AttachmentDatabase extends Database {
     thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId));
   }
 
-  public void updateAttachmentAfterUpload(@NonNull AttachmentId id, @NonNull Attachment attachment) {
+  public void updateAttachmentAfterUploadSucceeded(@NonNull AttachmentId id, @NonNull Attachment attachment) {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     ContentValues  values   = new ContentValues();
 
@@ -390,6 +390,15 @@ public class AttachmentDatabase extends Database {
     database.update(TABLE_NAME, values, PART_ID_WHERE, id.toStrings());
   }
 
+  public void updateAttachmentAfterUploadFailed(@NonNull AttachmentId id) {
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
+    ContentValues  values   = new ContentValues();
+
+    values.put(TRANSFER_STATE, TRANSFER_PROGRESS_FAILED);
+
+    database.update(TABLE_NAME, values, PART_ID_WHERE, id.toStrings());
+  }
+
   @NonNull Map<Attachment, AttachmentId> insertAttachmentsForMessage(long mmsId, @NonNull List<Attachment> attachments, @NonNull List<Attachment> quoteAttachment)
       throws MmsException
   {

src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java

@@ -88,13 +88,20 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
     
     // Only upload attachment if necessary
     if (databaseAttachment.getUrl().isEmpty()) {
-      MediaConstraints mediaConstraints = MediaConstraints.getPushMediaConstraints();
+      final Attachment attachment;
-      Attachment scaledAttachment = scaleAndStripExif(database, mediaConstraints, databaseAttachment);
+      try {
-      SignalServiceAttachment localAttachment = getAttachmentFor(scaledAttachment);
+        MediaConstraints mediaConstraints = MediaConstraints.getPushMediaConstraints();
-      SignalServiceAttachmentPointer remoteAttachment = messageSender.uploadAttachment(localAttachment.asStream(), databaseAttachment.isSticker(), new SignalServiceAddress(destination.serialize()));
+        Attachment scaledAttachment = scaleAndStripExif(database, mediaConstraints, databaseAttachment);
-      Attachment attachment = PointerAttachment.forPointer(Optional.of(remoteAttachment), null, databaseAttachment.getFastPreflightId()).get();
+        SignalServiceAttachment localAttachment = getAttachmentFor(scaledAttachment);
+        SignalServiceAttachmentPointer remoteAttachment = messageSender.uploadAttachment(localAttachment.asStream(), databaseAttachment.isSticker(), new SignalServiceAddress(destination.serialize()));
+        attachment = PointerAttachment.forPointer(Optional.of(remoteAttachment), null, databaseAttachment.getFastPreflightId()).get();
+      } catch (Exception e) {
+        // On any error make sure we mark the related DB record's transfer state as failed.
+        database.updateAttachmentAfterUploadFailed(databaseAttachment.getAttachmentId());
+        throw e;
+      }
 
-      database.updateAttachmentAfterUpload(databaseAttachment.getAttachmentId(), attachment);
+      database.updateAttachmentAfterUploadSucceeded(databaseAttachment.getAttachmentId(), attachment);
     }
   }
 

src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt

@@ -95,7 +95,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
 //        linkedDevicesButton.setOnClickListener { showLinkedDevices() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
-        versionTextView.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
+        versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
     }
 
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt

@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit
 class BackgroundPollWorker : PersistentAlarmManagerListener() {
 
     companion object {
-        private val pollInterval = TimeUnit.MINUTES.toMillis(20)
+        private val pollInterval = TimeUnit.MINUTES.toMillis(15)
 
         @JvmStatic
         fun schedule(context: Context) {

src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt

@@ -137,7 +137,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         return listOf( listOf( path0Snode0, path0Snode1, path0Snode2 ), listOf( path1Snode0, path1Snode1, path1Snode2 ) )
     }
 
-    fun clearOnionRequestPaths() {
+    override fun clearOnionRequestPaths() {
         val database = databaseHelper.writableDatabase
         fun delete(indexPath: String) {
             database.delete(onionRequestPathTable, "${Companion.indexPath} = ?", wrap(indexPath))