From cc6aef02cca5fc6151bd049ad37f4e250a7a968d Mon Sep 17 00:00:00 2001
From: smss <smss@localdomain>
Date: Thu, 13 May 2021 20:41:03 +0430
Subject: [PATCH 1/2] Add timestamp for all calls

---
 .../conversations/ui/adapter/MessageAdapter.java      | 11 ++++++-----
 src/main/res/values/strings.xml                       |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index caba4ce6418f27a7e116eb711cbe57f1ed1ff6d0..dc2a252a99e277a0a4b0d8bf59dfbe5c7c32ec8d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -686,19 +686,20 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             final boolean received = message.getStatus() <= Message.STATUS_RECEIVED;
             final RtpSessionStatus rtpSessionStatus = RtpSessionStatus.of(message.getBody());
             final long duration = rtpSessionStatus.duration;
+            final String callTime = UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent());
             if (received) {
                 if (duration > 0) {
-                    viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration, TimeFrameUtils.resolve(activity, duration)));
+                    viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), callTime));
                 } else if (rtpSessionStatus.successful) {
-                    viewHolder.status_message.setText(R.string.incoming_call);
+                    viewHolder.status_message.setText(activity.getString(R.string.incoming_call_timestamp, callTime));
                 } else {
-                    viewHolder.status_message.setText(activity.getString(R.string.missed_call_timestamp, UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent())));
+                    viewHolder.status_message.setText(activity.getString(R.string.missed_call_timestamp, callTime));
                 }
             } else {
                 if (duration > 0) {
-                    viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_duration, TimeFrameUtils.resolve(activity, duration)));
+                    viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), callTime));
                 } else {
-                    viewHolder.status_message.setText(R.string.outgoing_call);
+                    viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_timestamp, callTime));
                 }
             }
             viewHolder.indicatorReceived.setImageResource(RtpSessionStatus.getDrawable(received, rtpSessionStatus.successful, isDarkTheme));
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c9ad3d891d45704b957601268af4e2e2c0037c4d..2cba9af3fb1b12823394d9bb2ab2a99198c71b42 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -918,10 +918,14 @@
     <string name="ongoing_video_call">Ongoing video call</string>
     <string name="disable_tor_to_make_call">Disable Tor to make calls</string>
     <string name="incoming_call">Incoming call</string>
+    <string name="incoming_call_timestamp">Incoming call\n%s</string>
     <string name="incoming_call_duration">Incoming call · %s</string>
-    <string name="missed_call_timestamp">Missed call · %s</string>
+    <string name="incoming_call_duration_timestamp">Incoming call · %s\n%s</string>
+    <string name="missed_call_timestamp">Missed call\n%s</string>
     <string name="outgoing_call">Outgoing call</string>
+    <string name="outgoing_call_timestamp">Outgoing call\n%s</string>
     <string name="outgoing_call_duration">Outgoing call · %s</string>
+    <string name="outgoing_call_duration_timestamp">Outgoing call · %s\n%s</string>
     <string name="missed_call">Missed call</string>
     <string name="audio_call">Audio call</string>
     <string name="video_call">Video call</string>

From 6384e24ebcbb8bfede77cb8a21093336a5b75342 Mon Sep 17 00:00:00 2001
From: smss <smss@localdomain>
Date: Sun, 16 May 2021 22:48:30 +0430
Subject: [PATCH 2/2] Change string format

---
 src/main/res/values/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2cba9af3fb1b12823394d9bb2ab2a99198c71b42..14320ec52721aac4a95c18b236781f95355bacb9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -918,14 +918,14 @@
     <string name="ongoing_video_call">Ongoing video call</string>
     <string name="disable_tor_to_make_call">Disable Tor to make calls</string>
     <string name="incoming_call">Incoming call</string>
-    <string name="incoming_call_timestamp">Incoming call\n%s</string>
-    <string name="incoming_call_duration">Incoming call · %s</string>
-    <string name="incoming_call_duration_timestamp">Incoming call · %s\n%s</string>
-    <string name="missed_call_timestamp">Missed call\n%s</string>
+    <string name="incoming_call_timestamp">Incoming call . %s</string>
+    <string name="incoming_call_duration">Incoming call (%s)</string>
+    <string name="incoming_call_duration_timestamp">Incoming call (%s) . %s</string>
+    <string name="missed_call_timestamp">Missed call . %s</string>
     <string name="outgoing_call">Outgoing call</string>
-    <string name="outgoing_call_timestamp">Outgoing call\n%s</string>
-    <string name="outgoing_call_duration">Outgoing call · %s</string>
-    <string name="outgoing_call_duration_timestamp">Outgoing call · %s\n%s</string>
+    <string name="outgoing_call_timestamp">Outgoing call . %s</string>
+    <string name="outgoing_call_duration">Outgoing call (%s)</string>
+    <string name="outgoing_call_duration_timestamp">Outgoing call (%s) . %s</string>
     <string name="missed_call">Missed call</string>
     <string name="audio_call">Audio call</string>
     <string name="video_call">Video call</string>