TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-10 08:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PIN feature flags.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-02-05 21:02:18 -05:00
parent 62814490b3
commit 5e59f77f83
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
View File

@ -127,4 +127,8 @@ public final class KbsValues {
public @NonNull PinKeyboardType getKeyboardType() { public @NonNull PinKeyboardType getKeyboardType() {
return PinKeyboardType.fromCode(store.getString(KEYBOARD_TYPE, null)); return PinKeyboardType.fromCode(store.getString(KEYBOARD_TYPE, null));
} }
public boolean hasMigratedToPinsForAll() {
return store.getString(KEYBOARD_TYPE, null) != null;
}
} }

11
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@ -51,7 +51,7 @@ public final class FeatureFlags {
private static final String MESSAGE_REQUESTS = generateKey("messageRequests"); private static final String MESSAGE_REQUESTS = generateKey("messageRequests");
private static final String USERNAMES = generateKey("usernames"); private static final String USERNAMES = generateKey("usernames");
private static final String STORAGE_SERVICE = generateKey("storageService"); private static final String STORAGE_SERVICE = generateKey("storageService");
private static final String PINS_FOR_ALL = generateKey("beta.pinsForAll"); // TODO [alex] remove beta prefix private static final String PINS_FOR_ALL = generateKey("pinsForAll");
private static final String PINS_MEGAPHONE_KILL_SWITCH = generateKey("pinsMegaphoneKillSwitch"); private static final String PINS_MEGAPHONE_KILL_SWITCH = generateKey("pinsMegaphoneKillSwitch");
/** /**
@ -59,7 +59,8 @@ public final class FeatureFlags {
* remotely, place it in here. * remotely, place it in here.
*/ */
private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet( private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet(
PINS_MEGAPHONE_KILL_SWITCH PINS_FOR_ALL,
PINS_MEGAPHONE_KILL_SWITCH
); );
/** /**
@ -87,7 +88,7 @@ public final class FeatureFlags {
* Flags in this set will stay true forever once they receive a true value from a remote config. * Flags in this set will stay true forever once they receive a true value from a remote config.
*/ */
private static final Set<String> STICKY = Sets.newHashSet( private static final Set<String> STICKY = Sets.newHashSet(
PINS_FOR_ALL // TODO [alex] -- add android.beta.pinsForAll to sticky set when we remove prefix PINS_FOR_ALL
); );
private static final Map<String, Boolean> REMOTE_VALUES = new TreeMap<>(); private static final Map<String, Boolean> REMOTE_VALUES = new TreeMap<>();
@ -154,7 +155,9 @@ public final class FeatureFlags {
/** Enables new KBS UI and notices but does not require user to set a pin */ /** Enables new KBS UI and notices but does not require user to set a pin */
public static boolean pinsForAll() { public static boolean pinsForAll() {
return SignalStore.registrationValues().pinWasRequiredAtRegistration() || getValue(PINS_FOR_ALL, false); return SignalStore.registrationValues().pinWasRequiredAtRegistration() ||
SignalStore.kbsValues().hasMigratedToPinsForAll() ||
getValue(PINS_FOR_ALL, false);
} }
/** Safety flag to disable Pins for All Megaphone */ /** Safety flag to disable Pins for All Megaphone */