mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-15 22:22:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix call strings and stamps and turn off sending threads when threads icon is disabled

Browse source
This commit is contained in:
Arne 2023-10-19 09:34:21 +02:00
parent fc4b21a63e
commit 0d6bd40175
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -1423,7 +1423,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.transfer = view.findViewById(R.id.transfer); viewHolder.transfer = view.findViewById(R.id.transfer);
viewHolder.progressBar = view.findViewById(R.id.progressBar); viewHolder.progressBar = view.findViewById(R.id.progressBar);
viewHolder.cancel_transfer = view.findViewById(R.id.cancel_transfer); viewHolder.cancel_transfer = view.findViewById(R.id.cancel_transfer);
viewHolder.thread_identicon = view.findViewById(R.id.thread_identicon); if (activity.xmppConnectionService.getBooleanPreference("show_thread_feature", R.bool.show_thread_feature)) {
viewHolder.thread_identicon = view.findViewById(R.id.thread_identicon);
}
break; break;
case RECEIVED: case RECEIVED:
view = activity.getLayoutInflater().inflate(R.layout.message_received, parent, false); view = activity.getLayoutInflater().inflate(R.layout.message_received, parent, false);
@ -1510,8 +1512,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (received) { if (received) {
if (duration > 0) { if (duration > 0) {
viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent()))); viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent())));
} else if (rtpSessionStatus.successful) {
viewHolder.status_message.setText(R.string.incoming_call);
} else { } else {
viewHolder.status_message.setText(activity.getString(R.string.missed_call_timestamp, formattedTime)); viewHolder.status_message.setText(activity.getString(R.string.missed_call_timestamp, UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent())));
} }
} else { } else {
if (duration > 0) { if (duration > 0) {