From 94db4e68926cae87113838f79ad300d26f37c842 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Mon, 30 Jun 2025 16:12:07 +0200
Subject: [PATCH] show delete all messages option in 1:1 conversation when
 canDeleteConversation is true

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../ConversationInfoActivity.kt               | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 08e97f91d..bde66a872 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -1065,21 +1065,13 @@ class ConversationInfoActivity :
         ) {
             binding.addParticipantsAction.visibility = GONE
             binding.startGroupChat.visibility = VISIBLE
+            showDeleteAllMessagesOption(conversationCopy)
         } else if (ConversationUtils.canModerate(conversationCopy, spreedCapabilities)) {
             binding.addParticipantsAction.visibility = VISIBLE
-            if (hasSpreedFeatureCapability(
-                    spreedCapabilities,
-                    SpreedFeatures.CLEAR_HISTORY
-                ) && conversationCopy.canDeleteConversation
-            ) {
-                binding.clearConversationHistory.visibility = VISIBLE
-            } else {
-                binding.clearConversationHistory.visibility = GONE
-            }
+            showDeleteAllMessagesOption(conversationCopy)
             showOptionsMenu()
         } else {
             binding.addParticipantsAction.visibility = GONE
-
             if (ConversationUtils.isNoteToSelfConversation(conversation)) {
                 binding.notificationSettingsView.notificationSettings.visibility = VISIBLE
             } else {
@@ -1279,6 +1271,7 @@ class ConversationInfoActivity :
             binding.recordingConsentView.recordingConsentAll.visibility = VISIBLE
         }
 
+
         fun showSwitch() {
             binding.recordingConsentView.recordingConsentForConversation.visibility = VISIBLE
             binding.recordingConsentView.recordingConsentAll.visibility = GONE
@@ -1311,6 +1304,18 @@ class ConversationInfoActivity :
         }
     }
 
+    fun showDeleteAllMessagesOption(conversationCopy: ConversationModel){
+        if (hasSpreedFeatureCapability(
+                spreedCapabilities,
+                SpreedFeatures.CLEAR_HISTORY
+            ) && conversationCopy.canDeleteConversation
+        ) {
+            binding.clearConversationHistory.visibility = VISIBLE
+        } else {
+            binding.clearConversationHistory.visibility = GONE
+        }
+    }
+
     private fun submitRecordingConsentChanges() {
         val state = if (binding.recordingConsentView.recordingConsentForConversationSwitch.isChecked) {
             RECORDING_CONSENT_REQUIRED_FOR_CONVERSATION