diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java index 8b2444235c..b9fd49a42a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java @@ -77,7 +77,7 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E player.setWindow(requireActivity().getWindow()); player.setVideoSource(slide, true); - if (FeatureFlags.videoTrimming() && MediaConstraints.isVideoTranscodeAvailable()) { + if (MediaConstraints.isVideoTranscodeAvailable()) { hud = view.findViewById(R.id.video_editor_hud); hud.setEventListener(this); updateHud(data); 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 e034770008..377c3553b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -52,7 +52,6 @@ public final class FeatureFlags { private static final String PINS_FOR_ALL = "android.pinsForAll"; private static final String PINS_MEGAPHONE_KILL_SWITCH = "android.pinsMegaphoneKillSwitch"; private static final String PROFILE_NAMES_MEGAPHONE = "android.profileNamesMegaphone"; - private static final String VIDEO_TRIMMING = "android.videoTrimming.2"; private static final String STORAGE_SERVICE = "android.storageService.2"; /** @@ -61,7 +60,6 @@ public final class FeatureFlags { */ private static final Set REMOTE_CAPABLE = Sets.newHashSet( - VIDEO_TRIMMING, PINS_FOR_ALL, PINS_MEGAPHONE_KILL_SWITCH, PROFILE_NAMES_MEGAPHONE, @@ -87,7 +85,6 @@ public final class FeatureFlags { * more burden on the reader to ensure that the app experience remains consistent. */ private static final Set HOT_SWAPPABLE = Sets.newHashSet( - VIDEO_TRIMMING, PINS_MEGAPHONE_KILL_SWITCH, STORAGE_SERVICE ); @@ -199,11 +196,6 @@ public final class FeatureFlags { TextSecurePreferences.getFirstInstallVersion(ApplicationDependencies.getApplication()) < 600; } - /** Allow trimming videos. */ - public static boolean videoTrimming() { - return getValue(VIDEO_TRIMMING, false); - } - /** Whether or not we can actually restore data on a new installation. NOT remote-configurable. */ public static boolean storageServiceRestore() { return false;