Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SSE event bug and make the assertion guarded by a separate flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-09-21 15:55:14 -04:00
parent 76de183ec2
commit eb6394eb6a
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -86,6 +86,7 @@ public final class FeatureFlags {
private static final String USE_AEC3 = "android.calling.useAec3";
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 +184,8 @@ public final class FeatureFlags {
USERNAMES,
INSTANT_VIDEO_PLAYBACK,
CONVERSATION_ITEM_V2_TEXT,
CRASH_PROMPT_CONFIG
CRASH_PROMPT_CONFIG,
BLOCK_SSE
);
@VisibleForTesting
@@ -255,7 +257,8 @@ public final class FeatureFlags {
PROMPT_FOR_NOTIFICATION_CONFIG,
PROMPT_BATTERY_SAVER,
USERNAMES,
CRASH_PROMPT_CONFIG
CRASH_PROMPT_CONFIG,
BLOCK_SSE
);
/**
@@ -388,6 +391,13 @@ 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);