From d1e474e4027b3ed1a1dc12d3021f152f42b481ea Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 3 Aug 2022 08:24:10 +0200
Subject: [PATCH 1/2] Fix status visibility in conversation list

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../nextcloud/talk/adapters/items/ConversationItem.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
index 6b63203e5..b770b53c4 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -97,7 +97,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
     public boolean equals(Object o) {
         if (o instanceof ConversationItem) {
             ConversationItem inItem = (ConversationItem) o;
-            return conversation.equals(inItem.getModel());
+            return conversation.equals(inItem.getModel()) && status.equals(inItem.status);
         }
         return false;
     }
@@ -108,7 +108,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
 
     @Override
     public int hashCode() {
-        return conversation.hashCode();
+        return conversation.hashCode() * (status == null ? 1 : status.hashCode());
     }
 
     @Override
@@ -211,12 +211,16 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
 
         if (status != null && Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
             float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, appContext);
+
+            holder.binding.userStatusImage.setVisibility(View.VISIBLE);
             holder.binding.userStatusImage.setImageDrawable(new StatusDrawable(
                 status.getStatus(),
                 status.getIcon(),
                 size,
                 context.getResources().getColor(R.color.bg_default),
                 appContext));
+        } else {
+            holder.binding.userStatusImage.setVisibility(View.GONE);
         }
 
         if (conversation.getLastMessage() != null) {

From 3ca3f35e3e8d76f97a7651ce57ac43e101b2f99a Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 4 Aug 2022 12:29:24 +0200
Subject: [PATCH 2/2] Update
 app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../com/nextcloud/talk/adapters/items/ConversationItem.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
index b770b53c4..f1e3ab51c 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -108,7 +108,9 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
 
     @Override
     public int hashCode() {
-        return conversation.hashCode() * (status == null ? 1 : status.hashCode());
+        int result = conversation.hashCode();
+        result = 31 * result + (status != null ? status.hashCode() : 0);
+        return result;
     }
 
     @Override