From 8f11febe84f4d9ed3ee55dcea7ea4224ac741ef2 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 24 Feb 2018 15:57:53 +0100
Subject: only explicitly request device list for users not in roster

---
 src/main/java/de/pixart/messenger/parser/PresenceParser.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/de/pixart/messenger/parser/PresenceParser.java b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
index a58b3d016..abe5a2271 100644
--- a/src/main/java/de/pixart/messenger/parser/PresenceParser.java
+++ b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
@@ -76,7 +76,12 @@ public class PresenceParser extends AbstractParser implements
                         }
                         boolean isNew = mucOptions.updateUser(user);
                         final AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
-                        if (isNew && user.getRealJid() != null && mucOptions.isPrivateAndNonAnonymous() && axolotlService.hasEmptyDeviceList(user.getRealJid())) {
+                        Contact contact = user.getContact();
+                        if (isNew
+                                && user.getRealJid() != null
+                                && mucOptions.isPrivateAndNonAnonymous()
+                                && (contact == null || !contact.mutualPresenceSubscription())
+                                && axolotlService.hasEmptyDeviceList(user.getRealJid())) {
                             axolotlService.fetchDeviceIds(user.getRealJid());
                         }
                         if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED) && mucOptions.autoPushConfiguration()) {
-- 
cgit v1.2.3