From 64b4d0115b677fa73b20c1389b24bbc9b1656221 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 21 May 2018 20:57:22 +0200 Subject: prefetch omemo device lists only if muc has omemo enabled --- .../java/de/pixart/messenger/services/XmppConnectionService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index ca07069b0..6ca1c80c4 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -2429,7 +2429,7 @@ public class XmppConnectionService extends Service { @Override public void onIqPacketReceived(Account account, IqPacket packet) { - + final boolean omemoEnabled = conversation.getNextEncryption() == Message.ENCRYPTION_AXOLOTL; Element query = packet.query("http://jabber.org/protocol/muc#admin"); if (packet.getType() == IqPacket.TYPE.RESULT && query != null) { for (Element child : query.getChildren()) { @@ -2438,7 +2438,8 @@ public class XmppConnectionService extends Service { if (!user.realJidMatchesAccount()) { boolean isNew = conversation.getMucOptions().updateUser(user); Contact contact = user.getContact(); - if (isNew + if (omemoEnabled + && isNew && user.getRealJid() != null && (contact == null || !contact.mutualPresenceSubscription()) && axolotlService.hasEmptyDeviceList(user.getRealJid())) { -- cgit v1.2.3