Add support for remote config v1.1

signalapp · May 13, 2020 · f149005 · f149005
1 parent 5eb663a
commit f149005
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 84 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java
@@ -50,7 +50,7 @@ protected void onRun() throws Exception {
       return;
     }
 
-    Map<String, Boolean> config = ApplicationDependencies.getSignalServiceAccountManager().getRemoteConfig();
+    Map<String, Object> config = ApplicationDependencies.getSignalServiceAccountManager().getRemoteConfig();
     FeatureFlags.update(config);
   }
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionFeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionFeatureFlags.java
@@ -20,31 +20,39 @@ public class LogSectionFeatureFlags implements LogSection {
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
-    StringBuilder        out          = new StringBuilder();
-    Map<String, Boolean> memory       = FeatureFlags.getMemoryValues();
-    Map<String, Boolean> disk         = FeatureFlags.getDiskValues();
-    Map<String, Boolean> forced       = FeatureFlags.getForcedValues();
-    int                  remoteLength = Stream.of(memory.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
-    int                  diskLength   = Stream.of(disk.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
-    int                  forcedLength = Stream.of(forced.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    StringBuilder       out           = new StringBuilder();
+    Map<String, Object> memory        = FeatureFlags.getMemoryValues();
+    Map<String, Object> disk          = FeatureFlags.getDiskValues();
+    Map<String, Object> pending       = FeatureFlags.getPendingDiskValues();
+    Map<String, Object> forced        = FeatureFlags.getForcedValues();
+    int                 remoteLength  = Stream.of(memory.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    int                 diskLength    = Stream.of(disk.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    int                 pendingLength = Stream.of(pending.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    int                 forcedLength  = Stream.of(forced.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
 
     out.append("-- Memory\n");
-    for (Map.Entry<String, Boolean> entry : memory.entrySet()) {
+    for (Map.Entry<String, Object> entry : memory.entrySet()) {
       out.append(Util.rightPad(entry.getKey(), remoteLength)).append(": ").append(entry.getValue()).append("\n");
     }
     out.append("\n");
 
-    out.append("-- Disk\n");
-    for (Map.Entry<String, Boolean> entry : disk.entrySet()) {
+    out.append("-- Current Disk\n");
+    for (Map.Entry<String, Object> entry : disk.entrySet()) {
       out.append(Util.rightPad(entry.getKey(), diskLength)).append(": ").append(entry.getValue()).append("\n");
     }
     out.append("\n");
 
+    out.append("-- Pending Disk\n");
+    for (Map.Entry<String, Object> entry : pending.entrySet()) {
+      out.append(Util.rightPad(entry.getKey(), pendingLength)).append(": ").append(entry.getValue()).append("\n");
+    }
+    out.append("\n");
+
     out.append("-- Forced\n");
     if (forced.isEmpty()) {
       out.append("None\n");
     } else {
-      for (Map.Entry<String, Boolean> entry : forced.entrySet()) {
+      for (Map.Entry<String, Object> entry : forced.entrySet()) {
         out.append(Util.rightPad(entry.getKey(), forcedLength)).append(": ").append(entry.getValue()).append("\n");
       }
     }