fix links

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>

Author: sowjanyakch

app/src/main/java/com/nextcloud/talk/chat/ui/model/ChatMessageUi.kt

@@ -243,7 +243,18 @@ fun resolveStatusIcon(
         else -> MessageStatusIcon.SENT
     }
 
+
+private val validHttpsLinkRegex = Regex(
+    """(?<!\w)https://(?:www\.)?[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+(?:/[^\s)]*)?""",
+    RegexOption.IGNORE_CASE
+)
+
+private fun String.hasValidHttpsLink(): Boolean =
+    validHttpsLinkRegex.containsMatchIn(this)
+
 fun getMessageTypeContent(user: User, message: ChatMessage): MessageTypeContent? =
+
+
     if (message.isSystemMessage) {
         MessageTypeContent.SystemMessage
     } else if (message.isVoiceMessage) {
@@ -257,9 +268,14 @@ fun getMessageTypeContent(user: User, message: ChatMessage): MessageTypeContent?
     } else if (message.hasDeckCard) {
         getDeckContent(message)
     } else {
-        message.extractLinkPreviewUrl(user)
-            ?.let { MessageTypeContent.LinkPreview(url = it) }
-            ?: MessageTypeContent.RegularText
+        if(message.message.orEmpty().hasValidHttpsLink()) {
+            message.extractLinkPreviewUrl(user)
+                ?.takeIf { it.hasValidHttpsLink() }
+                ?.let { MessageTypeContent.LinkPreview(url = it) }
+        }else{
+            MessageTypeContent.RegularText
+        }
+
     }
 
 fun getMediaContent(user: User, message: ChatMessage): MessageTypeContent.Media {

app/src/main/java/com/nextcloud/talk/ui/chat/MarkdownText.kt

@@ -60,10 +60,15 @@ private const val CHIP_START_PADDING_DP = 2f
 private const val CHIP_END_PADDING_DP = 5f
 private const val CHIP_VERTICAL_PADDING_DP = 2f
 private const val CHIP_CORNER_RADIUS_DP = 16f
-private const val MESSAGE_LINKIFY_MASK = Linkify.WEB_URLS or
-    Linkify.PHONE_NUMBERS or
+
+private const val MESSAGE_LINKIFY_MASK = Linkify.PHONE_NUMBERS or
     Linkify.EMAIL_ADDRESSES
 
+val validLinkRegex = Regex(
+    """(?<!\w)https://(?:www\.)?[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+(?:/[^\s)]*)?""",
+    RegexOption.IGNORE_CASE
+)
+
 @Suppress("LongMethod", "LongParameterList")
 @Composable
 fun MarkdownText(
@@ -152,7 +157,11 @@ fun MarkdownText(
                     avatarSizePx = avatarSizePx,
                     avatarGapPx = avatarGapPx
                 )
-                val hasLinks = Linkify.addLinks(ssb, MESSAGE_LINKIFY_MASK)
+
+
+                val hasLinks = Linkify.addLinks(ssb, validLinkRegex.toPattern(), null) ||
+                            Linkify.addLinks(ssb, MESSAGE_LINKIFY_MASK)
+
                 resolveFileParams(ssb, message)
                 applySearchHighlight(ssb, highlightSearchTerm, searchHighlightColorArgb)
                 textView.text = ssb

app/src/main/java/com/nextcloud/talk/ui/chat/MentionEnrichedText.kt

@@ -148,8 +148,6 @@ private fun buildMentionRichText(
                     val url = token.substringAfter("(").substringBefore(")")
                     appendLinkedToken(textPart, url, linkColor)
                 }
-
-                token.startsWith("http") -> appendLinkedToken(token, token, linkColor)
             }
 
             lastIndex = range.last + 1