From 4c3882689f6d2d881a035237f7cacc40b5ebc4b3 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 19 Jul 2023 17:45:11 -0400
Subject: [PATCH] Let PNP feature flag override CDS compat flag.

---
 .../main/java/org/thoughtcrime/securesms/util/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index ff2b0e7d51..1a394fd668 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -613,7 +613,7 @@ public final class FeatureFlags {
 
   /** True if you should use CDS in compat mode (i.e. request ACI's even if you don't know the access key), otherwise false. */
   public static boolean cdsCompatMode() {
-    return getBoolean(CDS_COMPAT_MODE, true);
+    return !phoneNumberPrivacy() && getBoolean(CDS_COMPAT_MODE, true);
   }
 
   /** True if the new conversation fragment should be used. */