fix: enable body texts to open modal URL dialog

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -586,6 +586,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            return false
+        }
         return ConversationMenuHelper.onOptionItemSelected(this, item, thread)
     }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt

@@ -1,23 +1,20 @@
 package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.content.Context
-import android.content.Intent
 import android.graphics.Canvas
-import android.graphics.drawable.Drawable
+import android.graphics.Rect
-import android.net.Uri
+import android.text.method.LinkMovementMethod
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.view.ViewOutlineProvider
 import android.widget.LinearLayout
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.view_link_preview.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.components.CornerMask
 import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog
 import org.thoughtcrime.securesms.conversation.v2.utilities.MessageBubbleUtilities
-import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -44,7 +41,8 @@ class LinkPreviewView : LinearLayout {
         // Thumbnail
         if (linkPreview.getThumbnail().isPresent) {
             // This internally fetches the thumbnail
-            thumbnailImageView.setImageResource(glide, ImageSlide(context, linkPreview.getThumbnail().get()), false, false)
+            thumbnailImageView.setImageResource(glide, ImageSlide(context, linkPreview.getThumbnail().get()), isPreview = false)
+            thumbnailImageView.loadIndicator.isVisible = false
         }
         // Title
         titleTextView.text = linkPreview.title
@@ -56,6 +54,7 @@ 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)
@@ -72,6 +71,14 @@ class LinkPreviewView : LinearLayout {
     // endregion
 
     // region Interaction
+    fun calculateHit(hitRect: Rect) {
+        val previewRect = Rect()
+        mainLinkPreviewParent.getGlobalVisibleRect(previewRect)
+        if (previewRect.contains(hitRect)) {
+            openURL()
+        }
+    }
+
     fun openURL() {
         val url = this.url ?: return
         val activity = context as AppCompatActivity

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -3,8 +3,11 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.content.Context
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import android.text.style.ReplacementSpan
+import android.text.style.URLSpan
 import android.text.util.Linkify
 import android.util.AttributeSet
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.widget.LinearLayout
@@ -12,10 +15,13 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
+import androidx.core.text.getSpans
 import androidx.core.text.toSpannable
+import androidx.core.text.util.LinkifyCompat
 import kotlinx.android.synthetic.main.view_visible_message_content.view.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.ThemeUtil
@@ -23,6 +29,8 @@ import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
+import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog
+import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.loki.utilities.*
@@ -61,7 +69,9 @@ class VisibleMessageContentView : LinearLayout {
             val linkPreviewView = LinkPreviewView(context)
             linkPreviewView.bind(message, glide, isStartOfMessageCluster, isEndOfMessageCluster)
             mainContainer.addView(linkPreviewView)
-            onContentClick = { linkPreviewView.openURL() }
+            onContentClick = { rect ->
+                linkPreviewView.calculateHit(rect)
+            }
             // Body text view is inside the link preview for layout convenience
         } else if (message is MmsMessageRecord && message.quote != null) {
             val quote = message.quote!!
@@ -106,9 +116,8 @@ class VisibleMessageContentView : LinearLayout {
             mainContainer.addView(openGroupInvitationView)
             onContentClick = { openGroupInvitationView.joinOpenGroup() }
         } else {
-            val bodyTextView = VisibleMessageContentView.getBodyTextView(context, message)
+            val bodyTextView = getBodyTextView(context, message)
             mainContainer.addView(bodyTextView)
-            onContentClick = { openURLIfNeeded(message) }
         }
     }
 
@@ -132,12 +141,6 @@ class VisibleMessageContentView : LinearLayout {
     }
     // endregion
 
-    // region Interaction
-    private fun openURLIfNeeded(message: MessageRecord) {
-        Toast.makeText(context, "Not yet implemented", Toast.LENGTH_LONG).show()
-    }
-    // endregion
-
     // region Convenience
     companion object {
 
@@ -152,6 +155,20 @@ class VisibleMessageContentView : LinearLayout {
             result.setLinkTextColor(color)
             var body = message.body.toSpannable()
             Linkify.addLinks(body, Linkify.WEB_URLS)
+
+            // replace URLSpans with ModalURLSpans
+            body.getSpans<URLSpan>(0, body.length).toList().forEach { urlSpan ->
+                val replacementSpan = ModalURLSpan(urlSpan.url) { url ->
+                    val activity = context as AppCompatActivity
+                    OpenURLDialog(url).show(activity.supportFragmentManager, "Open URL Dialog")
+                }
+                val start = body.getSpanStart(urlSpan)
+                val end = body.getSpanEnd(urlSpan)
+                val flags = body.getSpanFlags(urlSpan)
+                body.removeSpan(urlSpan)
+                body.setSpan(replacementSpan, start, end, flags)
+            }
+
             body = MentionUtilities.highlightMentions(body, message.isOutgoing, message.threadId, context);
             result.text = body
             return result

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/KThumbnailView.kt

@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.components.GlideBitmapListeningTarget
 import org.thoughtcrime.securesms.components.GlideDrawableListeningTarget
 import org.thoughtcrime.securesms.mms.*
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri
+import org.thoughtcrime.securesms.util.MediaUtil
 
 open class KThumbnailView: FrameLayout {
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ModalURLSpan.kt

@@ -0,0 +1,10 @@
+package org.thoughtcrime.securesms.conversation.v2.utilities
+
+import android.text.style.URLSpan
+import android.view.View
+
+class ModalURLSpan(url: String, private val openModalCallback: (String)->Unit): URLSpan(url) {
+    override fun onClick(widget: View) {
+        openModalCallback(url)
+    }
+}

app/src/main/res/layout/view_link_preview.xml

@@ -8,6 +8,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
+        android:id="@+id/mainLinkPreviewParent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -24,7 +25,7 @@
                 android:src="@drawable/ic_link"
                 app:tint="@color/text" />
 
-            <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
+            <org.thoughtcrime.securesms.conversation.v2.utilities.KThumbnailView
                 android:id="@+id/thumbnailImageView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"