Merge branch 'fix-device-state-timing-issue'

4 files changed, 2 insertions, 6 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/DeviceRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/DeviceRepository.kt
index 044888e9af..bd47e8719f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/DeviceRepository.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/DeviceRepository.kt
@@ -30,9 +30,6 @@ class DeviceRepository(
         .flatMapLatest { state ->
             if (state is ServiceConnectionState.ConnectedReady) {
                 state.container.deviceDataSource.deviceStateUpdates
-                    .onStart {
-                        state.container.deviceDataSource.getDevice()
-                    }
             } else {
                 flowOf(DeviceState.Unknown)
             }
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.
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
index 56e7ee4d28..39159a1a17 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
@@ -17,6 +17,7 @@ class ServiceConnectionDeviceDataSource(
             trySend(event.newState)
         }
         dispatcher.registerHandler(Event.DeviceStateEvent::class, handler)
+        connection.trySendRequest(Request.GetDevice, false)
         awaitClose {
             // The current dispatcher doesn't support unregistration of handlers.
         }