diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-22 09:01:07 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-22 09:01:07 +0100 |
| commit | 312a004b5501c222c5d4f8a07e75221922dfeeca (patch) | |
| tree | bcc884f1f0b25bbb98b1ce14807d2d76b1fbaaee /android | |
| parent | c13ec3c7fd5b868b2e78da0a6fc2e6e9eab4831c (diff) | |
| parent | a2b9881cff607896a10b871fc5c30b7c934668b2 (diff) | |
| download | mullvadvpn-312a004b5501c222c5d4f8a07e75221922dfeeca.tar.xz mullvadvpn-312a004b5501c222c5d4f8a07e75221922dfeeca.zip | |
Merge branch 'purchase-state-is-not-reset-correctly-sometimes-droid-514'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt | 2 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt | 2 |
2 files changed, 4 insertions, 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 index e570f7a0fe..675ca7ef94 100644 --- 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 index b02a1599a4..566aa31981 100644 --- 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) } } |