From 89f378b973b1c6922ca3dcd00a15af435412a5ec Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Fri, 18 Nov 2022 01:45:17 +0530
Subject: [PATCH] Minor code consistency change

---
 .../smsmessenger/activities/MainActivity.kt   |  2 +-
 .../adapters/ConversationsAdapter.kt          |  4 ++--
 .../smsmessenger/models/Conversation.kt       | 24 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 36e1772c..c4ab1ac6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -257,7 +257,7 @@ class MainActivity : SimpleActivity() {
             }
 
             cachedConversations.forEach { cachedConv ->
-                val conv = conversations.find { it.threadId == cachedConv.threadId && !cachedConv.areContentsTheSame(it) }
+                val conv = conversations.find { it.threadId == cachedConv.threadId && !Conversation.areContentsTheSame(cachedConv, it) }
                 if (conv != null) {
                     val conversation = conv.copy(date = maxOf(cachedConv.date, conv.date))
                     conversationsDB.insertOrUpdate(conversation)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
index 77100cb4..880d96dc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
@@ -374,11 +374,11 @@ class ConversationsAdapter(
 
     private class ConversationDiffCallback : DiffUtil.ItemCallback<Conversation>() {
         override fun areItemsTheSame(oldItem: Conversation, newItem: Conversation): Boolean {
-            return oldItem.areItemsTheSame(newItem)
+            return Conversation.areItemsTheSame(oldItem, newItem)
         }
 
         override fun areContentsTheSame(oldItem: Conversation, newItem: Conversation): Boolean {
-            return oldItem.areContentsTheSame(newItem)
+            return Conversation.areContentsTheSame(oldItem, newItem)
         }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt
index b2182968..5da76a0f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt
@@ -18,17 +18,19 @@ data class Conversation(
     @ColumnInfo(name = "is_scheduled") var isScheduled: Boolean = false
 ) {
 
-    fun areItemsTheSame(other: Conversation): Boolean {
-        return threadId == other.threadId
-    }
+    companion object {
+        fun areItemsTheSame(old: Conversation, new: Conversation): Boolean {
+            return old.threadId == new.threadId
+        }
 
-    fun areContentsTheSame(other: Conversation): Boolean {
-        return snippet == other.snippet &&
-            date == other.date &&
-            read == other.read &&
-            title == other.title &&
-            photoUri == other.photoUri &&
-            isGroupConversation == other.isGroupConversation &&
-            phoneNumber == other.phoneNumber
+        fun areContentsTheSame(old: Conversation, new: Conversation): Boolean {
+            return old.snippet == new.snippet &&
+                old.date == new.date &&
+                old.read == new.read &&
+                old.title == new.title &&
+                old.photoUri == new.photoUri &&
+                old.isGroupConversation == new.isGroupConversation &&
+                old.phoneNumber == new.phoneNumber
+        }
     }
 }