From 22c770fa8a082f6c6f43b9b36763676671d84db6 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 21 Feb 2022 11:20:59 +0100 Subject: [PATCH] set "away" / "dnd" as status message if it's empty Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/adapters/items/UserItem.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java index 9d77fbaf4..2dcd8c7af 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java @@ -129,6 +129,10 @@ public class UserItem extends AbstractFlexibleItem } } + if (participant.statusMessage != null) { + holder.statusMessage.setText(participant.statusMessage); + } + if (participant.statusIcon != null && !participant.statusIcon.isEmpty()) { holder.participantEmoji.setText(participant.statusIcon); } else { @@ -137,17 +141,20 @@ public class UserItem extends AbstractFlexibleItem if (participant.status != null && participant.status.equals(StatusType.DND.getString())) { setOnlineStateIcon(holder, R.drawable.ic_user_status_dnd_with_border); + if (participant.statusMessage == null || participant.statusMessage.isEmpty()) { + holder.statusMessage.setText(R.string.dnd); + } } else if (participant.status != null && participant.status.equals(StatusType.AWAY.getString())) { setOnlineStateIcon(holder, R.drawable.ic_user_status_away_with_border); + if (participant.statusMessage == null || participant.statusMessage.isEmpty()) { + holder.statusMessage.setText(R.string.away); + } } else if (participant.status != null && participant.status.equals(StatusType.ONLINE.getString())) { setOnlineStateIcon(holder, R.drawable.online_status_with_border); } else { holder.participantOnlineStateImage.setVisibility(View.GONE); } - if (participant.statusMessage != null) { - holder.statusMessage.setText(participant.statusMessage); - } if (!isOnline) { holder.contactDisplayName.setTextColor(ResourcesCompat.getColor(