From 29447d6b590c26f214cec32f00d751fdad6a8419 Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:09:01 +1000
Subject: [PATCH] fix: movement method for all body text moved into the helper
 function, removed caption from legacy ThumbnailView

---
 .../securesms/conversation/v2/messages/LinkPreviewView.kt     | 1 -
 .../conversation/v2/messages/VisibleMessageContentView.kt     | 2 ++
 .../securesms/conversation/v2/utilities/ThumbnailView.java    | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
index 1f0e9860fd..f0193c6882 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt
@@ -54,7 +54,6 @@ class LinkPreviewView : LinearLayout {
         titleTextView.setTextColor(ResourcesCompat.getColor(resources, textColorID, context.theme))
         // Body
         val bodyTextView = VisibleMessageContentView.getBodyTextView(context, message)
-        bodyTextView.movementMethod = LinkMovementMethod.getInstance()
         mainLinkPreviewContainer.addView(bodyTextView)
         // Corner radii
         val cornerRadii = MessageBubbleUtilities.calculateRadii(context, isStartOfMessageCluster, isEndOfMessageCluster, message.isOutgoing)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index 94e80fb32d..1fef31fa22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.content.Context
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import android.text.method.LinkMovementMethod
 import android.text.style.ReplacementSpan
 import android.text.style.URLSpan
 import android.text.util.Linkify
@@ -171,6 +172,7 @@ class VisibleMessageContentView : LinearLayout {
 
             body = MentionUtilities.highlightMentions(body, message.isOutgoing, message.threadId, context);
             result.text = body
+            result.movementMethod = LinkMovementMethod.getInstance()
             return result
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailView.java
index 79d0099998..f40a57924a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ThumbnailView.java
@@ -57,7 +57,6 @@ public class ThumbnailView extends FrameLayout {
 
   private ImageView       image;
   private View            playOverlay;
-  private View            captionIcon;
   private View            loadIndicator;
   private OnClickListener parentClickListener;
 
@@ -87,7 +86,6 @@ public class ThumbnailView extends FrameLayout {
 
     this.image          = findViewById(R.id.thumbnail_image);
     this.playOverlay    = findViewById(R.id.play_overlay);
-    this.captionIcon    = findViewById(R.id.thumbnail_caption_icon);
     this.loadIndicator  = findViewById(R.id.thumbnail_load_indicator);
     super.setOnClickListener(new ThumbnailClickDispatcher());
 
@@ -278,8 +276,6 @@ public class ThumbnailView extends FrameLayout {
 
     this.slide = slide;
 
-    this.captionIcon.setVisibility(GONE);
-
     dimens[WIDTH]  = naturalWidth;
     dimens[HEIGHT] = naturalHeight;
     invalidate();