]> nmode's Git Repositories - signal-cli/commitdiff
Add missing null check
authorAsamK <asamk@gmx.de>
Mon, 18 Oct 2021 14:48:07 +0000 (16:48 +0200)
committerAsamK <asamk@gmx.de>
Mon, 18 Oct 2021 14:48:07 +0000 (16:48 +0200)
Fixes #784

lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java

index 0deafc833db86b12a06d2dad4ab0400463bdb357..cc90de5ca049ff0aa3f7e6c184a72be2cecd7050 100644 (file)
@@ -1081,11 +1081,12 @@ public class ManagerImpl implements Manager {
         }
 
         final var address = account.getRecipientStore().resolveRecipientAddress(identityInfo.getRecipientId());
         }
 
         final var address = account.getRecipientStore().resolveRecipientAddress(identityInfo.getRecipientId());
+        final var scannableFingerprint = identityHelper.computeSafetyNumberForScanning(identityInfo.getRecipientId(),
+                identityInfo.getIdentityKey());
         return new Identity(address,
                 identityInfo.getIdentityKey(),
                 identityHelper.computeSafetyNumber(identityInfo.getRecipientId(), identityInfo.getIdentityKey()),
         return new Identity(address,
                 identityInfo.getIdentityKey(),
                 identityHelper.computeSafetyNumber(identityInfo.getRecipientId(), identityInfo.getIdentityKey()),
-                identityHelper.computeSafetyNumberForScanning(identityInfo.getRecipientId(),
-                        identityInfo.getIdentityKey()).getSerialized(),
+                scannableFingerprint == null ? null : scannableFingerprint.getSerialized(),
                 identityInfo.getTrustLevel(),
                 identityInfo.getDateAdded());
     }
                 identityInfo.getTrustLevel(),
                 identityInfo.getDateAdded());
     }