From a2415261bd39092020a7e02b402ad20878808212 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 4 Nov 2022 12:42:00 -0400 Subject: [PATCH] Pair usernames flag with the PNP flag. --- .../java/org/thoughtcrime/securesms/util/FeatureFlags.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 0506712420..be43d68518 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -55,7 +55,6 @@ public final class FeatureFlags { private static final long FETCH_INTERVAL = TimeUnit.HOURS.toMillis(2); private static final String PAYMENTS_KILL_SWITCH = "android.payments.kill"; - private static final String USERNAMES = "android.usernames"; private static final String GROUPS_V2_RECOMMENDED_LIMIT = "global.groupsv2.maxGroupSize"; private static final String GROUPS_V2_HARD_LIMIT = "global.groupsv2.groupSizeHardLimit"; private static final String GROUP_NAME_MAX_LENGTH = "global.groupsv2.maxNameLength"; @@ -117,7 +116,6 @@ public final class FeatureFlags { GROUPS_V2_RECOMMENDED_LIMIT, GROUPS_V2_HARD_LIMIT, INTERNAL_USER, - USERNAMES, VERIFY_V2, CLIENT_EXPIRATION, DONATE_MEGAPHONE, @@ -312,7 +310,8 @@ public final class FeatureFlags { /** Creating usernames, sending messages by username. */ public static synchronized boolean usernames() { - return getBoolean(USERNAMES, false); + // For now these features are paired, but leaving the separate method in case we decide to separate in the future. + return phoneNumberPrivacy(); } /**