From 4b0811f9aa6b5a66790f3fce49f7574e62f0710d Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 18 Jun 2021 15:10:29 -0400 Subject: [PATCH] Revert "Temporarily block payments in all regions." This reverts commit 4637e1b5d8905e6c4db5e7d343e2b0cc00a21212. --- .../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