Inline the pnp feature flag.

2025-12-26 05:58:09 +00:00 · 2024-02-06 14:01:38 -05:00
parent 8ad77ac7aa
commit c359ddf3c8
14 changed files with 29 additions and 142 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
@@ -40,7 +40,6 @@ import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.ExpirationUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -119,18 +118,16 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac

  private fun getConfiguration(state: PrivacySettingsState): DSLConfiguration {
    return configure {
-      if (FeatureFlags.phoneNumberPrivacy()) {
-        clickPref(
-          title = DSLSettingsText.from(R.string.preferences_app_protection__phone_number),
-          summary = DSLSettingsText.from(R.string.preferences_app_protection__choose_who_can_see),
-          onClick = {
-            Navigation.findNavController(requireView())
-              .safeNavigate(R.id.action_privacySettingsFragment_to_phoneNumberPrivacySettingsFragment)
-          }
-        )
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences_app_protection__phone_number),
+        summary = DSLSettingsText.from(R.string.preferences_app_protection__choose_who_can_see),
+        onClick = {
+          Navigation.findNavController(requireView())
+            .safeNavigate(R.id.action_privacySettingsFragment_to_phoneNumberPrivacySettingsFragment)
+        }
+      )

-        dividerPref()
-      }
+      dividerPref()

      clickPref(
        title = DSLSettingsText.from(R.string.PrivacySettingsFragment__blocked),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
@@ -28,7 +28,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientForeverObserver
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.subscription.Subscriber
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -260,11 +259,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(

              SignalDatabase.recipients.debugClearE164AndPni(recipient.id)

-              val splitRecipientId: RecipientId = if (FeatureFlags.phoneNumberPrivacy()) {
-                SignalDatabase.recipients.getAndPossiblyMergePnpVerified(null, recipient.pni.orElse(null), recipient.requireE164())
-              } else {
-                SignalDatabase.recipients.getAndPossiblyMerge(recipient.pni.orElse(null), recipient.requireE164())
-              }
+              val splitRecipientId: RecipientId = SignalDatabase.recipients.getAndPossiblyMergePnpVerified(null, recipient.pni.orElse(null), recipient.requireE164())
              val splitRecipient: Recipient = Recipient.resolved(splitRecipientId)
              val splitThreadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(splitRecipient)

@@ -287,7 +282,6 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
      clickPref(
        title = DSLSettingsText.from("Split without creating threads"),
        summary = DSLSettingsText.from("Splits this contact into two recipients so you can test merging them together. This will become the PNI-based recipient. Another recipient will be made with this ACI and profile key. Doing a CDS refresh should allow you to see a Session Switchover Event, as long as you had a session with this PNI."),
-        isEnabled = FeatureFlags.phoneNumberPrivacy(),
        onClick = {
          MaterialAlertDialogBuilder(requireContext())
            .setTitle("Are you sure?")
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
@@ -25,7 +25,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.RegistrationUtil
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
@@ -70,7 +69,7 @@ object ContactDiscovery {
      context = context,
      descriptor = "refresh-all",
      refresh = {
-        ContactDiscoveryRefreshV2.refreshAll(context, useCompat = FeatureFlags.cdsCompatMode())
+        ContactDiscoveryRefreshV2.refreshAll(context)
      },
      removeSystemContactLinksIfMissing = true,
      notifyOfNewUsers = notifyOfNewUsers,
@@ -87,9 +86,7 @@ object ContactDiscovery {
    refreshRecipients(
      context = context,
      descriptor = "refresh-multiple",
-      refresh = {
-        ContactDiscoveryRefreshV2.refresh(context, recipients, useCompat = FeatureFlags.cdsCompatMode())
-      },
+      refresh = { ContactDiscoveryRefreshV2.refresh(context, recipients) },
      removeSystemContactLinksIfMissing = false,
      notifyOfNewUsers = notifyOfNewUsers
    )
@@ -103,9 +100,7 @@ object ContactDiscovery {
    val result: RefreshResult = refreshRecipients(
      context = context,
      descriptor = "refresh-single",
-      refresh = {
-        ContactDiscoveryRefreshV2.refresh(context, listOf(recipient), useCompat = FeatureFlags.cdsCompatMode(), timeoutMs = timeoutMs)
-      },
+      refresh = { ContactDiscoveryRefreshV2.refresh(context, listOf(recipient), timeoutMs = timeoutMs) },
      removeSystemContactLinksIfMissing = false,
      notifyOfNewUsers = notifyOfNewUsers
    )
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
@@ -44,7 +44,7 @@ object ContactDiscoveryRefreshV2 {
  @WorkerThread
  @Synchronized
  @JvmStatic
-  fun refreshAll(context: Context, useCompat: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
+  fun refreshAll(context: Context, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
    val recipientE164s: Set<String> = SignalDatabase.recipients.getAllE164s().sanitize()
    val systemE164s: Set<String> = SystemContactsRepository.getAllDisplayNumbers(context).toE164s(context).sanitize()

@@ -53,7 +53,6 @@ object ContactDiscoveryRefreshV2 {
      systemE164s = systemE164s,
      inputPreviousE164s = SignalDatabase.cds.getAllE164s(),
      isPartialRefresh = false,
-      useCompat = useCompat,
      timeoutMs = timeoutMs
    )
  }
@@ -62,14 +61,14 @@ object ContactDiscoveryRefreshV2 {
  @WorkerThread
  @Synchronized
  @JvmStatic
-  fun refresh(context: Context, inputRecipients: List<Recipient>, useCompat: Boolean, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
+  fun refresh(context: Context, inputRecipients: List<Recipient>, timeoutMs: Long? = null): ContactDiscovery.RefreshResult {
    val recipients: List<Recipient> = inputRecipients.map { it.resolve() }
    val inputE164s: Set<String> = recipients.mapNotNull { it.e164.orElse(null) }.toSet().sanitize()

    return if (inputE164s.size > MAXIMUM_ONE_OFF_REQUEST_SIZE) {
      Log.i(TAG, "List of specific recipients to refresh is too large! (Size: ${recipients.size}). Doing a full refresh instead.")

-      val fullResult: ContactDiscovery.RefreshResult = refreshAll(context, useCompat = useCompat, timeoutMs = timeoutMs)
+      val fullResult: ContactDiscovery.RefreshResult = refreshAll(context, timeoutMs = timeoutMs)
      val inputIds: Set<RecipientId> = recipients.map { it.id }.toSet()

      ContactDiscovery.RefreshResult(
@@ -82,7 +81,6 @@ object ContactDiscoveryRefreshV2 {
        systemE164s = inputE164s,
        inputPreviousE164s = emptySet(),
        isPartialRefresh = true,
-        useCompat = useCompat,
        timeoutMs = timeoutMs
      )
    }
@@ -94,10 +92,9 @@ object ContactDiscoveryRefreshV2 {
    systemE164s: Set<String>,
    inputPreviousE164s: Set<String>,
    isPartialRefresh: Boolean,
-    useCompat: Boolean,
    timeoutMs: Long? = null
  ): ContactDiscovery.RefreshResult {
-    val tag = "refreshInternal-${if (useCompat) "compat" else "v2"}"
+    val tag = "refreshInternal-v2"
    val stopwatch = Stopwatch(tag)

    val previousE164s: Set<String> = if (SignalStore.misc().cdsToken != null && !isPartialRefresh) inputPreviousE164s else emptySet()
@@ -127,7 +124,6 @@ object ContactDiscoveryRefreshV2 {
        previousE164s,
        newE164s,
        SignalDatabase.recipients.getAllServiceIdProfileKeyPairs(),
-        useCompat,
        Optional.ofNullable(token),
        BuildConfig.CDSI_MRENCLAVE,
        timeoutMs
@@ -165,10 +161,6 @@ object ContactDiscoveryRefreshV2 {
    val registeredIds: MutableSet<RecipientId> = mutableSetOf()
    val rewrites: MutableMap<String, String> = mutableMapOf()

-    if (useCompat && !response.isCompatResponse()) {
-      Log.w(TAG, "Was told to useCompat, but the server responded with a non-compat response! Assuming the server has shut off compat mode.")
-    }
-
    val transformed: Map<String, CdsV2Result> = response.results.mapValues { entry -> CdsV2Result(entry.value.pni, entry.value.aci.orElse(null)) }
    val fuzzyOutput: OutputResult<CdsV2Result> = FuzzyPhoneNumberHelper.generateOutput(transformed, fuzzyInput)

@@ -238,13 +230,4 @@ object ContactDiscoveryRefreshV2 {
    val nearestThousand = (this.toDouble() / 1000).roundToInt()
    return "~${nearestThousand}k"
  }
-
-  /**
-   * Responses that respect useCompat will have an ACI for every user. If it doesn't, it means is a PNP response where some accounts may only have PNI's.
-   * There may come a day when we request compat mode but the server refuses to allow it, so we need to be able to detect when that happens to fallback
-   * to the PNP behavior.
-   */
-  private fun CdsiV2Service.Response.isCompatResponse(): Boolean {
-    return this.results.values.all { it.hasAci() }
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
@@ -209,17 +209,15 @@ public class CreateProfileFragment extends LoggingFragment {
      binding.profileDescriptionText.setLinkColor(ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary));
      binding.profileDescriptionText.setOnLinkClickListener(v -> CommunicationActions.openBrowserLink(requireContext(), getString(R.string.EditProfileFragment__support_link)));

-      if (FeatureFlags.phoneNumberPrivacy()) {
-        getParentFragmentManager().setFragmentResultListener(WhoCanFindMeByPhoneNumberFragment.REQUEST_KEY, getViewLifecycleOwner(), (requestKey, result) -> {
-          if (WhoCanFindMeByPhoneNumberFragment.REQUEST_KEY.equals(requestKey)) {
-            presentWhoCanFindMeDescription(SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode());
-          }
-        });
+      getParentFragmentManager().setFragmentResultListener(WhoCanFindMeByPhoneNumberFragment.REQUEST_KEY, getViewLifecycleOwner(), (requestKey, result) -> {
+        if (WhoCanFindMeByPhoneNumberFragment.REQUEST_KEY.equals(requestKey)) {
+          presentWhoCanFindMeDescription(SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode());
+        }
+      });

-        binding.whoCanFindMeContainer.setVisibility(View.VISIBLE);
-        binding.whoCanFindMeContainer.setOnClickListener(v -> SafeNavigation.safeNavigate(Navigation.findNavController(v), CreateProfileFragmentDirections.actionCreateProfileFragmentToPhoneNumberPrivacy()));
-        presentWhoCanFindMeDescription(SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode());
-      }
+      binding.whoCanFindMeContainer.setVisibility(View.VISIBLE);
+      binding.whoCanFindMeContainer.setOnClickListener(v -> SafeNavigation.safeNavigate(Navigation.findNavController(v), CreateProfileFragmentDirections.actionCreateProfileFragmentToPhoneNumberPrivacy()));
+      presentWhoCanFindMeDescription(SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode());
    }

    binding.finishButton.setOnClickListener(v -> {
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberFragment.kt
@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.databinding.WhoCanFindMeByPhoneNumberFragmentBinding
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter

 /**
@@ -38,8 +37,6 @@ class WhoCanFindMeByPhoneNumberFragment : DSLSettingsFragment(
  private val binding by ViewBinderDelegate(WhoCanFindMeByPhoneNumberFragmentBinding::bind)

  override fun bindAdapter(adapter: MappingAdapter) {
-    require(FeatureFlags.phoneNumberPrivacy())
-
    lifecycleDisposable += viewModel.state.subscribe {
      adapter.submitList(getConfiguration(it).toMappingModelList())
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -83,7 +83,6 @@ public final class FeatureFlags {
  private static final String SOFTWARE_AEC_BLOCKLIST_MODELS     = "android.calling.softwareAecBlockList";
  private static final String USE_HARDWARE_AEC_IF_OLD           = "android.calling.useHardwareAecIfOlderThanApi29";
  private static final String PAYMENTS_COUNTRY_BLOCKLIST        = "global.payments.disabledRegions";
-  public  static final String PHONE_NUMBER_PRIVACY              = "android.pnp";
  private static final String STORIES_AUTO_DOWNLOAD_MAXIMUM     = "android.stories.autoDownloadMaximum";
  private static final String TELECOM_MANUFACTURER_ALLOWLIST    = "android.calling.telecomAllowList";
  private static final String TELECOM_MODEL_BLOCKLIST           = "android.calling.telecomModelBlockList";
@@ -188,7 +187,6 @@ public final class FeatureFlags {
      CALLING_REACTIONS,
      NOTIFICATION_THUMBNAIL_BLOCKLIST,
      CALLING_RAISE_HAND,
-      PHONE_NUMBER_PRIVACY,
      USE_ACTIVE_CALL_MANAGER,
      GIF_SEARCH,
      AUDIO_REMUXING,
@@ -261,7 +259,6 @@ public final class FeatureFlags {
      CALLING_REACTIONS,
      NOTIFICATION_THUMBNAIL_BLOCKLIST,
      CALLING_RAISE_HAND,
-      PHONE_NUMBER_PRIVACY,
      VIDEO_RECORD_1X_ZOOM
  );

@@ -369,14 +366,6 @@ public final class FeatureFlags {
    return getString(CLIENT_EXPIRATION, null);
  }

-  /**
-   * Whether phone number privacy is enabled.
-   * IMPORTANT: This is under active development. Enabling this *will* break your contacts in terrible, irreversible ways.
-   */
-  public static boolean phoneNumberPrivacy() {
-    return getBoolean(PHONE_NUMBER_PRIVACY, false) || Environment.IS_PNP;
-  }
-
  /** Whether to use the custom streaming muxer or built in android muxer. */
  public static boolean useStreamingVideoMuxer() {
    return getBoolean(CUSTOM_VIDEO_MUXER, false);
@@ -597,15 +586,6 @@ public final class FeatureFlags {
    return getLong(MAX_ATTACHMENT_SIZE_BYTES, ByteUnit.MEGABYTES.toBytes(100));
  }

-  /** 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() {
-    if (phoneNumberPrivacy()) {
-      return false;
-    } else {
-      return !getBoolean(CDS_DISABLE_COMPAT_MODE, false);
-    }
-  }
-
  /**
   * Allow the video players to read from the temporary download files for attachments.
   * @return whether this functionality is enabled.