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

Finalize credit card copy.

Browse Source
This commit is contained in:
Alex Hart
2022-11-11 11:35:55 -04:00
committed by GitHub
parent ed2edc1ebb
commit 0e3a9a3130
7 changed files with 98 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ public final class FeatureFlags {
private static final String SMS_EXPORTER = "android.sms.exporter.2";
private static final String HIDE_CONTACTS = "android.hide.contacts";
private static final String SMS_EXPORT_MEGAPHONE_DELAY_DAYS = "android.smsExport.megaphoneDelayDays.2";
public static final String CREDIT_CARD_PAYMENTS = "android.credit.card.payments.1";
public static final String CREDIT_CARD_PAYMENTS = "android.credit.card.payments.2";
private static final String PAYMENTS_REQUEST_ACTIVATE_FLOW = "android.payments.requestActivateFlow";
private static final String KEEP_MUTED_CHATS_ARCHIVED = "android.keepMutedChatsArchived";
public static final String GOOGLE_PAY_DISABLED_REGIONS = "global.donations.gpayDisabledRegions";

4
app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java
View File

@@ -59,14 +59,14 @@ public final class LocaleFeatureFlags {
* @return Whether credit cards are disabled in this region
*/
public static boolean isCreditCardDisabled() {
return isEnabled(FeatureFlags.CREDIT_CARD_DISABLED_REGIONS, FeatureFlags.googlePayDisabledRegions());
return isEnabled(FeatureFlags.CREDIT_CARD_DISABLED_REGIONS, FeatureFlags.creditCardDisabledRegions());
}
/**
* @return Whether PayPal is disabled in this region
*/
public static boolean isPayPalDisabled() {
return isEnabled(FeatureFlags.PAYPAL_DISABLED_REGIONS, FeatureFlags.googlePayDisabledRegions());
return isEnabled(FeatureFlags.PAYPAL_DISABLED_REGIONS, FeatureFlags.paypalDisabledRegions());
}
/**

3
app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java
View File

@@ -22,6 +22,9 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.CommunicationActions;
import org.thoughtcrime.securesms.util.ThemeUtil;
/**
* Appends an optional "Learn more" link to a given piece of text.
*/
public class LearnMoreTextView extends AppCompatTextView {
private OnClickListener linkListener;