aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-12-29 12:39:01 +0100
committerChristian S <christian@pix-art.de>2015-12-29 12:39:01 +0100
commit9c677377aa06410ffe93f8da48493595e39a8981 (patch)
tree4a8c27abe13dbd795c53bf2d53dfeebee121a116 /src/main/java/eu
parent60d48cbc8668c329606d2f0c3da0d2452facea92 (diff)
hide settings, accounts and updater in all menus except in main window
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java8
1 files changed, 8 insertions, 0 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) {