From 115675d7b6b3d586132d2c314cf2fc272e20a479 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 18 Dec 2018 10:30:39 -0200
Subject: [PATCH] [android] Hide role-dependant private group menu items by
 default

and only enable them once we know our role
---
 .../conversation/GroupActivity.java           |  2 --
 .../src/main/res/menu/group_actions.xml       | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java
index cc60fa1e6..10b900901 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java
@@ -138,7 +138,6 @@ public class GroupActivity extends
 		inviteMenuItem = menu.findItem(R.id.action_group_invite);
 		leaveMenuItem = menu.findItem(R.id.action_group_leave);
 		dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
-		showMenuItems();
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -208,7 +207,6 @@ public class GroupActivity extends
 	}
 
 	private void showMenuItems() {
-		if (leaveMenuItem == null || dissolveMenuItem == null) return;
 		if (isCreator) {
 			revealMenuItem.setVisible(false);
 			inviteMenuItem.setVisible(true);
diff --git a/briar-android/src/main/res/menu/group_actions.xml b/briar-android/src/main/res/menu/group_actions.xml
index eac18cd62..36ae7c24f 100644
--- a/briar-android/src/main/res/menu/group_actions.xml
+++ b/briar-android/src/main/res/menu/group_actions.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<item
 		android:id="@+id/action_group_invite"
 		android:icon="@drawable/social_share_white"
 		android:title="@string/groups_invite_members"
-		app:showAsAction="ifRoom"/>
+		android:visible="false"
+		app:showAsAction="ifRoom"
+		tools:visible="true"/>
 
 	<item
 		android:id="@+id/action_group_member_list"
@@ -19,18 +22,24 @@
 		android:id="@+id/action_group_reveal"
 		android:icon="@drawable/ic_visibility_white"
 		android:title="@string/groups_reveal_contacts"
-		app:showAsAction="never"/>
+		android:visible="false"
+		app:showAsAction="never"
+		tools:visible="true"/>
 
 	<item
 		android:id="@+id/action_group_leave"
 		android:icon="@drawable/action_delete_white"
 		android:title="@string/groups_leave"
-		app:showAsAction="never"/>
+		android:visible="false"
+		app:showAsAction="never"
+		tools:visible="true"/>
 
 	<item
 		android:id="@+id/action_group_dissolve"
 		android:icon="@drawable/action_delete_white"
 		android:title="@string/groups_dissolve"
-		app:showAsAction="never"/>
+		android:visible="false"
+		app:showAsAction="never"
+		tools:visible="true"/>
 
 </menu>
\ No newline at end of file