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
committerChristian Schneppe <christian@pix-art.de>2016-06-28 14:01:40 +0200
commit8110a3804933d895b7b4156bc052235623fcf2c2 (patch)
treef3f69f176ee5e96d63a769395385d7020d8de739 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent1c620de83d6f501b2c6e75882cdd279f2f861dba (diff)
don't show 'create conference' toast on invite
Diffstat (limited to '')
-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 b05f00ec6..3920adc81 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1343,9 +1343,10 @@ public class ConversationActivity extends XmppActivity
}
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;
}