sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show timestamp for missed incoming calls. fixes #3692

This commit is contained in:
Daniel Gultsch 2020-05-03 18:36:15 +02:00
parent 3c3f5d8e6f
commit 476fb23656
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

@ -629,12 +629,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
viewHolder.message_box = view.findViewById(R.id.message_box); viewHolder.message_box = view.findViewById(R.id.message_box);
viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received); viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received);
break; break;
case RTP_SESSION: case RTP_SESSION:
view = activity.getLayoutInflater().inflate(R.layout.message_rtp_session, parent, false); view = activity.getLayoutInflater().inflate(R.layout.message_rtp_session, parent, false);
viewHolder.status_message = view.findViewById(R.id.message_body); viewHolder.status_message = view.findViewById(R.id.message_body);
viewHolder.message_box = view.findViewById(R.id.message_box); viewHolder.message_box = view.findViewById(R.id.message_box);
viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received); viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received);
break; break;
case SENT: case SENT:
view = activity.getLayoutInflater().inflate(R.layout.message_sent, parent, false); view = activity.getLayoutInflater().inflate(R.layout.message_sent, parent, false);
viewHolder.message_box = view.findViewById(R.id.message_box); viewHolder.message_box = view.findViewById(R.id.message_box);
@ -703,18 +703,20 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
final long duration = rtpSessionStatus.duration; final long duration = rtpSessionStatus.duration;
if (received) { if (received) {
if (duration > 0) { 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, TimeframeUtils.resolve(activity, duration)));
} else { } else if (rtpSessionStatus.successful) {
viewHolder.status_message.setText(R.string.incoming_call); viewHolder.status_message.setText(R.string.incoming_call);
} else {
viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration, UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent())));
} }
} else { } else {
if (duration > 0) { 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, TimeframeUtils.resolve(activity, duration)));
} else { } else {
viewHolder.status_message.setText(R.string.outgoing_call); viewHolder.status_message.setText(R.string.outgoing_call);
} }
} }
viewHolder.indicatorReceived.setImageResource(RtpSessionStatus.getDrawable(received,rtpSessionStatus.successful,isDarkTheme)); viewHolder.indicatorReceived.setImageResource(RtpSessionStatus.getDrawable(received, rtpSessionStatus.successful, isDarkTheme));
viewHolder.indicatorReceived.setAlpha(isDarkTheme ? 0.7f : 0.57f); viewHolder.indicatorReceived.setAlpha(isDarkTheme ? 0.7f : 0.57f);
viewHolder.message_box.setBackgroundResource(isDarkTheme ? R.drawable.date_bubble_grey : R.drawable.date_bubble_white); viewHolder.message_box.setBackgroundResource(isDarkTheme ? R.drawable.date_bubble_grey : R.drawable.date_bubble_white);
return view; return view;