Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
e7c905d4
Commit
e7c905d4
authored
6 years ago
by
Anthony Laye
Browse files
Options
Downloads
Patches
Plain Diff
Fix non homogeneous messages on android for calls
Change-Id: Ib91875a70c0cfde1a259b1dec830dce7f538194f
parent
8763af59
Branches
release/201808
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java
+7
-3
7 additions, 3 deletions
.../app/src/main/java/cx/ring/adapters/SmartListAdapter.java
with
7 additions
and
3 deletions
ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java
+
7
−
3
View file @
e7c905d4
...
...
@@ -141,10 +141,14 @@ public class SmartListAdapter extends RecyclerView.Adapter<SmartListViewHolder>
private
String
getLastEventSummary
(
ConversationElement
e
,
Context
context
)
{
if
(
e
instanceof
HistoryCall
)
{
HistoryCall
call
=
(
HistoryCall
)
e
;
if
(
call
.
isIncoming
())
return
String
.
format
(
context
.
getString
(
R
.
string
.
hist_in_call
),
call
.
getDurationString
());
if
(
call
.
isMissed
())
return
call
.
isIncoming
()
?
context
.
getString
(
R
.
string
.
notif_missed_incoming_call
)
:
context
.
getString
(
R
.
string
.
notif_missed_outgoing_call
);
else
return
String
.
format
(
context
.
getString
(
R
.
string
.
hist_out_call
),
call
.
getDurationString
());
return
call
.
isIncoming
()
?
String
.
format
(
context
.
getString
(
R
.
string
.
hist_in_call
),
call
.
getDurationString
())
:
String
.
format
(
context
.
getString
(
R
.
string
.
hist_out_call
),
call
.
getDurationString
());
}
else
if
(
e
instanceof
TextMessage
)
{
TextMessage
t
=
(
TextMessage
)
e
;
if
(
t
.
isIncoming
())
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment