From 3dc9db38f3727f42608d416bac79649e67e2a480 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 4 Apr 2023 15:43:33 -0500
Subject: [PATCH] Move lock out of bar

And clear history into more options
---
 .../ui/util/ConversationMenuConfigurator.java |  6 +-
 src/main/res/menu/fragment_conversation.xml   | 55 +++++++++----------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
index 8703af89e33bbff81f98af69078bd82a882217f6..ca9d4c83d1b82b3728d3afaea08937339f41d39c 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
@@ -109,15 +109,15 @@ public class ConversationMenuConfigurator {
 		axolotl.setVisible(Config.supportOmemo());
 		switch (conversation.getNextEncryption()) {
 			case Message.ENCRYPTION_PGP:
-				menuSecure.setTitle(R.string.encrypted_with_openpgp);
+				//menuSecure.setTitle(R.string.encrypted_with_openpgp);
 				pgp.setChecked(true);
 				break;
 			case Message.ENCRYPTION_AXOLOTL:
-				menuSecure.setTitle(R.string.encrypted_with_omemo);
+				//menuSecure.setTitle(R.string.encrypted_with_omemo);
 				axolotl.setChecked(true);
 				break;
 			default:
-				menuSecure.setTitle(R.string.not_encrypted);
+				//menuSecure.setTitle(R.string.not_encrypted);
 				none.setChecked(true);
 				break;
 		}
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 8ff992a53176c1bb6d619d9f3011c7382bbcd247..cf4044d25b8e3d882a462456fed4055d9541c3cc 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -24,26 +24,6 @@
                 android:title="@string/video_call" />
         </menu>
     </item>
-    <item
-        android:id="@+id/action_security"
-        android:icon="?attr/icon_not_secure"
-        android:orderInCategory="20"
-        android:title="@string/encrypted_with_omemo"
-        app:showAsAction="always">
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/encryption_choice_none"
-                    android:title="@string/encryption_choice_unencrypted" />
-                <item
-                    android:id="@+id/encryption_choice_axolotl"
-                    android:title="@string/encryption_choice_omemo" />
-                <item
-                    android:id="@+id/encryption_choice_pgp"
-                    android:title="@string/encryption_choice_pgp" />
-            </group>
-        </menu>
-    </item>
     <item
         android:id="@+id/action_attach_file"
         android:icon="?attr/icon_new_attachment"
@@ -105,16 +85,31 @@
         android:title="@string/search_messages"
         android:visible="@bool/show_individual_search_options"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/action_clear_history"
-        android:orderInCategory="50"
-        android:title="@string/action_clear_history"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_archive"
         android:orderInCategory="60"
         android:title="@string/action_end_conversation"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_security"
+        android:icon="?attr/icon_not_secure"
+        android:orderInCategory="65"
+        android:title="Encyption"
+        app:showAsAction="never">
+        <menu>
+            <group android:checkableBehavior="single">
+                <item
+                    android:id="@+id/encryption_choice_none"
+                    android:title="@string/encryption_choice_unencrypted" />
+                <item
+                    android:id="@+id/encryption_choice_axolotl"
+                    android:title="@string/encryption_choice_omemo" />
+                <item
+                    android:id="@+id/encryption_choice_pgp"
+                    android:title="@string/encryption_choice_pgp" />
+            </group>
+        </menu>
+    </item>
     <item
         android:orderInCategory="70"
         android:title="@string/more_options">
@@ -137,12 +132,16 @@
                 app:showAsAction="never" />
 
             <item
-                android:id="@+id/action_refresh_feature_discovery"
+                android:id="@+id/action_clear_history"
                 android:orderInCategory="74"
+                android:title="@string/action_clear_history"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/action_refresh_feature_discovery"
+                android:orderInCategory="75"
                 android:title="Refresh Feature Discovery"
                 app:showAsAction="never" />
         </menu>
     </item>
-
-
 </menu>