Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the PNP merging function for everything.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-08-09 18:36:04 -04:00
committed by GitHub
parent e83a4692c5
commit f004b72ba2
8 changed files with 430 additions and 212 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

@@ -100,6 +100,7 @@ public final class FeatureFlags {
private static final String TELECOM_MANUFACTURER_ALLOWLIST = "android.calling.telecomAllowList";
private static final String TELECOM_MODEL_BLOCKLIST = "android.calling.telecomModelBlockList";
private static final String CAMERAX_MODEL_BLOCKLIST = "android.cameraXModelBlockList";
private static final String RECIPIENT_MERGE_V2 = "android.recipientMergeV2";
/**
* We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -152,7 +153,8 @@ public final class FeatureFlags {
GIFT_BADGE_SEND_SUPPORT,
TELECOM_MANUFACTURER_ALLOWLIST,
TELECOM_MODEL_BLOCKLIST,
CAMERAX_MODEL_BLOCKLIST
CAMERAX_MODEL_BLOCKLIST,
RECIPIENT_MERGE_V2
);
@VisibleForTesting
@@ -214,7 +216,8 @@ public final class FeatureFlags {
USE_FCM_FOREGROUND_SERVICE,
TELECOM_MANUFACTURER_ALLOWLIST,
TELECOM_MODEL_BLOCKLIST,
CAMERAX_MODEL_BLOCKLIST
CAMERAX_MODEL_BLOCKLIST,
RECIPIENT_MERGE_V2
);
/**
@@ -535,6 +538,13 @@ public final class FeatureFlags {
return giftBadgeReceiveSupport() && getBoolean(GIFT_BADGE_SEND_SUPPORT, Environment.IS_STAGING);
}
/**
* Whether or not we should use the new recipient merging strategy.
*/
public static boolean recipientMergeV2() {
return getBoolean(RECIPIENT_MERGE_V2, false);
}
/** Only for rendering debug info. */
public static synchronized @NonNull Map<String, Object> getMemoryValues() {
return new TreeMap<>(REMOTE_VALUES);