Merge branch 'purchase-state-is-not-reset-correctly-sometimes-droid-514'

mullvad · Nov 22, 2023 · 312a004 · 312a004
2 parents c13ec3c + a2b9881
commit 312a004
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt
@@ -76,6 +76,8 @@ class OutOfTimeViewModel(
                     val tomorrow = DateTime.now().plusHours(20)
 
                     if (expiry.isAfter(tomorrow)) {
+                        // Reset purchase state
+                        paymentUseCase.resetPurchaseResult()
                         _uiSideEffect.tryEmit(UiSideEffect.OpenConnectScreen)
                     }
                 }

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
@@ -82,6 +82,8 @@ class WelcomeViewModel(
                     val tomorrow = DateTime.now().plusHours(20)
 
                     if (expiry.isAfter(tomorrow)) {
+                        // Reset purchase state
+                        paymentUseCase.resetPurchaseResult()
                         _uiSideEffect.tryEmit(UiSideEffect.OpenConnectScreen)
                     }
                 }