From ef058a1644eec5b432cf0e01773ac5f6fae2eeac Mon Sep 17 00:00:00 2001
From: Clark Chen <clark@signal.org>
Date: Tue, 11 Apr 2023 15:32:52 -0400
Subject: [PATCH] Inline export account data feature flag.

---
 .../messages/MessageContentProcessorTestV2.kt     |  1 -
 .../app/account/AccountSettingsFragment.kt        | 15 ++++++---------
 .../thoughtcrime/securesms/util/FeatureFlags.java | 11 +----------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTestV2.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTestV2.kt
index c566b645a9..17c6d35d7f 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTestV2.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTestV2.kt
@@ -8,7 +8,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
-import org.signal.core.util.logging.Log
 import org.signal.core.util.readToList
 import org.signal.core.util.select
 import org.signal.core.util.toSingleLine
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
index 0b7afd76fd..dd7e44be61 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
@@ -30,7 +30,6 @@ import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity
 import org.thoughtcrime.securesms.lock.v2.KbsConstants
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -122,14 +121,12 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
         }
       )
 
-      if (FeatureFlags.exportAccountData()) {
-        clickPref(
-          title = DSLSettingsText.from(R.string.AccountSettingsFragment__request_account_data),
-          onClick = {
-            Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_exportAccountFragment)
-          }
-        )
-      }
+      clickPref(
+        title = DSLSettingsText.from(R.string.AccountSettingsFragment__request_account_data),
+        onClick = {
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_exportAccountFragment)
+        }
+      )
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__delete_account, ContextCompat.getColor(requireContext(), R.color.signal_alert_primary)),
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 217132791e..fa29d1755a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -108,7 +108,6 @@ public final class FeatureFlags {
   private static final String ANY_ADDRESS_PORTS_KILL_SWITCH     = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
   private static final String CALLS_TAB                         = "android.calls.tab";
   private static final String TEXT_FORMATTING_SPOILER_SEND      = "android.textFormatting.spoilerSend";
-  private static final String EXPORT_ACCOUNT_DATA               = "android.exportAccountData";
   private static final String AD_HOC_CALLING                    = "android.calling.ad.hoc";
 
   /**
@@ -168,8 +167,7 @@ public final class FeatureFlags {
       TEXT_FORMATTING,
       ANY_ADDRESS_PORTS_KILL_SWITCH,
       CALLS_TAB,
-      TEXT_FORMATTING_SPOILER_SEND,
-      EXPORT_ACCOUNT_DATA
+      TEXT_FORMATTING_SPOILER_SEND
   );
 
   @VisibleForTesting
@@ -607,13 +605,6 @@ public final class FeatureFlags {
     return getBoolean(CALLS_TAB, false);
   }
 
-  /**
-   * Whether or not the ability to export account data is enabled
-   */
-  public static boolean exportAccountData() {
-    return getBoolean(EXPORT_ACCOUNT_DATA, false);
-  }
-
   /**
    * Whether or not ad-hoc calling is enabled
    */