From 8947b82034629951898db8f4c26d62e448305b2a Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 26 May 2020 16:17:41 -0300
Subject: [PATCH] Make GV2 feature flags remote capable.

---
 .../securesms/groups/ui/creategroup/CreateGroupActivity.java | 2 +-
 .../java/org/thoughtcrime/securesms/util/FeatureFlags.java   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
index 27066eca57..1953d7c550 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
@@ -30,7 +30,7 @@ public class CreateGroupActivity extends ContactSelectionActivity {
   private View next;
 
   public static Intent newIntent(@NonNull Context context) {
-    if (!FeatureFlags.newGroupUI()) {
+    if (!FeatureFlags.newGroupUI() || !FeatureFlags.groupsV2create()) {
       return new Intent(context, GroupCreateActivity.class);
     }
 
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 ae5b54385e..0c46134149 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -84,7 +84,10 @@ public final class FeatureFlags {
       CALLING_PIP,
       NEW_GROUP_UI,
       REACT_WITH_ANY_EMOJI,
-      VERSIONED_PROFILES
+      VERSIONED_PROFILES,
+      GROUPS_V2,
+      GROUPS_V2_CREATE,
+      NEW_GROUP_UI
   );
 
   /**