From 8110a3804933d895b7b4156bc052235623fcf2c2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 28 Jun 2016 10:34:43 +0200
Subject: don't show 'create conference' toast on invite

---
 src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')

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;
 		}
 
-- 
cgit v1.2.3