fully backport 183f8742a7d034c951eca20e854b49cee5541d31

src/org/smssecure/smssecure/ConversationAdapter.java

@@ -80,11 +80,13 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
   private final Map<String,SoftReference<MessageRecord>> messageRecordCache =
       Collections.synchronizedMap(new LRUCache<String, SoftReference<MessageRecord>>(MAX_CACHE_SIZE));
 
-  private static final int MESSAGE_TYPE_OUTGOING       = 0;
-  private static final int MESSAGE_TYPE_INCOMING       = 1;
-  private static final int MESSAGE_TYPE_UPDATE         = 2;
-  private static final int MESSAGE_TYPE_AUDIO_OUTGOING = 3;
-  private static final int MESSAGE_TYPE_AUDIO_INCOMING = 4;
+  private static final int MESSAGE_TYPE_OUTGOING           = 0;
+  private static final int MESSAGE_TYPE_INCOMING           = 1;
+  private static final int MESSAGE_TYPE_UPDATE             = 2;
+  private static final int MESSAGE_TYPE_AUDIO_OUTGOING     = 3;
+  private static final int MESSAGE_TYPE_AUDIO_INCOMING     = 4;
+  private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5;
+  private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6;
 
   private final Set<MessageRecord> batchSelected = Collections.synchronizedSet(new HashSet<MessageRecord>());
 
@@ -219,8 +221,10 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
   private @LayoutRes int getLayoutForViewType(int viewType) {
     switch (viewType) {
       case MESSAGE_TYPE_AUDIO_OUTGOING:
+      case MESSAGE_TYPE_THUMBNAIL_OUTGOING:
       case MESSAGE_TYPE_OUTGOING:        return R.layout.conversation_item_sent;
       case MESSAGE_TYPE_AUDIO_INCOMING:
+      case MESSAGE_TYPE_THUMBNAIL_INCOMING:
       case MESSAGE_TYPE_INCOMING:        return R.layout.conversation_item_received;
       case MESSAGE_TYPE_UPDATE:          return R.layout.conversation_item_update;
       default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter");
@@ -236,6 +240,9 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
     } else if (hasAudio(messageRecord)) {
       if (messageRecord.isOutgoing()) return MESSAGE_TYPE_AUDIO_OUTGOING;
       else                            return MESSAGE_TYPE_AUDIO_INCOMING;
+    } else if (hasThumbnail(messageRecord)) {
+      if (messageRecord.isOutgoing()) return MESSAGE_TYPE_THUMBNAIL_OUTGOING;
+      else                            return MESSAGE_TYPE_THUMBNAIL_INCOMING;
     } else if (messageRecord.isOutgoing()) {
       return MESSAGE_TYPE_OUTGOING;
     } else {
@@ -404,4 +411,10 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
     }
   }
 
+  private boolean hasThumbnail(MessageRecord messageRecord) {
+    return messageRecord.isMms()              &&
+        !messageRecord.isMmsNotification() &&
+        ((MmsMessageRecord)messageRecord).getSlideDeck().getThumbnailSlide() != null;
+  }
+
 }

src/org/smssecure/smssecure/ConversationItem.java

@@ -202,15 +202,15 @@ public class ConversationItem extends LinearLayout
     this.recipient.addListener(this);
     this.conversationRecipients.addListener(this);
 
-    setInteractionState(messageRecord);
     setBodyText(messageRecord);
+    setMediaAttributes(messageRecord);
+    setInteractionState(messageRecord);
     setBubbleState(messageRecord, recipient);
     setStatusIcons(messageRecord);
     setContactPhoto(recipient);
     setGroupMessageStatus(messageRecord, recipient);
     checkForAutoInitiate(messageRecord);
     setMinimumWidth();
-    setMediaAttributes(messageRecord);
     setSimInfo(messageRecord);
   }