aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-28 10:34:43 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-28 10:34:43 +0200
commitb5caa8fa356d362d1ce30c23de20b656235a0b91 (patch)
treef31b217c0bd985acf281691887a6dbebe6edca43 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent8882c6b6fdb81ca207cdc9a481e18c79b34e7f95 (diff)
don't show 'create conference' toast on invite
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 0ed35049..4744e302 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1121,9 +1121,10 @@ public class ConversationActivity extends XmppActivity
updateConversationList();
if (mPendingConferenceInvite != null) {
- mPendingConferenceInvite.execute(this);
- mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG);
- mToast.show();
+ if (mPendingConferenceInvite.execute(this)) {
+ mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
+ mToast.show();
+ }
mPendingConferenceInvite = null;
}