Remove expiry invalidation

6 files changed, 8 insertions, 26 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
index e459138a0e..212f79fba4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
@@ -5,7 +5,6 @@ import android.os.Messenger
 import java.net.InetAddress
 import kotlinx.parcelize.Parcelize
 import net.mullvad.mullvadvpn.model.LocationConstraint
-import org.joda.time.DateTime
 
 // Requests that the service can handle
 sealed class Request : Message.RequestMessage() {
@@ -39,9 +38,6 @@ sealed class Request : Message.RequestMessage() {
     data class IncludeApp(val packageName: String) : Request()
 
     @Parcelize
-    data class InvalidateAccountExpiry(val expiry: DateTime) : Request()
-
-    @Parcelize
     data class Login(val account: String?) : Request()
 
     @Parcelize
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
index 909d230f98..9dc3e8348c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
@@ -87,10 +87,6 @@ class AccountCache(private val endpoint: ServiceEndpoint) {
                 }
             }
 
-            registerHandler(Request.InvalidateAccountExpiry::class) { request ->
-                // TODO: Implement account expiry invalidation if still required.
-            }
-
             registerHandler(Request.ClearAccountHistory::class) { _ ->
                 clearAccountHistory()
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 98611b7e64..526b5356f4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -137,10 +137,6 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             }
         }
 
-        oldAccountExpiry?.let { expiry ->
-            accountCache.invalidateAccountExpiry(expiry)
-        }
-
         sitePaymentButton.updateAuthTokenCache(authTokenCache)
         accountCache.fetchAccountExpiry()
     }
@@ -156,7 +152,6 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
     private fun checkForAddedTime() {
         currentAccountExpiry?.let { expiry ->
             oldAccountExpiry = expiry
-            accountCache.invalidateAccountExpiry(expiry)
         }
     }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
index 6e6fc2c8b2..eb64642a45 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
@@ -145,10 +145,6 @@ class RedeemVoucherDialogFragment : DialogFragment() {
 
     private fun handleAddedTime(timeAdded: Long) {
         if (timeAdded > 0) {
-            accountExpiry?.let { oldAccountExpiry ->
-                accountCache?.invalidateAccountExpiry(oldAccountExpiry)
-            }
-
             dismiss()
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
index 19552893ad..ed42b34a7d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
@@ -12,7 +12,6 @@ import net.mullvad.mullvadvpn.ipc.Request
 import net.mullvad.mullvadvpn.model.AccountCreationResult
 import net.mullvad.mullvadvpn.model.AccountExpiry
 import net.mullvad.mullvadvpn.model.AccountHistory
-import org.joda.time.DateTime
 
 class AccountCache(private val connection: Messenger, eventDispatcher: EventDispatcher) {
 
@@ -77,12 +76,6 @@ class AccountCache(private val connection: Messenger, eventDispatcher: EventDisp
         connection.send(Request.FetchAccountHistory.message)
     }
 
-    fun invalidateAccountExpiry(accountExpiryToInvalidate: DateTime) {
-        val request = Request.InvalidateAccountExpiry(accountExpiryToInvalidate)
-
-        connection.send(request.message)
-    }
-
     fun clearAccountHistory() {
         connection.send(Request.ClearAccountHistory.message)
     }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index 6147a77a1d..2a615fcc72 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -108,7 +108,10 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(LoginViewModel.LoginUiState.Loading, awaitItem())
             loginTestEvents.emit(Event.LoginEvent(LoginResult.RpcError))
-            assertEquals(LoginViewModel.LoginUiState.OtherError(EXPECTED_RPC_ERROR_MESSAGE), awaitItem())
+            assertEquals(
+                LoginViewModel.LoginUiState.OtherError(EXPECTED_RPC_ERROR_MESSAGE),
+                awaitItem()
+            )
         }
     }
 
@@ -120,7 +123,10 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(LoginViewModel.LoginUiState.Loading, awaitItem())
             loginTestEvents.emit(Event.LoginEvent(LoginResult.OtherError))
-            assertEquals(LoginViewModel.LoginUiState.OtherError(EXPECTED_OTHER_ERROR_MESSAGE), awaitItem())
+            assertEquals(
+                LoginViewModel.LoginUiState.OtherError(EXPECTED_OTHER_ERROR_MESSAGE),
+                awaitItem()
+            )
         }
     }