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 c23f935b1fbee07b68182411afdc13d6fdc0a6b6..a3dbc0cd968e4e4484c3ed7731ebe6a93a23bb33 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -706,19 +706,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 c7e986a14a18c1c6cdd3bf2c5067d30547b982fd..24d6ce70fdce9f84fa771328043b725ac9e47788 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -927,10 +927,14 @@ Reconnecting video call Disable Tor to make calls Incoming call - Incoming call · %s - Missed call · %s + Incoming call . %s + Incoming call (%s) + Incoming call (%s) . %s + Missed call . %s Outgoing call - Outgoing call · %s + Outgoing call . %s + Outgoing call (%s) + Outgoing call (%s) . %s Missed call Audio call Video call