sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't show 'show contact details' context menu item when contact isn not in roster

This commit is contained in:
Daniel Gultsch 2015-07-20 14:24:59 +02:00
parent 2d2da11bfa
commit 9c91b9036a
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -283,7 +283,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room);
MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
startConversation.setVisible(true);
showContactDetails.setVisible(true);
if (contact != null) {
showContactDetails.setVisible(true);
}
if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) &&
self.getAffiliation().outranks(user.getAffiliation())) {
if (mAdvancedMode) {
@ -305,14 +307,17 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
}
}
super.onCreateContextMenu(menu,v,menuInfo);
super.onCreateContextMenu(menu, v, menuInfo);
}
@Override
public boolean onContextItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_contact_details:
switchToContactDetails(mSelectedUser.getContact());
Contact contact = mSelectedUser.getContact();
if (contact != null) {
switchToContactDetails(contact);
}
return true;
case R.id.start_conversation:
startConversation(mSelectedUser);

50
src/main/res/menu/muc_details_context.xml
View File

@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_contact_details"
android:title="@string/action_contact_details"
android:visible="false" />
<item
android:id="@+id/start_conversation"
android:title="@string/start_conversation"
android:visible="false" />
<item
android:id="@+id/give_membership"
android:visible="false"/>
<item
android:id="@+id/action_contact_details"
android:title="@string/action_contact_details"
android:visible="false"/>
<item
android:id="@+id/give_membership"
android:title="@string/grant_membership"
android:visible="false" />
<item
android:id="@+id/give_admin_privileges"
android:visible="false"/>
<item
android:id="@+id/give_admin_privileges"
android:title="@string/grant_admin_privileges"
android:visible="false"/>
<item
android:id="@+id/remove_admin_privileges"
android:visible="false"/>
<item
android:id="@+id/remove_admin_privileges"
android:title="@string/remove_admin_privileges"
android:visible="false"/>
android:visible="false"/>
<item
android:id="@+id/remove_membership"
android:title="@string/remove_membership"
android:visible="false"/>
<item
android:id="@+id/ban_from_conference"
android:title="@string/ban_from_conference"
android:visible="false" />
<item
android:id="@+id/remove_from_room"
<item
android:id="@+id/remove_membership"
android:title="@string/remove_membership"
android:visible="false"/>
<item
android:id="@+id/ban_from_conference"
android:title="@string/ban_from_conference"
android:visible="false"/>
<item
android:id="@+id/remove_from_room"
android:title="@string/remove_from_room"
android:visible="false"/>
android:visible="false"/>
</menu>