From c00943591d34da94ae5558b17df57338ef7c0d94 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 11 Oct 2023 17:24:55 -0400
Subject: [PATCH] Remove PNP flag from reading some settings.

---
 .../securesms/keyvalue/PhoneNumberPrivacyValues.java   | 10 +---------
 1 file changed, 1 insertion(+), 9 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 7849b338ef..9aeec97fd2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
@@ -37,10 +37,6 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
   }
 
   public @NonNull PhoneNumberSharingMode getPhoneNumberSharingMode() {
-    if (!FeatureFlags.phoneNumberPrivacy()) {
-      return PhoneNumberSharingMode.EVERYONE;
-    }
-
     return PhoneNumberSharingMode.deserialize(getInteger(SHARING_MODE, PhoneNumberSharingMode.EVERYONE.serialize()));
   }
 
@@ -49,10 +45,6 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
   }
 
   public @NonNull PhoneNumberListingMode getPhoneNumberListingMode() {
-    if (!FeatureFlags.phoneNumberPrivacy()) {
-      return PhoneNumberListingMode.LISTED;
-    }
-
     return PhoneNumberListingMode.deserialize(getInteger(LISTING_MODE, PhoneNumberListingMode.LISTED.serialize()));
   }
 
@@ -85,7 +77,7 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
    * All certificate types required according to the feature flags.
    */
   public Collection<CertificateType> getAllCertificateTypes() {
-    return FeatureFlags.phoneNumberPrivacy() ? BOTH_CERTIFICATES : REGULAR_CERTIFICATE;
+    return BOTH_CERTIFICATES;
   }
 
   public enum PhoneNumberSharingMode {