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

Remove the final KBS feature flags.

Browse source
This commit is contained in:
Greyson Parrelli 2020-07-07 08:08:34 -04:00
parent eb02dacfdc
commit 33c527f15e
3 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
View file

@ -16,15 +16,11 @@ class PinsForAllSchedule implements MegaphoneSchedule {
private static final String TAG = Log.tag(PinsForAllSchedule.class); private static final String TAG = Log.tag(PinsForAllSchedule.class);
@VisibleForTesting @VisibleForTesting
static final long DAYS_UNTIL_FULLSCREEN = 8L; static final long DAYS_UNTIL_FULLSCREEN = 4L;
private final MegaphoneSchedule schedule = new RecurringSchedule(TimeUnit.HOURS.toMillis(2)); private final MegaphoneSchedule schedule = new RecurringSchedule(TimeUnit.HOURS.toMillis(2));
static boolean shouldDisplayFullScreen(long firstVisible, long currentTime) { static boolean shouldDisplayFullScreen(long firstVisible, long currentTime) {
if (!FeatureFlags.pinsForAllMandatory()) {
return false;
}
if (firstVisible == 0L) { if (firstVisible == 0L) {
return false; return false;
} }
@ -52,10 +48,6 @@ class PinsForAllSchedule implements MegaphoneSchedule {
return false; return false;
} }
if (FeatureFlags.pinsForAllMegaphoneKillSwitch()) {
return false;
}
if (pinCreationFailedDuringRegistration()) { if (pinCreationFailedDuringRegistration()) {
return true; return true;
} }

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

@ -51,8 +51,6 @@ public final class FeatureFlags {
private static final String UUIDS = "android.uuids"; private static final String UUIDS = "android.uuids";
private static final String USERNAMES = "android.usernames"; private static final String USERNAMES = "android.usernames";
private static final String PINS_FOR_ALL_MANDATORY = "android.pinsForAllMandatory";
private static final String PINS_MEGAPHONE_KILL_SWITCH = "android.pinsMegaphoneKillSwitch";
private static final String ATTACHMENTS_V3 = "android.attachmentsV3"; private static final String ATTACHMENTS_V3 = "android.attachmentsV3";
private static final String REMOTE_DELETE = "android.remoteDelete"; private static final String REMOTE_DELETE = "android.remoteDelete";
private static final String PROFILE_FOR_CALLING = "android.profileForCalling.2"; private static final String PROFILE_FOR_CALLING = "android.profileForCalling.2";
@ -71,8 +69,6 @@ public final class FeatureFlags {
*/ */
private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet( private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet(
PINS_FOR_ALL_MANDATORY,
PINS_MEGAPHONE_KILL_SWITCH,
ATTACHMENTS_V3, ATTACHMENTS_V3,
REMOTE_DELETE, REMOTE_DELETE,
PROFILE_FOR_CALLING, PROFILE_FOR_CALLING,
@ -103,7 +99,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(
PINS_MEGAPHONE_KILL_SWITCH,
ATTACHMENTS_V3 ATTACHMENTS_V3
); );
@ -199,16 +194,6 @@ public final class FeatureFlags {
return value; return value;
} }
/** Makes it so the user will eventually see a fullscreen splash requiring them to create a PIN. */
public static boolean pinsForAllMandatory() {
return getBoolean(PINS_FOR_ALL_MANDATORY, false);
}
/** Safety flag to disable Pins for All Megaphone */
public static boolean pinsForAllMegaphoneKillSwitch() {
return getBoolean(PINS_MEGAPHONE_KILL_SWITCH, false);
}
/** Whether or not we use the attachments v3 form. */ /** Whether or not we use the attachments v3 form. */
public static boolean attachmentsV3() { public static boolean attachmentsV3() {
return getBoolean(ATTACHMENTS_V3, false); return getBoolean(ATTACHMENTS_V3, false);

13
app/src/test/java/org/thoughtcrime/securesms/megaphone/PinsForAllScheduleTest.java
View file

@ -127,17 +127,4 @@ public class PinsForAllScheduleTest extends BaseUnitTest {
// THEN // THEN
assertTrue(result); assertTrue(result);
} }
@Test
public void whenKillSwitchEnabled_whenIShouldDisplay_thenIExpectFalse() {
// GIVEN
when(registrationValues.pinWasRequiredAtRegistration()).thenReturn(false);
when(FeatureFlags.pinsForAllMegaphoneKillSwitch()).thenReturn(true);
// WHEN
boolean result = testSubject.shouldDisplay(0, 0, 0, System.currentTimeMillis());
// THEN
assertFalse(result);
}
} }