aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-27 10:35:00 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-27 10:35:00 +0200
commit44833c1499caf41e6433d76a90fa42ab60a5dec1 (patch)
tree56c3fcf4fe23e2c4e7d2a7e3b70fbae97d6c8093 /src/main/java/eu/siacs/conversations/parser
parent21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b (diff)
don't push default muc conf twice
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/PresenceParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index edcd986ed..b5718b612 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -78,7 +78,7 @@ public class PresenceParser extends AbstractParser implements
} else {
mucOptions.addUser(user);
}
- if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED)) {
+ if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED) && mucOptions.autoPushConfiguration()) {
Log.d(Config.LOGTAG,mucOptions.getAccount().getJid().toBareJid()
+": room '"
+mucOptions.getConversation().getJid().toBareJid()