diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-30 23:09:16 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-07-01 16:26:04 +0200 |
commit | 1fa695e4e9a4d3f4eb89d72b47486fcc79f9fb8e (patch) | |
tree | abca8d2b85a47e16090e0c528c0ff3c4b4cbe8f7 /src/main/java/eu | |
parent | f0151ac61a67df4a630c01a37f7a51142b9a9ea1 (diff) |
use direct invites to re-invite muc members
Diffstat (limited to 'src/main/java/eu')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index ed8a7255f..4ed413718 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -404,6 +404,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers @Override public boolean onContextItemSelected(MenuItem item) { + Jid jid = mSelectedUser.getRealJid(); switch (item.getItemId()) { case R.id.action_contact_details: Contact contact = mSelectedUser.getContact(); @@ -415,22 +416,22 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers startConversation(mSelectedUser); return true; case R.id.give_admin_privileges: - xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.ADMIN,this); + xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.ADMIN,this); return true; case R.id.give_membership: - xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.MEMBER,this); + xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.MEMBER,this); return true; case R.id.remove_membership: - xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.NONE,this); + xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.NONE,this); return true; case R.id.remove_admin_privileges: - xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.MEMBER,this); + xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.MEMBER,this); return true; case R.id.remove_from_room: removeFromRoom(mSelectedUser); return true; case R.id.ban_from_conference: - xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.OUTCAST,this); + xmppConnectionService.changeAffiliationInConference(mConversation,jid, MucOptions.Affiliation.OUTCAST,this); if (mSelectedUser.getRole() != MucOptions.Role.NONE) { xmppConnectionService.changeRoleInConference(mConversation, mSelectedUser.getName(), MucOptions.Role.NONE, this); } @@ -438,6 +439,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers case R.id.send_private_message: privateMsgInMuc(mConversation,mSelectedUser.getName()); return true; + case R.id.invite: + xmppConnectionService.directInvite(mConversation, jid); + return true; default: return super.onContextItemSelected(item); } |