Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,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) {
Expand All @@ -254,9 +265,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 {
Expand Down
14 changes: 13 additions & 1 deletion app/src/main/java/com/nextcloud/talk/ui/chat/MarkdownText.kt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ 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.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(
Expand Down Expand Up @@ -149,7 +157,11 @@ fun MarkdownText(
avatarSizePx = avatarSizePx,
avatarGapPx = avatarGapPx
)
val hasLinks = Linkify.addLinks(ssb, Linkify.WEB_URLS)


val hasLinks = Linkify.addLinks(ssb, validLinkRegex.toPattern(), null) ||
Linkify.addLinks(ssb, MESSAGE_LINKIFY_MASK)

resolveFileParams(ssb, message)
applySearchHighlight(ssb, highlightSearchTerm, searchHighlightColorArgb)
textView.text = ssb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading