diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MonthlyDonationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MonthlyDonationRepository.kt index 81d359e092..7dcb7bb411 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MonthlyDonationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/MonthlyDonationRepository.kt @@ -198,9 +198,9 @@ class MonthlyDonationRepository(private val donationsService: DonationsService) } val timeoutError: DonationError = if (isLongRunning) { - DonationError.donationPending(DonationErrorSource.SUBSCRIPTION, gatewayRequest) + DonationError.donationPending(DonationErrorSource.MONTHLY, gatewayRequest) } else { - DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION) + DonationError.timeoutWaitingForToken(DonationErrorSource.MONTHLY) } try { @@ -212,7 +212,7 @@ class MonthlyDonationRepository(private val donationsService: DonationsService) } JobTracker.JobState.FAILURE -> { Log.d(TAG, "Subscription request response job chain failed permanently.", true) - it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION)) + it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY)) } else -> { Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt index f122a24aba..b1a13b53b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt @@ -106,7 +106,7 @@ class DonateToSignalFragment : } override fun bindAdapter(adapter: MappingAdapter) { - donationCheckoutDelegate = DonationCheckoutDelegate(this, this, viewModel.uiSessionKey, DonationErrorSource.ONE_TIME, DonationErrorSource.SUBSCRIPTION) + donationCheckoutDelegate = DonationCheckoutDelegate(this, this, viewModel.uiSessionKey, DonationErrorSource.ONE_TIME, DonationErrorSource.MONTHLY) val recyclerView = this.recyclerView!! recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalType.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalType.kt index 00dba60f3e..2c2b46a7d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalType.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalType.kt @@ -13,7 +13,7 @@ enum class DonateToSignalType(val requestCode: Short) : Parcelable { fun toErrorSource(): DonationErrorSource { return when (this) { ONE_TIME -> DonationErrorSource.ONE_TIME - MONTHLY -> DonationErrorSource.SUBSCRIPTION + MONTHLY -> DonationErrorSource.MONTHLY GIFT -> DonationErrorSource.GIFT } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt index 7fdb12d60e..2e54924666 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutDelegate.kt @@ -199,7 +199,7 @@ class DonationCheckoutDelegate( val error = DonationError.getGooglePayRequestTokenError( source = when (request.donateToSignalType) { - DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION + DonateToSignalType.MONTHLY -> DonationErrorSource.MONTHLY DonateToSignalType.ONE_TIME -> DonationErrorSource.ONE_TIME DonateToSignalType.GIFT -> DonationErrorSource.GIFT }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt index d59989910c..99a4ef7a09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt @@ -51,7 +51,7 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) { val errorSource: DonationErrorSource = when (args.request.donateToSignalType) { DonateToSignalType.ONE_TIME -> DonationErrorSource.ONE_TIME - DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION + DonateToSignalType.MONTHLY -> DonationErrorSource.MONTHLY DonateToSignalType.GIFT -> DonationErrorSource.GIFT } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt index 9e0cbf5b2f..63259ff3fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt @@ -93,8 +93,8 @@ class PayPalPaymentInProgressViewModel( Log.w(TAG, "Failed to update subscription", throwable, true) val donationError: DonationError = when (throwable) { is DonationError -> throwable - is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.SUBSCRIPTION, PaymentSourceType.PayPal) - else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION) + is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.MONTHLY, PaymentSourceType.PayPal) + else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY) } DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError) @@ -187,7 +187,7 @@ class PayPalPaymentInProgressViewModel( .andThen(payPalRepository.createPaymentMethod()) .flatMap(routeToPaypalConfirmation) .flatMapCompletable { payPalRepository.setDefaultPaymentMethod(it.paymentId) } - .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it, PaymentSourceType.PayPal)) } + .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.MONTHLY, it, PaymentSourceType.PayPal)) } disposables += setup.andThen(monthlyDonationRepository.setSubscriptionLevel(request, false)) .subscribeBy( @@ -197,8 +197,8 @@ class PayPalPaymentInProgressViewModel( val donationError: DonationError = when (throwable) { is DonationError -> throwable - is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.SUBSCRIPTION, PaymentSourceType.PayPal) - else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION) + is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.MONTHLY, PaymentSourceType.PayPal) + else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY) } DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError) }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt index 64a9612423..ace903856b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt @@ -74,7 +74,7 @@ class StripePaymentInProgressViewModel( val errorSource = when (request.donateToSignalType) { DonateToSignalType.ONE_TIME -> DonationErrorSource.ONE_TIME - DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION + DonateToSignalType.MONTHLY -> DonationErrorSource.MONTHLY DonateToSignalType.GIFT -> DonationErrorSource.GIFT } @@ -152,8 +152,8 @@ class StripePaymentInProgressViewModel( .onErrorResumeNext { when { it is DonationError -> Completable.error(it) - it is DonationProcessorError -> Completable.error(it.toDonationError(DonationErrorSource.SUBSCRIPTION, paymentSourceProvider.paymentSourceType)) - else -> Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it, paymentSourceProvider.paymentSourceType)) + it is DonationProcessorError -> Completable.error(it.toDonationError(DonationErrorSource.MONTHLY, paymentSourceProvider.paymentSourceType)) + else -> Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.MONTHLY, it, paymentSourceProvider.paymentSourceType)) } } @@ -165,7 +165,7 @@ class StripePaymentInProgressViewModel( val donationError: DonationError = if (throwable is DonationError) { throwable } else { - DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION) + DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY) } DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError) }, @@ -256,8 +256,8 @@ class StripePaymentInProgressViewModel( Log.w(TAG, "Failed to update subscription", throwable, true) val donationError: DonationError = when (throwable) { is DonationError -> throwable - is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.SUBSCRIPTION, PaymentSourceType.Stripe.GooglePay) - else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION) + is DonationProcessorError -> throwable.toDonationError(DonationErrorSource.MONTHLY, PaymentSourceType.Stripe.GooglePay) + else -> DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY) } DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt index 2539d4eb84..80357730df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt @@ -93,7 +93,7 @@ class BankTransferDetailsFragment : ComposeFragment(), DonationCheckoutDelegate. val errorSource: DonationErrorSource = when (args.request.donateToSignalType) { DonateToSignalType.ONE_TIME -> DonationErrorSource.ONE_TIME - DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION + DonateToSignalType.MONTHLY -> DonationErrorSource.MONTHLY DonateToSignalType.GIFT -> DonationErrorSource.GIFT } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt index 8e0dbc705c..e45ade8806 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt @@ -13,7 +13,7 @@ enum class DonationErrorSource(private val code: String) { * Refers to a recurring monthly donation where the user paying receives a badge immediately * and upon each renewal period. */ - SUBSCRIPTION("subscription"), + MONTHLY("subscription"), /** * Refers to a one-time donation where the user pays to send a badge to another individual. diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java index 17e19fca2d..91756b0b66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java @@ -396,7 +396,7 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob { } private DonationErrorSource getErrorSource() { - return isForKeepAlive ? DonationErrorSource.KEEP_ALIVE : DonationErrorSource.SUBSCRIPTION; + return isForKeepAlive ? DonationErrorSource.KEEP_ALIVE : DonationErrorSource.MONTHLY; } /**