From 286010ce903a21ad91ccba7ac0dec8a31eefeedc Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 1 Sep 2022 14:17:02 -0300
Subject: [PATCH] Fix clickable area around link previews.

---
 .../securesms/stories/StoryLinkPreviewView.kt         | 11 +++++++----
 .../securesms/stories/StoryTextPostView.kt            |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
index febe2e4c95..e0a37d0030 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryLinkPreviewView.kt
@@ -32,9 +32,10 @@ class StoryLinkPreviewView @JvmOverloads constructor(
     inflate(context, R.layout.stories_text_post_link_preview, this)
   }
 
+  private val card: View = findViewById(R.id.link_preview_card)
   private val close: View = findViewById(R.id.link_preview_close)
-  private val smallImage: ThumbnailView = findViewById(R.id.link_preview_image)
-  private val largeImage: ThumbnailView = findViewById(R.id.link_preview_large)
+  private val smallImage: ThumbnailView = findViewById<ThumbnailView>(R.id.link_preview_image).apply { isClickable = false }
+  private val largeImage: ThumbnailView = findViewById<ThumbnailView>(R.id.link_preview_large).apply { isClickable = false }
   private val title: TextView = findViewById(R.id.link_preview_title)
   private val url: TextView = findViewById(R.id.link_preview_url)
   private val description: TextView = findViewById(R.id.link_preview_description)
@@ -63,7 +64,6 @@ class StoryLinkPreviewView @JvmOverloads constructor(
 
     if (linkPreview != null) {
       visibility = View.VISIBLE
-      isClickable = true
 
       val image = getThumbnailTarget(useLargeThumbnail)
       val notImage = getThumbnailTarget(!useLargeThumbnail)
@@ -95,7 +95,6 @@ class StoryLinkPreviewView @JvmOverloads constructor(
       formatUrl(linkPreview)
     } else {
       visibility = hiddenVisibility
-      isClickable = false
     }
 
     return future ?: SettableFuture(false)
@@ -142,6 +141,10 @@ class StoryLinkPreviewView @JvmOverloads constructor(
     close.setOnClickListener(onClickListener)
   }
 
+  fun setOnPreviewClickListener(onClickListener: OnClickListener?) {
+    card.setOnClickListener(onClickListener)
+  }
+
   fun setCanClose(canClose: Boolean) {
     close.visible = canClose
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
index fcff8d2f0a..953b42cd73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
@@ -184,7 +184,7 @@ class StoryTextPostView @JvmOverloads constructor(
   }
 
   fun setLinkPreviewClickListener(onClickListener: OnClickListener?) {
-    linkPreviewView.setOnClickListener(onClickListener)
+    linkPreviewView.setOnPreviewClickListener(onClickListener)
   }
 
   fun showPostContent() {