From 213191a1b65cbee54cf125ec5e72f56928877ea4 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Thu, 7 May 2020 22:24:56 +0200
Subject: [PATCH] reorder some menu entries

---
 .../eu/siacs/conversations/ui/ConversationFragment.java    | 4 ++--
 src/main/res/menu/activity_conversations.xml               | 7 ++++++-
 src/main/res/menu/fragment_conversation.xml                | 5 -----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 25f8d6697..ae9cb8776 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1175,12 +1175,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 menuContactDetails.setVisible(false);
             }
             menuMediaBrowser.setVisible(true);
-            menuNeedHelp.setVisible(true);
+            menuNeedHelp.setVisible(false);
             menuSearchUpdates.setVisible(false);
             ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments);
             ConversationMenuConfigurator.configureEncryptionMenu(conversation, menu, activity);
         } else {
-            menuNeedHelp.setVisible(false);
+            menuNeedHelp.setVisible(true);
             menuSearchUpdates.setVisible(true);
             menuInviteContact.setVisible(false);
             menuGroupDetails.setVisible(false);
diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index 4f19bcbdd..189c28caa 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -20,6 +20,7 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/action_check_updates"
+        android:orderInCategory="850"
         android:title="@string/action_check_update"
         app:showAsAction="never" />
     <item
@@ -27,5 +28,9 @@
         android:orderInCategory="100"
         android:title="@string/invite_user"
         app:showAsAction="never" />
-
+    <item
+        android:id="@+id/action_create_issue"
+        android:orderInCategory="900"
+        android:title="@string/create_issue"
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 5e3f2a842..7840f4e6c 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -106,11 +106,6 @@
         android:orderInCategory="60"
         android:title="@string/action_end_conversation"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/action_create_issue"
-        android:orderInCategory="100"
-        android:title="@string/create_issue"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_group_details"
         android:icon="@drawable/ic_group_white_24dp"