Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

[android] Hide role-dependant private group menu items by default

Browse Source 
and only enable them once we know our role
This commit is contained in:
Torsten Grote
2018-12-18 10:30:39 -02:00
parent 0089c1ac6d
commit 115675d7b6
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java
View File

@@ -138,7 +138,6 @@ public class GroupActivity extends
inviteMenuItem = menu.findItem(R.id.action_group_invite); inviteMenuItem = menu.findItem(R.id.action_group_invite);
leaveMenuItem = menu.findItem(R.id.action_group_leave); leaveMenuItem = menu.findItem(R.id.action_group_leave);
dissolveMenuItem = menu.findItem(R.id.action_group_dissolve); dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
showMenuItems();
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@@ -208,7 +207,6 @@ public class GroupActivity extends
} }
private void showMenuItems() { private void showMenuItems() {
if (leaveMenuItem == null || dissolveMenuItem == null) return;
if (isCreator) { if (isCreator) {
revealMenuItem.setVisible(false); revealMenuItem.setVisible(false);
inviteMenuItem.setVisible(true); inviteMenuItem.setVisible(true);

19
briar-android/src/main/res/menu/group_actions.xml
View File

@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu <menu
xmlns:android="http://schemas.android.com/apk/res/android" 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 <item
android:id="@+id/action_group_invite" android:id="@+id/action_group_invite"
android:icon="@drawable/social_share_white" android:icon="@drawable/social_share_white"
android:title="@string/groups_invite_members" android:title="@string/groups_invite_members"
app:showAsAction="ifRoom"/> android:visible="false"
app:showAsAction="ifRoom"
tools:visible="true"/>
<item <item
android:id="@+id/action_group_member_list" android:id="@+id/action_group_member_list"
@@ -19,18 +22,24 @@
android:id="@+id/action_group_reveal" android:id="@+id/action_group_reveal"
android:icon="@drawable/ic_visibility_white" android:icon="@drawable/ic_visibility_white"
android:title="@string/groups_reveal_contacts" android:title="@string/groups_reveal_contacts"
app:showAsAction="never"/> android:visible="false"
app:showAsAction="never"
tools:visible="true"/>
<item <item
android:id="@+id/action_group_leave" android:id="@+id/action_group_leave"
android:icon="@drawable/action_delete_white" android:icon="@drawable/action_delete_white"
android:title="@string/groups_leave" android:title="@string/groups_leave"
app:showAsAction="never"/> android:visible="false"
app:showAsAction="never"
tools:visible="true"/>
<item <item
android:id="@+id/action_group_dissolve" android:id="@+id/action_group_dissolve"
android:icon="@drawable/action_delete_white" android:icon="@drawable/action_delete_white"
android:title="@string/groups_dissolve" android:title="@string/groups_dissolve"
app:showAsAction="never"/> android:visible="false"
app:showAsAction="never"
tools:visible="true"/>
</menu> </menu>