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

use direct invites to re-invite muc members

Browse source
This commit is contained in:
Daniel Gultsch 2016-06-30 23:09:16 +02:00
parent 30110431ba
commit 9efa242d96
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -405,6 +405,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
@Override @Override
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
Jid jid = mSelectedUser.getRealJid();
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_contact_details: case R.id.action_contact_details:
Contact contact = mSelectedUser.getContact(); Contact contact = mSelectedUser.getContact();
@ -416,22 +417,22 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
startConversation(mSelectedUser); startConversation(mSelectedUser);
return true; return true;
case R.id.give_admin_privileges: 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; return true;
case R.id.give_membership: case R.id.give_membership:
xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.MEMBER,this); xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.MEMBER,this);
return true; return true;
case R.id.remove_membership: case R.id.remove_membership:
xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getRealJid(), MucOptions.Affiliation.NONE,this); xmppConnectionService.changeAffiliationInConference(mConversation, jid, MucOptions.Affiliation.NONE,this);
return true; return true;
case R.id.remove_admin_privileges: 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; return true;
case R.id.remove_from_room: case R.id.remove_from_room:
removeFromRoom(mSelectedUser); removeFromRoom(mSelectedUser);
return true; return true;
case R.id.ban_from_conference: 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) { if (mSelectedUser.getRole() != MucOptions.Role.NONE) {
xmppConnectionService.changeRoleInConference(mConversation, mSelectedUser.getName(), MucOptions.Role.NONE, this); xmppConnectionService.changeRoleInConference(mConversation, mSelectedUser.getName(), MucOptions.Role.NONE, this);
} }
@ -439,6 +440,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
case R.id.send_private_message: case R.id.send_private_message:
privateMsgInMuc(mConversation,mSelectedUser.getName()); privateMsgInMuc(mConversation,mSelectedUser.getName());
return true; return true;
case R.id.invite:
xmppConnectionService.directInvite(mConversation, jid);
return true;
default: default:
return super.onContextItemSelected(item); return super.onContextItemSelected(item);
} }