Fix ACI null pointer

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index e84028cfe7ebc6b66d54389171cd9c712de217f9..1f6b3d87bdd1427ff43649c0a34ffd546d8e33da 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -845,7 +845,7 @@ public class SignalAccount implements Closeable {
     }
 
     public RecipientId getSelfRecipientId() {
     }
 
     public RecipientId getSelfRecipientId() {

-        return recipientStore.resolveRecipientTrusted(new RecipientAddress(aci.uuid(), username));
+        return recipientStore.resolveRecipientTrusted(new RecipientAddress(aci == null ? null : aci.uuid(), username));

     }
 
     public String getEncryptedDeviceName() {
     }
 
     public String getEncryptedDeviceName() {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 26a43423927dba73a16a7b835b99f7b7e7a4ec56..2f07bd2e6197886d1d70f3e3196a98e2bb3e692a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -139,7 +139,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
 
     @Override
     public RecipientId resolveRecipient(ACI aci) {
 
     @Override
     public RecipientId resolveRecipient(ACI aci) {

-        return resolveRecipient(new RecipientAddress(aci.uuid()), false);
+        return resolveRecipient(new RecipientAddress(aci == null ? null : aci.uuid()), false);

     }
 
     @Override
     }
 
     @Override