From 33c527f15ed7aa4c36ef7b6a85528df6d31e1192 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 7 Jul 2020 08:08:34 -0400
Subject: [PATCH] Remove the final KBS feature flags.

---
 .../securesms/megaphone/PinsForAllSchedule.java   | 10 +---------
 .../thoughtcrime/securesms/util/FeatureFlags.java | 15 ---------------
 .../megaphone/PinsForAllScheduleTest.java         | 13 -------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
index abdcc55f9e..3dba83d357 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
@@ -16,15 +16,11 @@ class PinsForAllSchedule implements MegaphoneSchedule {
   private static final String TAG = Log.tag(PinsForAllSchedule.class);
 
   @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));
 
   static boolean shouldDisplayFullScreen(long firstVisible, long currentTime) {
-    if (!FeatureFlags.pinsForAllMandatory()) {
-      return false;
-    }
-
     if (firstVisible == 0L) {
       return false;
     }
@@ -52,10 +48,6 @@ class PinsForAllSchedule implements MegaphoneSchedule {
       return false;
     }
 
-    if (FeatureFlags.pinsForAllMegaphoneKillSwitch()) {
-      return false;
-    }
-
     if (pinCreationFailedDuringRegistration()) {
       return true;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index cb54343a6b..23810ec5b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -51,8 +51,6 @@ public final class FeatureFlags {
 
   private static final String UUIDS                      = "android.uuids";
   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 REMOTE_DELETE              = "android.remoteDelete";
   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(
-      PINS_FOR_ALL_MANDATORY,
-      PINS_MEGAPHONE_KILL_SWITCH,
       ATTACHMENTS_V3,
       REMOTE_DELETE,
       PROFILE_FOR_CALLING,
@@ -103,7 +99,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(
-      PINS_MEGAPHONE_KILL_SWITCH,
       ATTACHMENTS_V3
   );
 
@@ -199,16 +194,6 @@ public final class FeatureFlags {
     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. */
   public static boolean attachmentsV3() {
     return getBoolean(ATTACHMENTS_V3, false);
diff --git a/app/src/test/java/org/thoughtcrime/securesms/megaphone/PinsForAllScheduleTest.java b/app/src/test/java/org/thoughtcrime/securesms/megaphone/PinsForAllScheduleTest.java
index 42d4e30622..716a1c5bff 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/megaphone/PinsForAllScheduleTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/megaphone/PinsForAllScheduleTest.java
@@ -127,17 +127,4 @@ public class PinsForAllScheduleTest extends BaseUnitTest {
     // THEN
     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);
-  }
 }
\ No newline at end of file