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 500fd8866..8d01218f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -59,7 +59,6 @@ public final class FeatureFlags { private static final String VERIFY_V2 = "android.verifyV2"; private static final String PHONE_NUMBER_PRIVACY_VERSION = "android.phoneNumberPrivacyVersion"; private static final String CLIENT_EXPIRATION = "android.clientExpiration"; - public static final String RESEARCH_MEGAPHONE_1 = "research.megaphone.1"; public static final String DONATE_MEGAPHONE = "android.donate"; private static final String VIEWED_RECEIPTS = "android.viewed.receipts"; private static final String GROUP_CALLING = "android.groupsv2.calling.2"; @@ -89,7 +88,6 @@ public final class FeatureFlags { USERNAMES, VERIFY_V2, CLIENT_EXPIRATION, - RESEARCH_MEGAPHONE_1, DONATE_MEGAPHONE, VIEWED_RECEIPTS, GV1_FORCED_MIGRATE, @@ -247,11 +245,6 @@ public final class FeatureFlags { return getString(CLIENT_EXPIRATION, null); } - /** The raw research megaphone CSV string */ - public static String researchMegaphone() { - return getString(RESEARCH_MEGAPHONE_1, ""); - } - /** The raw donate megaphone CSV string */ public static String donateMegaphone() { return getString(DONATE_MEGAPHONE, ""); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/PopulationFeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/PopulationFeatureFlags.java index 8e67abe18..43d69cd1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/PopulationFeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/PopulationFeatureFlags.java @@ -29,7 +29,7 @@ public final class PopulationFeatureFlags { * In research megaphone group for given country code */ public static boolean isInResearchMegaphone() { - return isEnabled(FeatureFlags.RESEARCH_MEGAPHONE_1, FeatureFlags.researchMegaphone()); + return false; } /**