Adapt Android naming to AccountAndDevice

3 files changed, 8 insertions, 8 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
index 8903cae6a9..1ae927a9b3 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
@@ -8,7 +8,7 @@ sealed class DeviceState : Parcelable {
     object InitialState : DeviceState()
 
     @Parcelize
-    data class DeviceRegistered(val deviceConfig: AccountAndDevice) : DeviceState()
+    data class DeviceRegistered(val accountAndDevice: AccountAndDevice) : DeviceState()
 
     @Parcelize
     object DeviceNotRegistered : DeviceState()
@@ -18,16 +18,16 @@ sealed class DeviceState : Parcelable {
     }
 
     fun deviceName(): String? {
-        return (this as? DeviceRegistered)?.deviceConfig?.device?.name
+        return (this as? DeviceRegistered)?.accountAndDevice?.device?.name
     }
 
     fun token(): String? {
-        return (this as? DeviceRegistered)?.deviceConfig?.account_token
+        return (this as? DeviceRegistered)?.accountAndDevice?.account_token
     }
 
     companion object {
-        fun fromDeviceConfig(deviceConfig: AccountAndDevice?): DeviceState {
-            return deviceConfig?.let { DeviceRegistered(it) } ?: DeviceNotRegistered
+        fun from(accountAndDevice: AccountAndDevice?): DeviceState {
+            return accountAndDevice?.let { DeviceRegistered(it) } ?: DeviceNotRegistered
         }
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index c7c2bb1e95..9c02fc551f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -262,7 +262,7 @@ class MullvadDaemon(vpnService: MullvadVpnService) {
     }
 
     private fun notifyDeviceEvent(event: DeviceEvent) {
-        _deviceStateUpdates.tryEmit(DeviceState.fromDeviceConfig(event.device))
+        _deviceStateUpdates.tryEmit(DeviceState.from(event.device))
     }
 
     private fun notifyRemoveDeviceEvent(event: RemoveDeviceEvent) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/DaemonDeviceDataSource.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/DaemonDeviceDataSource.kt
index dd0769c5e7..c782999f6a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/DaemonDeviceDataSource.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/DaemonDeviceDataSource.kt
@@ -32,8 +32,8 @@ class DaemonDeviceDataSource(
         endpoint.dispatcher.registerHandler(Request.RefreshDeviceState::class) {
             tracker.newBackgroundJob("refreshDeviceJob") {
                 daemon.getDevice()
-                    .let { deviceConfig ->
-                        Event.DeviceStateEvent(DeviceState.fromDeviceConfig(deviceConfig))
+                    .let { accountAndDevice ->
+                        Event.DeviceStateEvent(DeviceState.from(accountAndDevice))
                     }
                     .also { event -> endpoint.sendEvent(event) }
             }