From b7b527ada9bbb0cce38dde51f910c3f23c22d3ba Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 3 Jun 2025 12:09:50 +0200
Subject: [PATCH 1/4] rely on canDeleteConversation to show "Delete
 conversation" button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
index 7aa5052c5..b329b5a09 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
@@ -118,7 +118,6 @@ class ConversationsListBottomDialog(
             currentUser.capabilities?.spreedCapability!!,
             SpreedFeatures.FAVORITES
         )
-        val canModerate = ConversationUtils.canModerate(conversation, currentUser.capabilities?.spreedCapability!!)
 
         binding.conversationRemoveFromFavorites.visibility = setVisibleIf(
             hasFavoritesCapability && conversation.favorite
@@ -149,7 +148,7 @@ class ConversationsListBottomDialog(
         )
 
         binding.conversationOperationDelete.visibility = setVisibleIf(
-            canModerate
+            conversation.canDeleteConversation
         )
 
         binding.conversationOperationLeave.visibility = setVisibleIf(

From b8b7909cf5e1a795021787529f26b9c18686a458 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 3 Jun 2025 12:12:04 +0200
Subject: [PATCH 2/4] rely on conversationOperationLeave to show "Leave
 conversation" button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/ui/dialog/ConversationsListBottomDialog.kt          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
index b329b5a09..b1d16b955 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
@@ -152,10 +152,7 @@ class ConversationsListBottomDialog(
         )
 
         binding.conversationOperationLeave.visibility = setVisibleIf(
-            conversation.canLeaveConversation &&
-                // leaving is by api not possible for the last user with moderator permissions.
-                // for now, hide this option for all moderators.
-                !ConversationUtils.canModerate(conversation, currentUser.capabilities!!.spreedCapability!!)
+            conversation.canLeaveConversation
         )
     }
 

From d9951b8bac1eee862e621601e684372c93cd0b0e Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 3 Jun 2025 12:16:16 +0200
Subject: [PATCH 3/4] show "Delete conversation" as last entry

same as for web/iOS

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../layout/dialog_conversation_operations.xml | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml
index b4c554219..a6ef03540 100644
--- a/app/src/main/res/layout/dialog_conversation_operations.xml
+++ b/app/src/main/res/layout/dialog_conversation_operations.xml
@@ -256,36 +256,6 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/conversation_operation_delete"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ic_delete_grey600_24dp"
-                    app:tint="@color/high_emphasis_menu_icon" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|center_vertical"
-                    android:paddingStart="40dp"
-                    android:paddingEnd="@dimen/zero"
-                    android:text="@string/nc_delete_call"
-                    android:textAlignment="viewStart"
-                    android:textColor="@color/high_emphasis_text"
-                    android:textSize="@dimen/bottom_sheet_text_size" />
-            </LinearLayout>
-
             <LinearLayout
                 android:id="@+id/conversation_operation_leave"
                 android:layout_width="match_parent"
@@ -316,6 +286,36 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/conversation_operation_delete"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_item_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingEnd="@dimen/standard_padding"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_delete_grey600_24dp"
+                    app:tint="@color/high_emphasis_menu_icon" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:paddingStart="40dp"
+                    android:paddingEnd="@dimen/zero"
+                    android:text="@string/nc_delete_call"
+                    android:textAlignment="viewStart"
+                    android:textColor="@color/high_emphasis_text"
+                    android:textSize="@dimen/bottom_sheet_text_size" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>

From 04e0099e31b03624469953870d99b790906c7b26 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 3 Jun 2025 12:17:32 +0200
Subject: [PATCH 4/4] show "Archive conversation" just before Leave & Delete

same as for web/iOS

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../layout/dialog_conversation_operations.xml | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml
index a6ef03540..6062ff11e 100644
--- a/app/src/main/res/layout/dialog_conversation_operations.xml
+++ b/app/src/main/res/layout/dialog_conversation_operations.xml
@@ -195,6 +195,36 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/conversation_operation_rename"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_item_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingEnd="@dimen/standard_padding"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_pencil_grey600_24dp"
+                    app:tint="@color/high_emphasis_menu_icon" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:paddingStart="40dp"
+                    android:paddingEnd="@dimen/zero"
+                    android:text="@string/nc_rename"
+                    android:textAlignment="viewStart"
+                    android:textColor="@color/high_emphasis_text"
+                    android:textSize="@dimen/bottom_sheet_text_size" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/conversation_archive"
                 android:layout_width="match_parent"
@@ -226,36 +256,6 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/conversation_operation_rename"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ic_pencil_grey600_24dp"
-                    app:tint="@color/high_emphasis_menu_icon" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|center_vertical"
-                    android:paddingStart="40dp"
-                    android:paddingEnd="@dimen/zero"
-                    android:text="@string/nc_rename"
-                    android:textAlignment="viewStart"
-                    android:textColor="@color/high_emphasis_text"
-                    android:textSize="@dimen/bottom_sheet_text_size" />
-            </LinearLayout>
-
             <LinearLayout
                 android:id="@+id/conversation_operation_leave"
                 android:layout_width="match_parent"