From 879fca0e11e53286a4a576b0aa74ca002896836f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 6 Feb 2024 14:47:57 -0500
Subject: [PATCH] Interpret unknown phone number sharing setting as 'off'.

---
 .../securesms/keyvalue/PhoneNumberPrivacyValues.java         | 5 ++---
 .../org/thoughtcrime/securesms/recipients/Recipient.java     | 2 +-
 .../thoughtcrime/securesms/storage/StorageSyncModels.java    | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
index 7f5b7e1443..afbfc2fee8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
@@ -43,10 +43,9 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
   }
 
   public boolean isPhoneNumberSharingEnabled() {
-    // TODO [pnp] When we launch usernames, the default should return false
     return switch (getPhoneNumberSharingMode()) {
-      case DEFAULT, EVERYBODY -> true;
-      case NOBODY -> false;
+      case EVERYBODY -> true;
+      case DEFAULT, NOBODY -> false;
     };
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index f5ddd02c4f..35d86e47e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -691,7 +691,7 @@ public class Recipient {
    * Whether or not we should show this user's e164 in the interface.
    */
   public boolean shouldShowE164() {
-    return hasE164() && (isSystemContact() || getPhoneNumberSharing() != PhoneNumberSharingState.DISABLED);
+    return hasE164() && (isSystemContact() || getPhoneNumberSharing() == PhoneNumberSharingState.ENABLED);
   }
 
   public @NonNull Optional<String> getEmail() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
index 7bec8ec6bf..db2f14320e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
@@ -65,9 +65,8 @@ public final class StorageSyncModels {
   }
 
   public static AccountRecord.PhoneNumberSharingMode localToRemotePhoneNumberSharingMode(PhoneNumberPrivacyValues.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
-    // TODO [pnp] When we launch usernames, we want DEFAULT to map to NOBODY. In fact, we can just pass a boolean into this function instead of an enum.
     switch (phoneNumberPhoneNumberSharingMode) {
-      case DEFAULT  : return AccountRecord.PhoneNumberSharingMode.UNKNOWN;
+      case DEFAULT  : return AccountRecord.PhoneNumberSharingMode.NOBODY;
       case EVERYBODY: return AccountRecord.PhoneNumberSharingMode.EVERYBODY;
       case NOBODY   : return AccountRecord.PhoneNumberSharingMode.NOBODY;
       default       : throw new AssertionError();