From ad09888c8018cb62c73cc57ebf7ea51a6b49b65f Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Thu, 11 May 2023 13:40:35 +1000
Subject: [PATCH] feat: add block to the delete all message requests, only if
 they're not open group inbox contacts

---
 .../messagerequests/MessageRequestsAdapter.kt          |  1 +
 .../messagerequests/MessageRequestsViewModel.kt        |  4 ++--
 .../securesms/repository/ConversationRepository.kt     | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
index 89a841dc0a..10142cc8fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
@@ -48,6 +48,7 @@ class MessageRequestsAdapter(
     private fun showPopupMenu(view: MessageRequestView) {
         val popupMenu = PopupMenu(ContextThemeWrapper(context, R.style.PopupMenu_MessageRequests), view)
         popupMenu.menuInflater.inflate(R.menu.menu_message_request, popupMenu.menu)
+        popupMenu.menu.findItem(R.id.menu_block_message_request)?.isVisible = !view.thread!!.recipient.isOpenGroupInboxRecipient
         popupMenu.setOnMenuItemClickListener { menuItem ->
             if (menuItem.itemId == R.id.menu_delete_message_request) {
                 listener.onDeleteConversationClick(view.thread!!)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsViewModel.kt
index 2f448932dd..a3a7caf8d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsViewModel.kt
@@ -25,8 +25,8 @@ class MessageRequestsViewModel @Inject constructor(
         repository.deleteMessageRequest(thread)
     }
 
-    fun clearAllMessageRequests() = viewModelScope.launch {
-        repository.clearAllMessageRequests()
+    fun clearAllMessageRequests(block: Boolean) = viewModelScope.launch {
+        repository.clearAllMessageRequests(block)
     }
 
 }
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 c0400b720b..9d8f411401 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.repository
 
-import org.jetbrains.annotations.Contract
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
@@ -65,7 +64,7 @@ interface ConversationRepository {
 
     suspend fun deleteMessageRequest(thread: ThreadRecord): ResultOf<Unit>
 
-    suspend fun clearAllMessageRequests(): ResultOf<Unit>
+    suspend fun clearAllMessageRequests(block: Boolean): ResultOf<Unit>
 
     suspend fun acceptMessageRequest(threadId: Long, recipient: Recipient): ResultOf<Unit>
 
@@ -131,7 +130,6 @@ class DefaultConversationRepository @Inject constructor(
     }
 
     // This assumes that recipient.isContactRecipient is true
-    @Contract
     override fun setBlocked(recipient: Recipient, blocked: Boolean) {
         storage.setBlocked(listOf(recipient), blocked)
     }
@@ -267,10 +265,14 @@ class DefaultConversationRepository @Inject constructor(
         return ResultOf.Success(Unit)
     }
 
-    override suspend fun clearAllMessageRequests(): ResultOf<Unit> {
+    override suspend fun clearAllMessageRequests(block: Boolean): ResultOf<Unit> {
         threadDb.readerFor(threadDb.unapprovedConversationList).use { reader ->
             while (reader.next != null) {
                 deleteMessageRequest(reader.current)
+                val recipient = reader.current.recipient
+                if (block && !recipient.isOpenGroupInboxRecipient) {
+                    setBlocked(recipient, true)
+                }
             }
         }
         return ResultOf.Success(Unit)