aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-11-26 06:53:24 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-11-26 06:53:24 +0100
commit84120a341a0ac122af45c4bb2ab6a2b3651f65eb (patch)
tree2993ebdbcfda69de401bf578419d8367e6fbac28
parent210de7d78194cbe41f9e99da14f9fc356f0db589 (diff)
removed unnecessary configuration fetch after join
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java2
1 files changed, 1 insertions, 1 deletions
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);
}
});