Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-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
xabber-android
Commits
a4cd95df
Commit
a4cd95df
authored
Jul 16, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"You have joined chat as <nickname>" message was fixed for conferences.
parent
c86ac329
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
ChatMessageAdapter.java
...ava/com/xabber/android/ui/adapter/ChatMessageAdapter.java
+7
-1
No files found.
app/src/main/java/com/xabber/android/ui/adapter/ChatMessageAdapter.java
View file @
a4cd95df
...
...
@@ -114,7 +114,13 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
case
VIEW_TYPE_ACTION_MESSAGE:
ChatAction
action
=
messageItem
.
getAction
();
String
time
=
StringUtils
.
getSmartTimeText
(
context
,
messageItem
.
getTimestamp
());
String
name
=
RosterManager
.
getInstance
().
getBestContact
(
account
,
messageItem
.
getChat
().
getUser
()).
getName
();
String
name
;
if
(
isMUC
)
{
name
=
messageItem
.
getResource
();
}
else
{
name
=
RosterManager
.
getInstance
().
getBestContact
(
account
,
messageItem
.
getChat
().
getUser
()).
getName
();
}
((
BasicMessage
)
holder
).
messageText
.
setText
(
time
+
": "
+
action
.
getText
(
context
,
name
,
messageItem
.
getSpannable
().
toString
()));
...
...
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