From: AsamK <asamk@gmx.de>
Date: Mon, 29 Aug 2022 17:31:07 +0000 (+0200)
Subject: Fix default value for phone number sharing mode
X-Git-Tag: v0.11.0~7
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/c7aa9834a92889783bf277c30b848ea14846ca0f

Fix default value for phone number sharing mode

Fixes #1002
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index bdd6221b..b89ed2b7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -96,7 +96,7 @@ public class UnidentifiedAccessHelper {
 
     private byte[] getSenderCertificateFor(final RecipientId recipientId) {
         final var sharingMode = account.getConfigurationStore().getPhoneNumberSharingMode();
-        if (sharingMode == PhoneNumberSharingMode.EVERYBODY || (
+        if (sharingMode == null || sharingMode == PhoneNumberSharingMode.EVERYBODY || (
                 sharingMode == PhoneNumberSharingMode.CONTACTS
                         && account.getContactStore().getContact(recipientId) != null
         )) {
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 72f6f3d5..279f6ee8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1545,7 +1545,8 @@ public class SignalAccount implements Closeable {
     }
 
     public boolean isDiscoverableByPhoneNumber() {
-        return configurationStore.getPhoneNumberUnlisted() == null || !configurationStore.getPhoneNumberUnlisted();
+        final var phoneNumberUnlisted = configurationStore.getPhoneNumberUnlisted();
+        return phoneNumberUnlisted == null || !phoneNumberUnlisted;
     }
 
     public void finishRegistration(final ACI aci, final PNI pni, final MasterKey masterKey, final String pin) {