hide settings, accounts and updater in all menus except in main window

4 files changed, 8 insertions, 31 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 706a2cbd3..d02b1d555 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -441,6 +441,9 @@ public class ConversationActivity extends XmppActivity
 		final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
 		final MenuItem menuMute = menu.findItem(R.id.action_mute);
 		final MenuItem menuUnmute = menu.findItem(R.id.action_unmute);
+		final MenuItem menuAccounts = menu.findItem(R.id.action_accounts);
+		final MenuItem menuSettings = menu.findItem(R.id.action_settings);
+		final MenuItem menuUpdater = menu.findItem(R.id.action_check_updates);
 
 		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
 			menuArchive.setVisible(false);
@@ -454,6 +457,11 @@ public class ConversationActivity extends XmppActivity
 			menuUnmute.setVisible(false);
 		} else {
 			menuAdd.setVisible(!isConversationsOverviewHideable());
+			//hide settings, accounts and updater in all menus except in main window
+			menuAccounts.setVisible(false);
+			menuSettings.setVisible(false);
+			menuUpdater.setVisible(false);
+
 			if (this.getSelectedConversation() != null) {
 				menuSecure.setVisible(!Config.HIDE_ENCRYPTION_IN_UI);
 				if (this.getSelectedConversation().getNextEncryption() != Message.ENCRYPTION_NONE) {
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index bd81b6d49..43ccc7927 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -30,15 +30,4 @@
         android:showAsAction="never"
         android:title="@string/action_unblock_contact"/>
 
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        android:showAsAction="never"
-        android:title="@string/action_accounts"/>
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 51de4e753..1ae217709 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -28,15 +28,5 @@
 		android:checked="false"
 		android:orderInCategory="85"
 		android:showAsAction="never" />
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        android:showAsAction="never"
-        android:title="@string/action_accounts"/>
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index a89d71ffd..b0472af05 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -29,15 +29,5 @@
         android:orderInCategory="85"
         android:showAsAction="never"
         android:title="@string/hide_offline"/>
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        android:showAsAction="never"
-        android:title="@string/action_accounts" />
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings" />
 
 </menu>
\ No newline at end of file