From d269fd47eecc7b4f34634118926a19bc084d07a4 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 29 Jun 2018 22:22:29 +0200 Subject: use room name (if available and != localpart) as group name --- .../messenger/services/XmppConnectionService.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/main/java/de/pixart/messenger/services') diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 487308c52..14e27cf47 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -2697,23 +2697,8 @@ public class XmppConnectionService extends Service { sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() { @Override public void onIqPacketReceived(Account account, IqPacket packet) { - Element query = packet.findChild("query", "http://jabber.org/protocol/disco#info"); - if (packet.getType() == IqPacket.TYPE.RESULT && query != null) { - String name = null; - ArrayList features = new ArrayList<>(); - for (Element child : query.getChildren()) { - if (child.getName().equals("feature")) { - String var = child.getAttribute("var"); - if (var != null) { - features.add(var); - } - } else if (child.getName().equals("identity")) { - name = child.getAttribute("name"); - } - } - Element form = query.findChild("x", Namespace.DATA); - Data data = form == null ? null : Data.parse(form); - if (conversation.getMucOptions().updateConfiguration(features, name, data)) { + if (packet.getType() == IqPacket.TYPE.RESULT) { + if (conversation.getMucOptions().updateConfiguration(new ServiceDiscoveryResult(packet))) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": muc configuration changed for " + conversation.getJid().asBareJid()); updateConversation(conversation); } -- cgit v1.2.3