From c0bef51fe0994010b1b10401c5e021fc5cf73444 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Fri, 6 Jan 2023 09:49:10 +1100
Subject: [PATCH] Fixed a couple of bugs where the HomeDiffUtil could
 incorrectly detect differences

---
 .../database/model/ThreadRecord.java          |  6 ----
 .../securesms/home/HomeDiffUtil.kt            | 36 +++++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index 6ce69a591a..1e5a2fef0e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -50,7 +50,6 @@ public class ThreadRecord extends DisplayRecord {
   private           final long    expiresIn;
   private           final long    lastSeen;
   private           final boolean pinned;
-  private           final int     recipientHash;
 
   public ThreadRecord(@NonNull String body, @Nullable Uri snippetUri,
                       @NonNull Recipient recipient, long date, long count, int unreadCount,
@@ -67,17 +66,12 @@ public class ThreadRecord extends DisplayRecord {
     this.expiresIn        = expiresIn;
     this.lastSeen         = lastSeen;
     this.pinned           = pinned;
-    this.recipientHash    = recipient.hashCode();
   }
 
   public @Nullable Uri getSnippetUri() {
     return snippetUri;
   }
 
-  public int getRecipientHash() {
-    return recipientHash;
-  }
-
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
     if (isGroupUpdateMessage()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt
index fcaf565e0d..1baec20854 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeDiffUtil.kt
@@ -22,22 +22,28 @@ class HomeDiffUtil(
         val newItem = new[newItemPosition]
 
         // return early to save getDisplayBody or expensive calls
-        val sameCount = oldItem.count == newItem.count
-        if (!sameCount) return false
-        val sameUnreads = oldItem.unreadCount == newItem.unreadCount
-        if (!sameUnreads) return false
-        val samePinned = oldItem.isPinned == newItem.isPinned
-        if (!samePinned) return false
-        val sameRecipientHash = oldItem.recipientHash == newItem.recipientHash
-        if (!sameRecipientHash) return false
-        val sameSnippet = oldItem.getDisplayBody(context) == newItem.getDisplayBody(context)
-        if (!sameSnippet) return false
-        val sameSendStatus = oldItem.isFailed == newItem.isFailed && oldItem.isDelivered == newItem.isDelivered
-                && oldItem.isSent == newItem.isSent && oldItem.isPending == newItem.isPending
-        if (!sameSendStatus) return false
+        var isSameItem = true
 
-        // all same
-        return true
+        if (isSameItem) { isSameItem = (oldItem.count == newItem.count) }
+        if (isSameItem) { isSameItem = (oldItem.unreadCount == newItem.unreadCount) }
+        if (isSameItem) { isSameItem = (oldItem.isPinned == newItem.isPinned) }
+
+        // Note: For some reason the 'hashCode' value can change after initialisation so we can't cache it
+        if (isSameItem) { isSameItem = (oldItem.recipient.hashCode() == newItem.recipient.hashCode()) }
+
+        // Note: Two instances of 'SpannableString' may not equate even though their content matches
+        if (isSameItem) { isSameItem = (oldItem.getDisplayBody(context).toString() == newItem.getDisplayBody(context).toString()) }
+
+        if (isSameItem) {
+            isSameItem = (
+                oldItem.isFailed == newItem.isFailed &&
+                oldItem.isDelivered == newItem.isDelivered &&
+                oldItem.isSent == newItem.isSent &&
+                oldItem.isPending == newItem.isPending
+            )
+        }
+
+        return isSameItem
     }
 
 }
\ No newline at end of file