diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt index e3afa3dac1..b93b883444 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt @@ -132,7 +132,6 @@ import org.thoughtcrime.securesms.revealable.ViewOnceExpirationInfo import org.thoughtcrime.securesms.revealable.ViewOnceUtil import org.thoughtcrime.securesms.sms.GroupV2UpdateMessageUtil import org.thoughtcrime.securesms.stories.Stories.isFeatureEnabled -import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.JsonUtils import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.MessageConstraintsUtil @@ -1136,7 +1135,6 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat } fun insertSessionSwitchoverEvent(recipientId: RecipientId, threadId: Long, event: SessionSwitchoverEvent) { - check(!FeatureFlags.blockSessionSwitchoverEvents()) { "Should not occur in a non-PNP world!" } writableDatabase .insertInto(TABLE_NAME) .values( 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 585e540801..a0d7b386d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -84,7 +84,6 @@ public final class FeatureFlags { private static final String USE_HARDWARE_AEC_IF_OLD = "android.calling.useHardwareAecIfOlderThanApi29"; private static final String PAYMENTS_COUNTRY_BLOCKLIST = "global.payments.disabledRegions"; public static final String PHONE_NUMBER_PRIVACY = "android.pnp"; - public static final String BLOCK_SSE = "android.blockSessionSwitchoverEvents"; private static final String STORIES_AUTO_DOWNLOAD_MAXIMUM = "android.stories.autoDownloadMaximum"; private static final String TELECOM_MANUFACTURER_ALLOWLIST = "android.calling.telecomAllowList"; private static final String TELECOM_MODEL_BLOCKLIST = "android.calling.telecomModelBlockList"; @@ -183,7 +182,6 @@ public final class FeatureFlags { USERNAMES, INSTANT_VIDEO_PLAYBACK, CRASH_PROMPT_CONFIG, - BLOCK_SSE, SEPA_DEBIT_DONATIONS, IDEAL_DONATIONS, IDEAL_ENABLED_REGIONS, @@ -261,7 +259,6 @@ public final class FeatureFlags { PROMPT_BATTERY_SAVER, USERNAMES, CRASH_PROMPT_CONFIG, - BLOCK_SSE, CALLING_REACTIONS, NOTIFICATION_THUMBNAIL_BLOCKLIST, CALLING_RAISE_HAND, @@ -385,13 +382,6 @@ public final class FeatureFlags { return getBoolean(PHONE_NUMBER_PRIVACY, false) || Environment.IS_PNP; } - /** - * Whether session switchover events should be blocked on the client. - */ - public static boolean blockSessionSwitchoverEvents() { - return getBoolean(BLOCK_SSE, false) && !phoneNumberPrivacy(); - } - /** Whether to use the custom streaming muxer or built in android muxer. */ public static boolean useStreamingVideoMuxer() { return getBoolean(CUSTOM_VIDEO_MUXER, false);