diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-27 10:35:00 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-27 10:35:00 +0200 |
| commit | 44833c1499caf41e6433d76a90fa42ab60a5dec1 (patch) | |
| tree | 56c3fcf4fe23e2c4e7d2a7e3b70fbae97d6c8093 /src/main/java/eu/siacs/conversations/services | |
| parent | 21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b (diff) | |
don't push default muc conf twice
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index c05b78aa0..b88ee7af2 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1832,6 +1832,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa account.pendingConferenceLeaves.remove(conversation); if (account.getStatus() == Account.State.ONLINE) { conversation.resetMucOptions(); + if (onConferenceJoined != null) { + conversation.getMucOptions().flagNoAutoPushConfiguration(); + } conversation.setHasMessagesLeftOnServer(false); fetchConferenceConfiguration(conversation, new OnConferenceConfigurationFetched() { |