From 1249cced2d5837eeb9c8a740a0c786e7f5b4c9d8 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 21 Oct 2021 21:30:43 -0400
Subject: [PATCH] Set a timeout of 3 seconds to get a chat list thumbnail.

---
 .../securesms/conversationlist/ConversationListItem.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index c22299e634..4cfee5f613 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -83,6 +83,8 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import static org.thoughtcrime.securesms.database.model.LiveUpdateMessage.recipientToStringAsync;
 
@@ -554,7 +556,7 @@ public final class ConversationListItem extends ConstraintLayout
                                               new CenterCrop()
                                           )
                                           .submit()
-                                          .get();
+                                          .get(3, TimeUnit.SECONDS);
 
         RoundedDrawable drawable = RoundedDrawable.fromBitmap(thumb);
         drawable.setBounds(0, 0, thumbSize, thumbSize);
@@ -587,6 +589,9 @@ public final class ConversationListItem extends ConstraintLayout
 
       } catch (ExecutionException | InterruptedException e) {
         return new SpannableString(body);
+      } catch (TimeoutException e) {
+        Log.w(TAG, "Hit a timeout when generating a thumbnail!");
+        return new SpannableString(body);
       }
     } else {
       return new SpannableString(body);