diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:49:38 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 7292fa593e2fc441da58786b37fedf4f0a929a86 (patch) | |
| tree | 13302a29c47eef15746caf771e3838ff83866299 /android | |
| parent | 1b655d7a0b9b864ddc07eb59e381338fb437927e (diff) | |
| download | mullvadvpn-7292fa593e2fc441da58786b37fedf4f0a929a86.tar.xz mullvadvpn-7292fa593e2fc441da58786b37fedf4f0a929a86.zip | |
Move `Endpoint` to Talpid package
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt) | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt index 1fbcd9c7c2..9278bb315f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt @@ -3,9 +3,9 @@ package net.mullvad.mullvadvpn import android.content.Context import android.view.View import android.widget.TextView -import net.mullvad.mullvadvpn.model.Endpoint import net.mullvad.mullvadvpn.model.GeoIpLocation import net.mullvad.mullvadvpn.model.TunnelState +import net.mullvad.talpid.net.Endpoint import net.mullvad.talpid.net.TransportProtocol class LocationInfo(val parentView: View, val context: Context) { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt index f064218215..1a07824cb7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt @@ -1,3 +1,5 @@ package net.mullvad.mullvadvpn.model +import net.mullvad.talpid.net.Endpoint + data class TunnelEndpoint(val endpoint: Endpoint) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt b/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt index 32b41e5051..7baeb66161 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt @@ -1,6 +1,5 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.net import java.net.InetSocketAddress -import net.mullvad.talpid.net.TransportProtocol data class Endpoint(val address: InetSocketAddress, val protocol: TransportProtocol) |