From 526f6e305865713e2f227d7d5429491e922fd088 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Mon, 7 Sep 2015 11:48:03 -1000
Subject: [PATCH] don't try generating an in-progress part thumbnail

Closes #4042
// FREEBIE
---
 .../thoughtcrime/securesms/components/ThumbnailView.java  | 5 +++--
 src/org/thoughtcrime/securesms/database/PartDatabase.java | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 6bd8470565..07b0cc4cd1 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -159,14 +159,15 @@ public class ThumbnailView extends FrameLayout {
 
   public void setImageResource(@NonNull Slide slide, @Nullable MasterSecret masterSecret) {
     if (Util.equals(slide, this.slide)) {
-      Log.w(TAG, "Not loading resource, slide was identical");
+      Log.w(TAG, "Not re-loading slide " + slide.getPart().getPartId());
       return;
     }
     if (!isContextValid()) {
-      Log.w(TAG, "Not loading resource, context is invalid");
+      Log.w(TAG, "Not loading slide, context is invalid");
       return;
     }
 
+    Log.w(TAG, "loading part with id " + slide.getPart().getPartId() + ", progress " + slide.getTransferProgress());
     if (!hideControls && slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_STARTED) {
       getProgressWheel().spin();
       getProgressWheel().setVisibility(VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/database/PartDatabase.java b/src/org/thoughtcrime/securesms/database/PartDatabase.java
index b56cca8698..1d59490593 100644
--- a/src/org/thoughtcrime/securesms/database/PartDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/PartDatabase.java
@@ -24,6 +24,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -640,17 +641,22 @@ public class PartDatabase extends Database {
     }
 
     @Override
-    public InputStream call() throws Exception {
+    public @Nullable InputStream call() throws Exception {
       final InputStream stream = getDataStream(masterSecret, partId, THUMBNAIL);
       if (stream != null) {
         return stream;
       }
 
       PduPart part = getPart(partId);
+      if (part.isInProgress()) {
+        return null;
+      }
+
       ThumbnailData data = MediaUtil.generateThumbnail(context, masterSecret, part.getDataUri(), Util.toIsoString(part.getContentType()));
       if (data == null) {
         return null;
       }
+
       updatePartThumbnail(masterSecret, partId, part, data.toDataStream(), data.getAspectRatio());
 
       return getDataStream(masterSecret, partId, THUMBNAIL);