Fix initial account expiry fetch

2 files changed, 1 insertions, 3 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt
index a402d985f9..9d59ff6843 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt
@@ -43,9 +43,6 @@ class AccountRepository(
         .flatMapReadyConnectionOrDefault(flowOf()) { state ->
             state.container.accountDataSource.accountExpiry
         }
-        .onStart {
-            fetchAccountExpiry()
-        }
         .stateIn(
             CoroutineScope(dispatcher),
             SharingStarted.WhileSubscribed(),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionAccountDataSource.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionAccountDataSource.kt
index 23edd1efbf..05f6740a42 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionAccountDataSource.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionAccountDataSource.kt
@@ -26,6 +26,7 @@ class ServiceConnectionAccountDataSource(
             trySend(event.expiry)
         }
         dispatcher.registerHandler(Event.AccountExpiryEvent::class, handler)
+        connection.send(Request.FetchAccountExpiry.message)
         awaitClose {
             // The current dispatcher doesn't support unregistration of handlers.
         }