From 85a49bc472ee2ad057955e5681c29d81435822f9 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 27 Dec 2018 22:14:05 +0100
Subject: deduplicate disco response

fixes #283
---
 src/main/java/de/pixart/messenger/entities/MucOptions.java         | 4 ++--
 src/main/java/de/pixart/messenger/generator/AbstractGenerator.java | 1 -
 src/main/java/de/pixart/messenger/parser/IqParser.java             | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/pixart/messenger')

diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java
index da73b4630..6954995d9 100644
--- a/src/main/java/de/pixart/messenger/entities/MucOptions.java
+++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java
@@ -699,9 +699,9 @@ public class MucOptions {
         private MucOptions options;
         private ChatState chatState = Config.DEFAULT_CHATSTATE;
 
-        public User(MucOptions options, Jid from) {
+        public User(MucOptions options, Jid fullJid) {
             this.options = options;
-            this.fullJid = from;
+            this.fullJid = fullJid;
         }
 
         public String getName() {
diff --git a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
index 710a4fb8e..94d73fdac 100644
--- a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
@@ -111,7 +111,6 @@ public abstract class AbstractGenerator {
 
     public List<String> getFeatures(Account account) {
         ArrayList<String> features = new ArrayList<>(Arrays.asList(FEATURES));
-        features.addAll(Arrays.asList(FEATURES));
         if (mXmppConnectionService.confirmMessages()) {
             features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES));
         }
diff --git a/src/main/java/de/pixart/messenger/parser/IqParser.java b/src/main/java/de/pixart/messenger/parser/IqParser.java
index fae27730d..24e8aad98 100644
--- a/src/main/java/de/pixart/messenger/parser/IqParser.java
+++ b/src/main/java/de/pixart/messenger/parser/IqParser.java
@@ -321,7 +321,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
                 account.getBlocklist().addAll(jids);
                 if (packet.getType() == IqPacket.TYPE.SET) {
                     boolean removed = false;
-                    for(Jid jid : jids) {
+                    for (Jid jid : jids) {
                         removed |= mXmppConnectionService.removeBlockedConversations(account, jid);
                     }
                     if (removed) {
@@ -359,7 +359,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
             mXmppConnectionService.sendIqPacket(account, response, null);
         } else if (packet.hasChild("open", "http://jabber.org/protocol/ibb")
                 || packet.hasChild("data", "http://jabber.org/protocol/ibb")
-                || packet.hasChild("close","http://jabber.org/protocol/ibb")) {
+                || packet.hasChild("close", "http://jabber.org/protocol/ibb")) {
             mXmppConnectionService.getJingleConnectionManager()
                     .deliverIbbPacket(account, packet);
         } else if (packet.hasChild("query", "http://jabber.org/protocol/disco#info")) {
-- 
cgit v1.2.3