2 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index f81903a28..a090b72d1 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -389,11 +389,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
         final int hash = deviceIds.hashCode();
         final boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
-        if (me && hash == this.lastDeviceListNotificationHash) {
-            Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ignoring duplicate own device id list");
-            return;
+        if (me) {
+            if (hash == this.lastDeviceListNotificationHash) {
+                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ignoring duplicate own device id list");
+                return;
+            }
+            this.lastDeviceListNotificationHash = hash;
         }
-        this.lastDeviceListNotificationHash = hash;
         boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
         if (me) {
             deviceIds.remove(getOwnDeviceId());
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 3a32f02a0..7b2231cc3 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1370,7 +1370,7 @@ public class XmppConnectionService extends Service {
                     if (!message.needsUploading()) {
                         String pgpBody = message.getEncryptedBody();
                         String decryptedBody = message.getBody();
-                        message.setBody(pgpBody);
+                        message.setBody(pgpBody); //TODO might throw NPE
                         message.setEncryption(Message.ENCRYPTION_PGP);
                         if (message.edited()) {
                             message.setBody(decryptedBody);