Put the default message timer behind a feature flag.

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt

@@ -138,6 +138,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
         }
       )
 
+      if (FeatureFlags.defaultMessageTimer()) {
         dividerPref()
 
         sectionHeaderPref(R.string.PrivacySettingsFragment__disappearing_messages)
@@ -154,6 +155,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
             )
           )
         )
+      }
 
       dividerPref()
 

app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.signal.core.util.logging.Log;
@@ -380,7 +381,11 @@ public final class SettingsValues extends SignalStoreValues {
   }
 
   public int getUniversalExpireTimer() {
+    if (FeatureFlags.defaultMessageTimer()) {
       return getInteger(UNIVERSAL_EXPIRE_TIMER, 0);
+    } else {
+      return 0;
+    }
   }
 
   private @Nullable Uri getUri(@NonNull String key) {

app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java

@@ -81,6 +81,7 @@ public final class FeatureFlags {
   private static final String MP4_GIF_SEND_SUPPORT              = "android.mp4GifSendSupport";
   private static final String MEDIA_QUALITY_LEVELS              = "android.mediaQuality.levels";
   private static final String GROUPS_V2_DESCRIPTION_VERSION     = "android.groupsv2.descriptionVersion";
+  private static final String DEFAULT_MESSAGE_TIMER             = "android.defaultMessageTimer";
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -115,7 +116,8 @@ public final class FeatureFlags {
       NOTIFICATION_REWRITE,
       MP4_GIF_SEND_SUPPORT,
       MEDIA_QUALITY_LEVELS,
-      GROUPS_V2_DESCRIPTION_VERSION
+      GROUPS_V2_DESCRIPTION_VERSION,
+      DEFAULT_MESSAGE_TIMER
   );
 
   @VisibleForTesting
@@ -162,7 +164,8 @@ public final class FeatureFlags {
       NOTIFICATION_REWRITE,
       MP4_GIF_SEND_SUPPORT,
       MEDIA_QUALITY_LEVELS,
-      GROUPS_V2_DESCRIPTION_VERSION
+      GROUPS_V2_DESCRIPTION_VERSION,
+      DEFAULT_MESSAGE_TIMER
   );
 
   /**
@@ -366,6 +369,10 @@ public final class FeatureFlags {
     return getVersionFlag(GROUPS_V2_DESCRIPTION_VERSION) == VersionFlag.ON;
   }
 
+  public static boolean defaultMessageTimer() {
+    return getBoolean(DEFAULT_MESSAGE_TIMER, false);
+  }
+
   /** Only for rendering debug info. */
   public static synchronized @NonNull Map<String, Object> getMemoryValues() {
     return new TreeMap<>(REMOTE_VALUES);