From a9ecdbdfecd3cfa164b8199cecebef5e74a12825 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Mon, 11 May 2020 11:22:32 -0300
Subject: [PATCH] Groups V2 capability set by the feature flag.

---
 .../java/org/thoughtcrime/securesms/AppCapabilities.java    | 6 +++---
 .../java/org/thoughtcrime/securesms/util/FeatureFlags.java  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
index ef8cb572a8..a6dd4e5ea3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 
 public final class AppCapabilities {
@@ -7,14 +8,13 @@ public final class AppCapabilities {
   private AppCapabilities() {
   }
 
-  private static final boolean UUID_CAPABLE      = false;
-  private static final boolean GROUPS_V2_CAPABLE = false;
+  private static final boolean UUID_CAPABLE = false;
 
   /**
    * @param storageCapable Whether or not the user can use storage service. This is another way of
    *                       asking if the user has set a Signal PIN or not.
    */
   public static SignalServiceProfile.Capabilities getCapabilities(boolean storageCapable) {
-    return new SignalServiceProfile.Capabilities(UUID_CAPABLE, GROUPS_V2_CAPABLE, storageCapable);
+    return new SignalServiceProfile.Capabilities(UUID_CAPABLE, FeatureFlags.groupsV2(), storageCapable);
   }
 }
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 b5cf4b6100..e8152733cb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -11,6 +11,7 @@ import com.google.android.collect.Sets;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.Log;
@@ -128,6 +129,7 @@ public final class FeatureFlags {
    */
   private static final Map<String, OnFlagChange> FLAG_CHANGE_LISTENERS = new HashMap<String, OnFlagChange>() {{
     put(MESSAGE_REQUESTS, (change) -> SignalStore.setMessageRequestEnableTime(change == Change.ENABLED ? System.currentTimeMillis() : 0));
+    put(GROUPS_V2,        (change) -> ApplicationDependencies.getJobManager().add(new RefreshAttributesJob()));
   }};
 
   private static final Map<String, Object> REMOTE_VALUES = new TreeMap<>();