Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
2af98d20
Unverified
Commit
2af98d20
authored
Apr 24, 2019
by
Filipe de Lima Brito
Committed by
GitHub
Apr 24, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2241 from Adizbek/bug-fix-1846-new
[FIX] Removes @ from mentions.
parents
bd657f94
3d0a65d4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+10
-2
No files found.
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
2af98d20
...
@@ -94,10 +94,16 @@ class MessageParser @Inject constructor(
...
@@ -94,10 +94,16 @@ class MessageParser @Inject constructor(
}
}
private
fun
getMention
(
user
:
SimpleUser
):
String
{
private
fun
getMention
(
user
:
SimpleUser
):
String
{
user
.
id
?.
let
{
if
(
SYSTEM_MENTIONS
.
contains
(
it
))
{
return
"@$it"
}
}
return
if
(
settings
.
useRealName
())
{
return
if
(
settings
.
useRealName
())
{
user
.
name
?:
"@${user.username}"
user
.
name
?:
user
.
username
.
orEmpty
()
}
else
{
}
else
{
"@${user.username}"
user
.
username
.
orEmpty
()
}
}
}
}
...
@@ -527,5 +533,7 @@ class MessageParser @Inject constructor(
...
@@ -527,5 +533,7 @@ class MessageParser @Inject constructor(
*/
*/
private
val
WEB_URL
=
Pattern
.
compile
(
private
val
WEB_URL
=
Pattern
.
compile
(
"($WEB_URL_WITH_PROTOCOL|$WEB_URL_WITHOUT_PROTOCOL)"
)
"($WEB_URL_WITH_PROTOCOL|$WEB_URL_WITHOUT_PROTOCOL)"
)
private
val
SYSTEM_MENTIONS
=
arrayOf
(
"all"
,
"here"
)
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment