narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Conference Options: fix context menus for people not in roster

Browse source
This commit is contained in:
Daniel Gultsch 2017-12-03 18:09:14 +01:00
parent 208de32790
commit 95553750a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -366,7 +366,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.mSelectedUser = user; this.mSelectedUser = user;
String name; String name;
final Contact contact = user.getContact(); final Contact contact = user.getContact();
if (contact != null) { if (contact != null && contact.showInRoster()) {
name = contact.getDisplayName(); name = contact.getDisplayName();
} else if (user.getRealJid() != null){ } else if (user.getRealJid() != null){
name = user.getRealJid().toBareJid().toString(); name = user.getRealJid().toBareJid().toString();
@ -385,7 +385,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
MenuItem banFromConference = menu.findItem(R.id.ban_from_conference); MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
MenuItem invite = menu.findItem(R.id.invite); MenuItem invite = menu.findItem(R.id.invite);
startConversation.setVisible(true); startConversation.setVisible(true);
if (contact != null) { if (contact != null && contact.showInRoster()) {
showContactDetails.setVisible(!contact.isSelf()); showContactDetails.setVisible(!contact.isSelf());
} }
if (user.getRole() == MucOptions.Role.NONE) { if (user.getRole() == MucOptions.Role.NONE) {