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

Always use CDSI.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-10-18 11:18:35 -04:00
committed by Alex Hart
parent 1174bc8e07
commit 367ff7c75c
3 changed files with 5 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,20 +99,12 @@ public final class FeatureFlags {
private static final String CAMERAX_MODEL_BLOCKLIST = "android.cameraXModelBlockList";
private static final String CAMERAX_MIXED_MODEL_BLOCKLIST = "android.cameraXMixedModelBlockList";
private static final String RECIPIENT_MERGE_V2 = "android.recipientMergeV2";
private static final String CDS_V2_LOAD_TEST = "android.cdsV2LoadTest";
private static final String SMS_EXPORTER = "android.sms.exporter.2";
private static final String CDS_V2_COMPAT = "android.cdsV2Compat.4";
public static final String STORIES_LOCALE = "android.stories.locale.1";
private static final String HIDE_CONTACTS = "android.hide.contacts";
<<<<<<< HEAD
private static final String MEDIA_PREVIEW_V2 = "android.mediaPreviewV2";
private static final String SMS_EXPORT_MEGAPHONE_DELAY_DAYS = "android.smsExport.megaphoneDelayDays";
||||||| parent of 90b7447a79 (Credit card validator implementations and spec tests.)
public static final String MEDIA_PREVIEW_V2 = "android.mediaPreviewV2";
=======
public static final String MEDIA_PREVIEW_V2 = "android.mediaPreviewV2";
public static final String CREDIT_CARD_PAYMENTS = "android.credit.card.payments";
>>>>>>> 90b7447a79 (Credit card validator implementations and spec tests.)
/**
* We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -164,20 +156,12 @@ public final class FeatureFlags {
CAMERAX_MODEL_BLOCKLIST,
CAMERAX_MIXED_MODEL_BLOCKLIST,
RECIPIENT_MERGE_V2,
CDS_V2_LOAD_TEST,
SMS_EXPORTER,
CDS_V2_COMPAT,
STORIES_LOCALE,
HIDE_CONTACTS,
<<<<<<< HEAD
MEDIA_PREVIEW_V2,
SMS_EXPORT_MEGAPHONE_DELAY_DAYS
||||||| parent of 90b7447a79 (Credit card validator implementations and spec tests.)
MEDIA_PREVIEW_V2
=======
MEDIA_PREVIEW_V2,
SMS_EXPORT_MEGAPHONE_DELAY_DAYS,
CREDIT_CARD_PAYMENTS
>>>>>>> 90b7447a79 (Credit card validator implementations and spec tests.)
);
@VisibleForTesting
@@ -238,18 +222,10 @@ public final class FeatureFlags {
TELECOM_MODEL_BLOCKLIST,
CAMERAX_MODEL_BLOCKLIST,
RECIPIENT_MERGE_V2,
CDS_V2_LOAD_TEST,
CDS_V2_COMPAT,
STORIES,
<<<<<<< HEAD
MEDIA_PREVIEW_V2,
SMS_EXPORT_MEGAPHONE_DELAY_DAYS
||||||| parent of 90b7447a79 (Credit card validator implementations and spec tests.)
MEDIA_PREVIEW_V2
=======
SMS_EXPORT_MEGAPHONE_DELAY_DAYS,
MEDIA_PREVIEW_V2,
CREDIT_CARD_PAYMENTS
>>>>>>> 90b7447a79 (Credit card validator implementations and spec tests.)
);
/**
@@ -568,13 +544,6 @@ public final class FeatureFlags {
return getBoolean(RECIPIENT_MERGE_V2, false);
}
/**
* Whether or not we should also query CDSv2 as a form of load test.
*/
public static boolean cdsV2LoadTesting() {
return getBoolean(CDS_V2_LOAD_TEST, false);
}
/**
* Whether or not we should enable the SMS exporter
*
@@ -585,13 +554,6 @@ public final class FeatureFlags {
return getBoolean(SMS_EXPORTER, false);
}
/**
* Whether or not we should use CDSv2 with the compat flag on as our primary CDS.
*/
public static boolean cdsV2Compat() {
return getBoolean(CDS_V2_COMPAT, false);
}
/**
* Whether or not users can hide contacts.
*