Rename FeatureFlags -> RemoteConfig.

2026-04-22 18:00:02 +01:00 · 2024-06-12 14:58:39 -04:00
parent ecbea9fd95
commit d698f74d0b
136 changed files with 460 additions and 478 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -62,7 +62,7 @@ import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -178,7 +178,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {


    previewView.setScaleType(PREVIEW_SCALE_TYPE);
-    if (FeatureFlags.customCameraXController()) {
+    if (RemoteConfig.customCameraXController()) {
      View focusIndicator = view.findViewById(R.id.camerax_focus_indicator);
      cameraController = new SignalCameraController(requireContext(), getViewLifecycleOwner(), previewView, focusIndicator);
    } else {
@@ -199,7 +199,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {

    onOrientationChanged();

-    if (FeatureFlags.customCameraXController()) {
+    if (RemoteConfig.customCameraXController()) {
      cameraController.initializeAndBind(requireContext(), getViewLifecycleOwner());
    }

@@ -705,7 +705,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
    @Override
    public void onOrientationChanged(int orientation) {
      if (cameraController != null) {
-        if (FeatureFlags.customCameraXController()) {
+        if (RemoteConfig.customCameraXController()) {
          cameraController.setImageRotation(orientation);
        }
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.mediasend.camerax.CameraXModePolicy;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.Debouncer;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.video.VideoUtil;

@@ -259,7 +259,7 @@ class CameraXVideoCaptureHelper implements CameraButtonView.VideoCaptureListener
  }

  public float getDefaultVideoZoomRatio() {
-    if (FeatureFlags.startVideoRecordAt1x()) {
+    if (RemoteConfig.startVideoRecordAt1x()) {
      return 1f;
    } else {
      return Objects.requireNonNull(cameraController.getZoomState().getValue()).getMinZoomRatio();
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt
@@ -5,7 +5,7 @@ import android.os.Build
 import androidx.camera.view.CameraController
 import org.signal.core.util.asListContains
 import org.thoughtcrime.securesms.mms.MediaConstraints
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.video.VideoUtil

 /**
@@ -86,7 +86,7 @@ sealed class CameraXModePolicy {
      val isMixedModeSupported = isVideoSupported &&
        Build.VERSION.SDK_INT >= 26 &&
        CameraXUtil.isMixedModeSupported(context) &&
-        !FeatureFlags.cameraXMixedModelBlocklist.asListContains(Build.MODEL)
+        !RemoteConfig.cameraXMixedModelBlocklist.asListContains(Build.MODEL)

      return when {
        isMixedModeSupported -> Mixed(isQrScanEnabled)
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend.camerax

 import android.os.Build
 import org.signal.core.util.asListContains
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig

 /**
 * Some phones don't work well with CameraX. This class uses a remote config to decide
@@ -12,6 +12,6 @@ object CameraXModelBlocklist {

  @JvmStatic
  fun isBlocklisted(): Boolean {
-    return FeatureFlags.cameraXModelBlocklist.asListContains(Build.MODEL)
+    return RemoteConfig.cameraXModelBlocklist.asListContains(Build.MODEL)
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
@@ -44,8 +44,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.Debouncer
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FullscreenHelper
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.WindowUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
@@ -92,7 +92,7 @@ class MediaSelectionActivity :
  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
    setContentView(R.layout.media_selection_activity)

-    if (FeatureFlags.customCameraXController) {
+    if (RemoteConfig.customCameraXController) {
      requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt
@@ -9,8 +9,8 @@ import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.Stories
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.video.TranscodingPreset

 data class MediaSelectionState(
@@ -36,7 +36,7 @@ data class MediaSelectionState(

  val transcodingPreset: TranscodingPreset = MediaConstraints.getPushMediaConstraints(SentMediaQuality.fromCode(quality.code)).videoTranscodingSettings

-  val maxSelection = FeatureFlags.maxAttachmentCount
+  val maxSelection = RemoteConfig.maxAttachmentCount

  val canSend = !isSent && selectedMedia.isNotEmpty()

--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import java.io.FileDescriptor
 import java.util.Optional
@@ -94,7 +94,7 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
            .setTitle(R.string.MediaCaptureFragment_device_link_dialog_title)
            .setMessage(R.string.MediaCaptureFragment_device_link_dialog_body)
            .setPositiveButton(R.string.MediaCaptureFragment_device_link_dialog_continue) { d, _ ->
-              if (FeatureFlags.internalUser) {
+              if (RemoteConfig.internalUser) {
                startActivity(AppSettingsActivity.linkedDevices(requireContext()))
              } else {
                startActivity(DeviceActivity.getIntentForScanner(requireContext()))
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sharing.ShareContact
 import org.thoughtcrime.securesms.sharing.ShareSelectionAdapter
 import org.thoughtcrime.securesms.sharing.ShareSelectionMappingModel
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig

 class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment() {

@@ -65,7 +65,7 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
    val contactRecycler: RecyclerView = view.findViewById(R.id.contact_recycler)
    mediator = ContactSearchMediator(
      fragment = this,
-      selectionLimits = FeatureFlags.shareSelectionLimit,
+      selectionLimits = RemoteConfig.shareSelectionLimit,
      displayOptions = ContactSearchAdapter.DisplayOptions(
        displayCheckBox = true,
        displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
@@ -10,14 +10,14 @@ import kotlinx.parcelize.Parcelize
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig

@Parcelize
 data class TextStoryPostCreationState(
  val body: CharSequence = "",
  val textColor: Int = HSVColorSlider.getLastColor(),
  val textColorStyle: TextColorStyle = TextColorStyle.NO_BACKGROUND,
-  val textAlignment: TextAlignment = if (FeatureFlags.storiesTextFunctions) TextAlignment.START else TextAlignment.CENTER,
+  val textAlignment: TextAlignment = if (RemoteConfig.storiesTextFunctions) TextAlignment.START else TextAlignment.CENTER,
  val textFont: TextFont = TextFont.REGULAR,
  @IntRange(from = 0, to = 100) val textScale: Int = 50,
  val backgroundColor: ChatColors = TextStoryBackgroundColors.getInitialBackgroundColor(),
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.scribbles.HSVColorSlider
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.getColor
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setColor
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setUpForColor
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.fragments.findListener
@@ -105,7 +105,7 @@ class TextStoryPostTextEntryFragment : KeyboardEntryDialogFragment(
      backgroundButton
    )

-    if (FeatureFlags.storiesTextFunctions) {
+    if (RemoteConfig.storiesTextFunctions) {
      fadeableViews = fadeableViews + alignmentButton
      alignmentButton.visibility = View.VISIBLE
      scaleBar.visibility = View.VISIBLE