diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-01 18:29:04 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-02 22:13:23 +0000 |
| commit | e8813b572c245c4042456992acdb9d94449526b3 (patch) | |
| tree | e8b006a679f796cd91a0d47d7f9a8a74fe2bd38e /android/src | |
| parent | 8ffc6bdfaab29266baab485817e6258711f28dd4 (diff) | |
| download | mullvadvpn-e8813b572c245c4042456992acdb9d94449526b3.tar.xz mullvadvpn-e8813b572c245c4042456992acdb9d94449526b3.zip | |
Include endpoint in `TunnelState`
Diffstat (limited to 'android/src')
| -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 17c5dff47d..b8b0806285 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt @@ -81,7 +81,7 @@ class ConnectionProxy(val parentActivity: MainActivity) { if (currentState is TunnelState.Connecting || currentState is TunnelState.Connected) { return false } else { - uiState = TunnelState.Connecting(null) + uiState = TunnelState.Connecting(null, null) return true } } 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 054a07ed4d..33a40f7196 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(val location: GeoIpLocation?) : TunnelState() - class Connected(val location: GeoIpLocation?) : TunnelState() + class Connecting(val endpoint: TunnelEndpoint?, val location: GeoIpLocation?) : TunnelState() + class Connected(val endpoint: TunnelEndpoint, val location: GeoIpLocation?) : TunnelState() class Disconnecting(val actionAfterDisconnect: ActionAfterDisconnect) : TunnelState() class Blocked(val reason: BlockReason) : TunnelState() } |