Increment the Groups V2 feature flags version.

signalapp · Aug 7, 2020 · 9e09444 · 9e09444
1 parent 5923fa0
commit 9e09444
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -51,9 +51,10 @@ public final class FeatureFlags {
   private static final String USERNAMES                  = "android.usernames";
   private static final String ATTACHMENTS_V3             = "android.attachmentsV3.2";
   private static final String REMOTE_DELETE              = "android.remoteDelete";
-  private static final String GROUPS_V2_OLD              = "android.groupsv2";
-  private static final String GROUPS_V2                  = "android.groupsv2.2";
-  private static final String GROUPS_V2_CREATE           = "android.groupsv2.create.2";
+  private static final String GROUPS_V2_OLD_1            = "android.groupsv2";
+  private static final String GROUPS_V2_OLD_2            = "android.groupsv2.2";
+  private static final String GROUPS_V2                  = "android.groupsv2.3";
+  private static final String GROUPS_V2_CREATE           = "android.groupsv2.create.3";
   private static final String GROUPS_V2_CAPACITY         = "android.groupsv2.capacity";
   private static final String CDS                        = "android.cds.2";
   private static final String INTERNAL_USER              = "android.internalUser";
@@ -101,8 +102,9 @@ public final class FeatureFlags {
    */
   private static final Set<String> STICKY = Sets.newHashSet(
       GROUPS_V2,
-      GROUPS_V2_OLD
-  );
+      GROUPS_V2_OLD_1,
+      GROUPS_V2_OLD_2
+    );
 
   /**
    * Listeners that are called when the value in {@link #REMOTE_VALUES} changes. That means that
@@ -187,16 +189,26 @@ public static boolean remoteDelete() {
 
   /** Groups v2 send and receive. */
   public static boolean groupsV2() {
-    return getBoolean(GROUPS_V2_OLD, false) || getBoolean(GROUPS_V2, false);
+    return groupsV2OlderStickyFlags() || groupsV2LatestFlag();
   }
 
   /** Attempt groups v2 creation. */
   public static boolean groupsV2create() {
-    return groupsV2() &&
+    return groupsV2LatestFlag() &&
            getBoolean(GROUPS_V2_CREATE, false) &&
            !SignalStore.internalValues().gv2DoNotCreateGv2Groups();
   }
 
+  private static boolean groupsV2LatestFlag() {
+    return getBoolean(GROUPS_V2, false);
+  }
+
+  /** Clients that previously saw these flags as true must continue to respect that */
+  private static boolean groupsV2OlderStickyFlags() {
+    return getBoolean(GROUPS_V2_OLD_1, false) ||
+           getBoolean(GROUPS_V2_OLD_2, false);
+  }
+
   /**
    * Maximum number of members allowed in a group.
    */