From da2038dd462c73416288b9f59e73bb2d1b61ba21 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 26 May 2021 00:39:40 -0400 Subject: [PATCH] Revert "Temporarily block payments in all regions." This reverts commit 152cc273947c38449fc4b4193cf8d283dc01018f. --- .../securesms/keyvalue/PaymentsValues.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.java index 776e0f7551..8b7c83b791 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.java +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.java @@ -106,27 +106,27 @@ public final class PaymentsValues extends SignalStoreValues { * Applies feature flags and region restrictions to return an enum which describes the available feature set for the user. */ public PaymentsAvailability getPaymentsAvailability() { -// Context context = ApplicationDependencies.getApplication(); -// -// if (!TextSecurePreferences.isPushRegistered(context) || -// !GeographicalRestrictions.e164Allowed(TextSecurePreferences.getLocalNumber(context))) -// { + Context context = ApplicationDependencies.getApplication(); + + if (!TextSecurePreferences.isPushRegistered(context) || + !GeographicalRestrictions.e164Allowed(TextSecurePreferences.getLocalNumber(context))) + { return PaymentsAvailability.NOT_IN_REGION; -// } -// -// if (FeatureFlags.payments()) { -// if (mobileCoinPaymentsEnabled()) { -// return PaymentsAvailability.WITHDRAW_AND_SEND; -// } else { -// return PaymentsAvailability.REGISTRATION_AVAILABLE; -// } -// } else { -// if (mobileCoinPaymentsEnabled()) { -// return PaymentsAvailability.WITHDRAW_ONLY; -// } else { -// return PaymentsAvailability.DISABLED_REMOTELY; -// } -// } + } + + if (FeatureFlags.payments()) { + if (mobileCoinPaymentsEnabled()) { + return PaymentsAvailability.WITHDRAW_AND_SEND; + } else { + return PaymentsAvailability.REGISTRATION_AVAILABLE; + } + } else { + if (mobileCoinPaymentsEnabled()) { + return PaymentsAvailability.WITHDRAW_ONLY; + } else { + return PaymentsAvailability.DISABLED_REMOTELY; + } + } } @WorkerThread