From e770241ed40649c602b785dec491329bf84ee323 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 5 May 2022 12:18:20 -0300 Subject: [PATCH] Remove story text posts feature flag. --- .../securesms/mediasend/Camera1Fragment.java | 2 +- .../securesms/mediasend/CameraXFragment.java | 2 +- .../securesms/mediasend/v2/MediaSelectionActivity.kt | 2 -- .../org/thoughtcrime/securesms/util/FeatureFlags.java | 11 ----------- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index ee856ff381..c50177a606 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -283,7 +283,7 @@ public class Camera1Fragment extends LoggingFragment implements CameraFragment, View toggleSpacer = requireView().findViewById(R.id.toggle_spacer); if (toggleSpacer != null) { - if (Stories.isFeatureEnabled() && FeatureFlags.storiesTextPosts()) { + if (Stories.isFeatureEnabled()) { StoryDisplay storyDisplay = StoryDisplay.Companion.getStoryDisplay(getResources().getDisplayMetrics().widthPixels, getResources().getDisplayMetrics().heightPixels); if (storyDisplay == StoryDisplay.SMALL) { toggleSpacer.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java index 69b490d4e6..bcde5515e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java @@ -260,7 +260,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment { View toggleSpacer = requireView().findViewById(R.id.toggle_spacer); if (toggleSpacer != null) { - if ( Stories.isFeatureEnabled() && FeatureFlags.storiesTextPosts()) { + if ( Stories.isFeatureEnabled()) { StoryDisplay storyDisplay = StoryDisplay.Companion.getStoryDisplay(getResources().getDisplayMetrics().widthPixels, getResources().getDisplayMetrics().heightPixels); if (storyDisplay == StoryDisplay.SMALL) { toggleSpacer.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt index 448dd1a7d2..a422a3602d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt @@ -42,7 +42,6 @@ import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryPostCreationViewMod import org.thoughtcrime.securesms.mediasend.v2.text.send.TextStoryPostSendRepository import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.stories.Stories -import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.navigation.safeNavigate import org.thoughtcrime.securesms.util.visible @@ -209,7 +208,6 @@ class MediaSelectionActivity : private fun canDisplayStorySwitch(): Boolean { return Stories.isFeatureEnabled() && - FeatureFlags.storiesTextPosts() && isCameraFirst() && !viewModel.hasSelectedMedia() && destination == MediaSelectionDestination.ChooseAfterMediaSelection 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 eec418ba83..ce075257b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -89,7 +89,6 @@ public final class FeatureFlags { private static final String CDSH = "android.cdsh"; private static final String STORIES = "android.stories.2"; private static final String STORIES_TEXT_FUNCTIONS = "android.stories.text.functions"; - private static final String STORIES_TEXT_POSTS = "android.stories.text.posts.2"; private static final String HARDWARE_AEC_BLOCKLIST_MODELS = "android.calling.hardwareAecBlockList"; private static final String SOFTWARE_AEC_BLOCKLIST_MODELS = "android.calling.softwareAecBlockList"; private static final String USE_HARDWARE_AEC_IF_OLD = "android.calling.useHardwareAecIfOlderThanApi29"; @@ -141,7 +140,6 @@ public final class FeatureFlags { DONOR_BADGES_DISPLAY, STORIES, STORIES_TEXT_FUNCTIONS, - STORIES_TEXT_POSTS, HARDWARE_AEC_BLOCKLIST_MODELS, SOFTWARE_AEC_BLOCKLIST_MODELS, USE_HARDWARE_AEC_IF_OLD, @@ -464,15 +462,6 @@ public final class FeatureFlags { return getBoolean(STORIES_TEXT_FUNCTIONS, false); } - /** - * Whether the user supports sending Story text posts - * - * NOTE: This feature is still under ongoing development, do not enable. - */ - public static boolean storiesTextPosts() { - return getBoolean(STORIES_TEXT_POSTS, false); - } - /** * Whether or not donor badges should be displayed throughout the app. */