gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2267 from nextcloud/fixStatusVisibility

Browse Source 
Fix status visibility in conversation list
This commit is contained in:
Andy Scherzinger 2022-08-04 13:57:45 +02:00 committed by GitHub
commit 23e3f323f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

@ -97,7 +97,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof ConversationItem) { if (o instanceof ConversationItem) {
ConversationItem inItem = (ConversationItem) o; ConversationItem inItem = (ConversationItem) o;
return conversation.equals(inItem.getModel()); return conversation.equals(inItem.getModel()) && status.equals(inItem.status);
} }
return false; return false;
} }
@ -108,7 +108,9 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
@Override @Override
public int hashCode() { public int hashCode() {
return conversation.hashCode(); int result = conversation.hashCode();
result = 31 * result + (status != null ? status.hashCode() : 0);
return result;
} }
@Override @Override
@ -211,12 +213,16 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
if (status != null && Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) { if (status != null && Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, appContext); float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, appContext);
holder.binding.userStatusImage.setVisibility(View.VISIBLE);
holder.binding.userStatusImage.setImageDrawable(new StatusDrawable( holder.binding.userStatusImage.setImageDrawable(new StatusDrawable(
status.getStatus(), status.getStatus(),
status.getIcon(), status.getIcon(),
size, size,
context.getResources().getColor(R.color.bg_default), context.getResources().getColor(R.color.bg_default),
appContext)); appContext));
} else {
holder.binding.userStatusImage.setVisibility(View.GONE);
} }
if (conversation.getLastMessage() != null) { if (conversation.getLastMessage() != null) {