empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Enable video trimming feature by default.

Browse source
This commit is contained in:
Alan Evans 2020-04-02 09:38:11 -03:00 • committed by Greyson Parrelli
parent 040e1fe8f6
commit b8e17e0116
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
View file

@ -77,7 +77,7 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
player.setWindow(requireActivity().getWindow()); player.setWindow(requireActivity().getWindow());
player.setVideoSource(slide, true); player.setVideoSource(slide, true);
if (FeatureFlags.videoTrimming() && MediaConstraints.isVideoTranscodeAvailable()) { if (MediaConstraints.isVideoTranscodeAvailable()) {
hud = view.findViewById(R.id.video_editor_hud); hud = view.findViewById(R.id.video_editor_hud);
hud.setEventListener(this); hud.setEventListener(this);
updateHud(data); updateHud(data);

8
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -52,7 +52,6 @@ public final class FeatureFlags {
private static final String PINS_FOR_ALL = "android.pinsForAll"; private static final String PINS_FOR_ALL = "android.pinsForAll";
private static final String PINS_MEGAPHONE_KILL_SWITCH = "android.pinsMegaphoneKillSwitch"; private static final String PINS_MEGAPHONE_KILL_SWITCH = "android.pinsMegaphoneKillSwitch";
private static final String PROFILE_NAMES_MEGAPHONE = "android.profileNamesMegaphone"; 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"; 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( private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet(
VIDEO_TRIMMING,
PINS_FOR_ALL, PINS_FOR_ALL,
PINS_MEGAPHONE_KILL_SWITCH, PINS_MEGAPHONE_KILL_SWITCH,
PROFILE_NAMES_MEGAPHONE, PROFILE_NAMES_MEGAPHONE,
@ -87,7 +85,6 @@ public final class FeatureFlags {
* more burden on the reader to ensure that the app experience remains consistent. * more burden on the reader to ensure that the app experience remains consistent.
*/ */
private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet( private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet(
VIDEO_TRIMMING,
PINS_MEGAPHONE_KILL_SWITCH, PINS_MEGAPHONE_KILL_SWITCH,
STORAGE_SERVICE STORAGE_SERVICE
); );
@ -199,11 +196,6 @@ public final class FeatureFlags {
TextSecurePreferences.getFirstInstallVersion(ApplicationDependencies.getApplication()) < 600; 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. */ /** Whether or not we can actually restore data on a new installation. NOT remote-configurable. */
public static boolean storageServiceRestore() { public static boolean storageServiceRestore() {
return false; return false;