Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 18:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put the default message timer behind a feature flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-05-18 19:26:25 -04:00
parent 790413680d
commit 2f80e7f1ff
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
View File

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.signal.core.util.logging.Log;
@@ -380,7 +381,11 @@ public final class SettingsValues extends SignalStoreValues {
}
public int getUniversalExpireTimer() {
return getInteger(UNIVERSAL_EXPIRE_TIMER, 0);
if (FeatureFlags.defaultMessageTimer()) {
return getInteger(UNIVERSAL_EXPIRE_TIMER, 0);
} else {
return 0;
}
}
private @Nullable Uri getUri(@NonNull String key) {