diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-27 00:08:09 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-01 15:01:27 +0000 |
| commit | c7e7b7a399aec8a04f262a76306d49d14ba13a57 (patch) | |
| tree | 35e0f9910deb266567fc39998b6af7110572f278 /android | |
| parent | 6261362f90a9b62c890acce8f4db4fed1a69db58 (diff) | |
| download | mullvadvpn-c7e7b7a399aec8a04f262a76306d49d14ba13a57.tar.xz mullvadvpn-c7e7b7a399aec8a04f262a76306d49d14ba13a57.zip | |
Include relay location in `TunnelState` data class
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt index 8922344de5..8782493b4c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt @@ -36,7 +36,7 @@ class ConnectionProxy(val parentActivity: MainActivity) { var onUiStateChange: ((TunnelState) -> Unit)? = null fun connect() { - uiState = TunnelState.Connecting() + uiState = TunnelState.Connecting(null) cancelActiveAction() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt index 006de053c8..2551cfe978 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -2,8 +2,8 @@ package net.mullvad.mullvadvpn.model sealed class TunnelState() { class Disconnected() : TunnelState() - class Connecting() : TunnelState() - class Connected() : TunnelState() + class Connecting(val location: GeoIpLocation?) : TunnelState() + class Connected(val location: GeoIpLocation) : TunnelState() class Disconnecting() : TunnelState() class Blocked() : TunnelState() } |