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

don't show 'create conference' toast on invite

This commit is contained in:
Daniel Gultsch 2016-06-28 10:34:43 +02:00
parent 8882c6b6fd
commit b5caa8fa35
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -1121,9 +1121,10 @@ public class ConversationActivity extends XmppActivity
updateConversationList(); updateConversationList();
if (mPendingConferenceInvite != null) { if (mPendingConferenceInvite != null) {
mPendingConferenceInvite.execute(this); if (mPendingConferenceInvite.execute(this)) {
mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG); mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
mToast.show(); mToast.show();
}
mPendingConferenceInvite = null; mPendingConferenceInvite = null;
} }

9
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View File

@ -981,9 +981,10 @@ public abstract class XmppActivity extends Activity {
if (requestCode == REQUEST_INVITE_TO_CONVERSATION && resultCode == RESULT_OK) { if (requestCode == REQUEST_INVITE_TO_CONVERSATION && resultCode == RESULT_OK) {
mPendingConferenceInvite = ConferenceInvite.parse(data); mPendingConferenceInvite = ConferenceInvite.parse(data);
if (xmppConnectionServiceBound && mPendingConferenceInvite != null) { if (xmppConnectionServiceBound && mPendingConferenceInvite != null) {
mPendingConferenceInvite.execute(this); if (mPendingConferenceInvite.execute(this)) {
mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG); mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
mToast.show(); mToast.show();
}
mPendingConferenceInvite = null; mPendingConferenceInvite = null;
} }
} }
@ -1218,19 +1219,21 @@ public abstract class XmppActivity extends Activity {
return invite; return invite;
} }
public void execute(XmppActivity activity) { public boolean execute(XmppActivity activity) {
XmppConnectionService service = activity.xmppConnectionService; XmppConnectionService service = activity.xmppConnectionService;
Conversation conversation = service.findConversationByUuid(this.uuid); Conversation conversation = service.findConversationByUuid(this.uuid);
if (conversation == null) { if (conversation == null) {
return; return false;
} }
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
for (Jid jid : jids) { for (Jid jid : jids) {
service.invite(conversation, jid); service.invite(conversation, jid);
} }
return false;
} else { } else {
jids.add(conversation.getJid().toBareJid()); jids.add(conversation.getJid().toBareJid());
service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback); service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback);
return true;
} }
} }
} }