From e7c905d44dfb3f2bda446e4cfda3f976507ae2a6 Mon Sep 17 00:00:00 2001
From: alaye <anthony.laye@savoirfairelinux.com>
Date: Mon, 13 Aug 2018 10:53:58 -0400
Subject: [PATCH] Fix non homogeneous messages on android for calls
Change-Id: Ib91875a70c0cfde1a259b1dec830dce7f538194f
---
.../main/java/cx/ring/adapters/SmartListAdapter.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java
index 4e7a130f0..b494423d4 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.java
@@ -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()) {
--
GitLab