diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsViewModel.kt index 62116f9ab..283cc7751 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/permissions/PermissionsSettingsViewModel.kt @@ -7,7 +7,6 @@ import org.thoughtcrime.securesms.groups.GroupAccessControl import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.LiveGroup import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.SingleLiveEvent import org.thoughtcrime.securesms.util.livedata.Store @@ -45,7 +44,7 @@ class PermissionsSettingsViewModel( store.update(liveGroup.groupRecipient) { groupRecipient, state -> val allHaveCapability = groupRecipient.participants.map { it.announcementGroupCapability }.all { it == Recipient.Capability.SUPPORTED } - state.copy(announcementGroupPermissionEnabled = (FeatureFlags.announcementGroups() && allHaveCapability) || state.announcementGroup) + state.copy(announcementGroupPermissionEnabled = allHaveCapability || state.announcementGroup) } } 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 92e7b410a..fb1418ede 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -81,7 +81,6 @@ public final class FeatureFlags { private static final String SENDER_KEY = "android.senderKey.4"; private static final String RETRY_RECEIPTS = "android.retryReceipts"; private static final String SUGGEST_SMS_BLACKLIST = "android.suggestSmsBlacklist"; - private static final String ANNOUNCEMENT_GROUPS = "android.announcementGroups"; private static final String MAX_GROUP_CALL_RING_SIZE = "global.calling.maxGroupCallRingSize"; private static final String GROUP_CALL_RINGING = "android.calling.groupCallRinging"; @@ -119,7 +118,6 @@ public final class FeatureFlags { SENDER_KEY, RETRY_RECEIPTS, SUGGEST_SMS_BLACKLIST, - ANNOUNCEMENT_GROUPS, MAX_GROUP_CALL_RING_SIZE, GROUP_CALL_RINGING ); @@ -379,11 +377,6 @@ public final class FeatureFlags { return getBoolean(SENDER_KEY, false); } - /** Whether or not showing the announcement group setting in the UI is enabled . */ - public static boolean announcementGroups() { - return getBoolean(ANNOUNCEMENT_GROUPS, false); - } - /** A comma-delimited list of country codes that should not be told about SMS during onboarding. */ public static @NonNull String suggestSmsBlacklist() { return getString(SUGGEST_SMS_BLACKLIST, "");