From 329ed7f2122e907265acad93b60667727db10a4e Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 29 Jun 2021 19:04:01 +0200
Subject: [PATCH] Fixes #1568

---
 .../habitica/ui/fragments/purchases/SubscriptionFragment.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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<FragmentSubscriptionBinding>(), 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()))
         }