From 772bafbe43ca06669de9bcf5dc5849ccc2c52694 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 1 Nov 2023 15:47:48 -0400
Subject: [PATCH] Inline feature flag to show ACI SN by default.

---
 .../thoughtcrime/securesms/util/FeatureFlags.java  | 11 -----------
 .../securesms/verify/VerifyIdentityActivity.java   | 13 +++----------
 .../verify/VerifySafetyNumberViewModel.kt          | 14 +++-----------
 3 files changed, 6 insertions(+), 32 deletions(-)

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 f21725b86b..f7cad3fd8f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -109,7 +109,6 @@ public final class FeatureFlags {
   private static final String SVR2_KILLSWITCH                   = "android.svr2.killSwitch";
   private static final String CDS_DISABLE_COMPAT_MODE           = "cds.disableCompatibilityMode";
   private static final String FCM_MAY_HAVE_MESSAGES_KILL_SWITCH = "android.fcmNotificationFallbackKillSwitch";
-  private static final String SAFETY_NUMBER_ACI                 = "global.safetyNumberAci";
   public  static final String PROMPT_FOR_NOTIFICATION_LOGS      = "android.logs.promptNotifications";
   private static final String PROMPT_FOR_NOTIFICATION_CONFIG    = "android.logs.promptNotificationsConfig";
   public  static final String PROMPT_BATTERY_SAVER              = "android.promptBatterySaver";
@@ -180,7 +179,6 @@ public final class FeatureFlags {
       AD_HOC_CALLING,
       SVR2_KILLSWITCH,
       CDS_DISABLE_COMPAT_MODE,
-      SAFETY_NUMBER_ACI,
       FCM_MAY_HAVE_MESSAGES_KILL_SWITCH,
       PROMPT_FOR_NOTIFICATION_LOGS,
       PROMPT_FOR_NOTIFICATION_CONFIG,
@@ -259,7 +257,6 @@ public final class FeatureFlags {
       MAX_ATTACHMENT_SIZE_BYTES,
       SVR2_KILLSWITCH,
       CDS_DISABLE_COMPAT_MODE,
-      SAFETY_NUMBER_ACI,
       FCM_MAY_HAVE_MESSAGES_KILL_SWITCH,
       PROMPT_FOR_NOTIFICATION_LOGS,
       PROMPT_FOR_NOTIFICATION_CONFIG,
@@ -373,14 +370,6 @@ public final class FeatureFlags {
     return getBoolean(VERIFY_V2, false);
   }
 
-  /** Whether or not we show the ACI safety number as the default initial safety number. */
-  public static boolean showAciSafetyNumberAsDefault() {
-    long estimatedServerTimeSeconds = (System.currentTimeMillis() - SignalStore.misc().getLastKnownServerTimeOffset()) / 1000;
-    long flagEnableTimeSeconds      = getLong(SAFETY_NUMBER_ACI, Long.MAX_VALUE);
-
-    return estimatedServerTimeSeconds > flagEnableTimeSeconds;
-  }
-
   /** The raw client expiration JSON string. */
   public static String clientExpiration() {
     return getString(CLIENT_EXPIRATION, null);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
index c7af36de96..82b1caef84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
@@ -56,16 +56,9 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity {
                                                          boolean verified) {
     Recipient recipient = Recipient.live(recipientId).resolve();
 
-    if (FeatureFlags.showAciSafetyNumberAsDefault()) {
-      if (!recipient.hasServiceId()) {
-        showExchangeMessagesDialog(context);
-        return;
-      }
-    } else {
-      if (!recipient.hasServiceId() || !recipient.hasE164()) {
-        showExchangeMessagesDialog(context);
-        return;
-      }
+    if (!recipient.hasServiceId()) {
+      showExchangeMessagesDialog(context);
+      return;
     }
 
     context.startActivity(newIntent(context, recipientId, identityKey, verified));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
index 21787cb9c1..089de4840a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
@@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.IdentityUtil
 
 class VerifySafetyNumberViewModel(
@@ -70,17 +69,10 @@ class VerifySafetyNumberViewModel(
         aciFingerprint = SafetyNumberFingerprint(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity, generator.createFor(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity))
       }
 
-      if (FeatureFlags.showAciSafetyNumberAsDefault()) {
-        if (aciFingerprint != null) {
-          fingerprintList.add(aciFingerprint)
-          if (e164Fingerprint != null) {
-            fingerprintList.add(e164Fingerprint)
-          }
-        }
-      } else {
-        if (aciFingerprint != null && e164Fingerprint != null) {
+      if (aciFingerprint != null) {
+        fingerprintList.add(aciFingerprint)
+        if (e164Fingerprint != null) {
           fingerprintList.add(e164Fingerprint)
-          fingerprintList.add(aciFingerprint)
         }
       }