diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt index 9c71615cd..a471daf5f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt @@ -249,8 +249,11 @@ class SubscriptionFragment : BaseFragment(), GemPur private fun checkIfNeedsCancellation() { if (user?.purchased?.plan?.paymentMethod == "Google" && user?.purchased?.plan?.isActive == true && + user?.purchased?.plan?.dateTerminated == null && (purchasedSubscription?.autoRenewing == false ||purchasedSubscription == null)) { - compositeSubscription.add(apiClient.cancelSubscription().subscribe({ + compositeSubscription.add(apiClient.cancelSubscription() + .flatMap { userRepository.retrieveUser(false, true) } + .subscribe({ refresh() }, RxErrorHandler.handleEmptyError())) }