Skip to content

Fixed regexp for clubs #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scorpioza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed regexp for clubs #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions app/src/main/java/com/twoeightnine/root/xvii/utils/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import java.text.DecimalFormat
import java.util.regex.Pattern


private const val REGEX_MENTION = "(\\[id\\d{1,9}\\|[^\\]]+\\])"
private const val REGEX_MENTION = "(\\[(id|club)\\d{1,9}\\|[^\\]]+\\])"

fun isOnline(): Boolean {
val cm = App.context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
Expand Down Expand Up @@ -272,15 +272,18 @@ fun wrapMentions(context: Context, text: CharSequence, addClickable: Boolean = f

val divider = mention.indexOf('|')
val mentionUi = mention.substring(divider + 1, mention.length - 1)
val userId = mention.substring(3, divider).toIntOrNull()
val userOrGroupId = when (mention.substring(1,2)){
"i"-> mention.substring(3, divider).toIntOrNull()
else -> ("-"+mention.substring(5, divider)).toIntOrNull()
}

ssb.append(text.substring(globalStart, start))
.append(mentionUi)
val tmp = ssb.toString()
if (userId != null && addClickable) {
if (userOrGroupId != null && addClickable) {
ssb.setSpan(object : ClickableSpan() {
override fun onClick(widget: View) {
ChatOwnerFactory.launch(context, userId)
ChatOwnerFactory.launch(context, userOrGroupId)
}
}, tmp.length - mentionUi.length, tmp.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
}
Expand Down