fetch device ids for muc members w/o known devices

2 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 9a8e005b8..25190b32d 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -654,7 +654,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                         MucOptions.User user = AbstractParser.parseItem(conversation, child);
                         Log.d(Config.LOGTAG, account.getJid() + ": changing affiliation for " + user.getRealJid() + " to " + user.getAffiliation() + " in " + conversation.getJid().toBareJid());
                         if (!user.realJidMatchesAccount()) {
-                            conversation.getMucOptions().updateUser(user);
+                            boolean isNew = conversation.getMucOptions().updateUser(user);
                             mXmppConnectionService.getAvatarService().clear(conversation);
                             mXmppConnectionService.updateMucRosterUi();
                             mXmppConnectionService.updateConversationUi();
@@ -665,6 +665,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                     Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": removed " + jid + " from crypto targets of " + conversation.getName());
                                     conversation.setAcceptedCryptoTargets(cryptoTargets);
                                     mXmppConnectionService.updateConversation(conversation);
+                                } else if (isNew && user.getRealJid() != null && account.getAxolotlService().hasEmptyDeviceList(user.getRealJid())) {
+                                    account.getAxolotlService().fetchDeviceIds(user.getRealJid());
                                 }
                             }
                         }
diff --git a/src/main/java/de/pixart/messenger/parser/PresenceParser.java b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
index c95380085..37efcdc8b 100644
--- a/src/main/java/de/pixart/messenger/parser/PresenceParser.java
+++ b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
@@ -8,6 +8,7 @@ import java.util.List;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.crypto.PgpEngine;
+import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
@@ -75,7 +76,11 @@ public class PresenceParser extends AbstractParser implements
                                 mucOptions.onRenameListener = null;
                             }
                         }
-                        mucOptions.updateUser(user);
+                        boolean isNew = mucOptions.updateUser(user);
+                        final AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
+                        if (isNew && user.getRealJid() != null && mucOptions.membersOnly() && mucOptions.nonanonymous() && axolotlService.hasEmptyDeviceList(user.getRealJid())) {
+                            axolotlService.fetchDeviceIds(user.getRealJid());
+                        }
                         if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED) && mucOptions.autoPushConfiguration()) {
                             Log.d(Config.LOGTAG, mucOptions.getAccount().getJid().toBareJid()
                                     + ": room '"