From a01efc1fbcd605114595bceabf60b1bb7f3c3a7e Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Thu, 10 Oct 2024 13:04:08 +1100
Subject: [PATCH] Fixed SES-2802

Only force the priority to visible when going from not approved to approved
---
 .../main/java/org/thoughtcrime/securesms/database/Storage.kt | 5 ++++-
 .../securesms/repository/ConversationRepository.kt           | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index e8ecceddeb..a1903cc891 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1589,8 +1589,11 @@ open class Storage(
         DatabaseComponent.get(context).recipientDatabase().setApproved(recipient, approved)
         if (recipient.isLocalNumber || !recipient.isContactRecipient) return
         configFactory.contacts?.upsertContact(recipient.address.serialize()) {
+            // if the contact wasn't approved before but is approved now, make sure it's visible
+            if(approved && !this.approved) this.priority = PRIORITY_VISIBLE
+
+            // update approval
             this.approved = approved
-            this.priority = PRIORITY_VISIBLE
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
index 40d6fa3e61..4695e21825 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
@@ -244,8 +244,7 @@ class DefaultConversationRepository @Inject constructor(
         threadId: Long,
         messages: Set<MessageRecord>
     ) {
-        val community = lokiThreadDb.getOpenGroupChat(threadId) ?:
-            throw Exception("Not a Community")
+        val community = checkNotNull(lokiThreadDb.getOpenGroupChat(threadId)) { "Not a community" }
 
         messages.forEach { message ->
             lokiMessageDb.getServerID(message.id, !message.isMms)?.let { messageServerID ->