From 84120a341a0ac122af45c4bb2ab6a2b3651f65eb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 26 Nov 2015 06:53:24 +0100
Subject: removed unnecessary configuration fetch after join

---
 .../java/eu/siacs/conversations/services/XmppConnectionService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 96da5026..145a017e 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1733,7 +1733,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						packet.addChild("x", "jabber:x:signed").setContent(sig);
 					}
 					sendPresencePacket(account, packet);
-					fetchConferenceConfiguration(conversation);
 					if (onConferenceJoined != null) {
 						onConferenceJoined.onConferenceJoined(conversation);
 					}
@@ -1755,6 +1754,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				@Override
 				public void onFetchFailed(final Conversation conversation, Element error) {
 					join(conversation);
+					fetchConferenceConfiguration(conversation);
 				}
 			});
 
-- 
cgit v1.2.3