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 { 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 @@ Ongoing video call Disable Tor to make calls Incoming call + Incoming call\n%s Incoming call · %s - Missed call · %s + Incoming call · %s\n%s + Missed call\n%s Outgoing call + Outgoing call\n%s Outgoing call · %s + Outgoing call · %s\n%s Missed call Audio call Video call