From f137e23b4334f5cbc4bfc954c079ac3980bbd6f6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 16 Aug 2023 10:45:56 -0400 Subject: [PATCH] Split usernames into it's own feature flag for internal testing. --- .../org/thoughtcrime/securesms/util/FeatureFlags.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 index f6e8e2cda7..993290b4aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -112,6 +112,7 @@ public final class FeatureFlags { public static final String PROMPT_FOR_NOTIFICATION_LOGS = "android.logs.promptNotifications"; private static final String PROMPT_FOR_NOTIFICATION_CONFIG = "android.logs.promptNotificationsConfig"; public static final String PROMPT_BATTERY_SAVER = "android.promptBatterySaver"; + public static final String USERNAMES = "android.usernames"; /** * We will only store remote values for flags in this set. If you want a flag to be controllable @@ -175,7 +176,8 @@ public final class FeatureFlags { FCM_MAY_HAVE_MESSAGES_KILL_SWITCH, PROMPT_FOR_NOTIFICATION_LOGS, PROMPT_FOR_NOTIFICATION_CONFIG, - PROMPT_BATTERY_SAVER + PROMPT_BATTERY_SAVER, + USERNAMES ); @VisibleForTesting @@ -245,7 +247,8 @@ public final class FeatureFlags { FCM_MAY_HAVE_MESSAGES_KILL_SWITCH, PROMPT_FOR_NOTIFICATION_LOGS, PROMPT_FOR_NOTIFICATION_CONFIG, - PROMPT_BATTERY_SAVER + PROMPT_BATTERY_SAVER, + USERNAMES ); /** @@ -326,8 +329,7 @@ public final class FeatureFlags { /** Creating usernames, sending messages by username. */ public static synchronized boolean usernames() { - // For now these features are paired, but leaving the separate method in case we decide to separate in the future. - return phoneNumberPrivacy(); + return getBoolean(USERNAMES, false) || phoneNumberPrivacy(); } /**