Merge commit 'refs/pull/4095/head' of github.com:iNPUTmice/Conversations

Stephen Paul Weber created 3 years ago

* github.com:iNPUTmice/Conversations:
  Change string format
  Add timestamp for all calls

Change summary

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

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -706,19 +706,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));

src/main/res/values/strings.xml

@@ -927,10 +927,14 @@
     <string name="reconnecting_video_call">Reconnecting 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_duration">Incoming call · %s</string>
-    <string name="missed_call_timestamp">Missed call · %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_duration">Outgoing call · %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>