Skip to content

Commit 7a41e77

Browse files
committed
regex split into multilines
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent 486eb04 commit 7a41e77

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ private fun shouldShowTimeNextToContent(
140140
private val mentionChipTypes = setOf("user", "guest", "call", "user-group", "email", "circle")
141141

142142
private val parentMessageLinkRegex = Regex(
143-
"""(\[[^\]]+]\([^)]*\)|(?:https?://|www\.)[^\s)]+|(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?:/[^\s)]*)?)"""
143+
"""(\[[^\]]+]\([^)]*\)|(?:https?://|www\.)[^\s)]+|""" +
144+
"""(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?:/[^\s)]*)?)"""
144145
)
145146

146147
private fun ChatMessageUi.hasMentionChips(): Boolean =

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ import com.nextcloud.talk.utils.ApiUtils
5959
import org.greenrobot.eventbus.EventBus
6060

6161
val messageTokenRegex = Regex(
62-
"""(\{[^{}]+\}|\*\*.*?\*\*|\*.*?\*|`.*?`|\[.*?]\(.*?\)|https?://[^\s)]+|www\.[^\s)]+|(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?:/[^\s)]*)?)"""
62+
"""(\{[^{}]+\}|\*\*.*?\*\*|\*.*?\*|`.*?`|\[.*?]\(.*?\)|https?://[^\s)]+|""" +
63+
"""www\.[^\s)]+|(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?:/[^\s)]*)?)"""
6364
)
6465

6566
private val mentionParameterTypes = setOf("user", "guest", "call", "user-group", "email", "circle")
@@ -133,8 +134,6 @@ fun MentionEnrichedText(
133134
)
134135
}
135136

136-
137-
138137
@Suppress("LongParameterList")
139138
private fun buildMentionRichText(
140139
message: ChatMessageUi,

0 commit comments

Comments
 (0)