Enable video trimming feature by default.

signalapp · Apr 3, 2020 · b8e17e0 · b8e17e0
1 parent 040e1fe
commit b8e17e0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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 void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     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
@@ -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<String> 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<String> HOT_SWAPPABLE = Sets.newHashSet(
-      VIDEO_TRIMMING,
       PINS_MEGAPHONE_KILL_SWITCH,
       STORAGE_SERVICE
   );
@@ -199,11 +196,6 @@ public static boolean profileNamesMegaphone() {
            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;