diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:44:29 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 1b655d7a0b9b864ddc07eb59e381338fb437927e (patch) | |
| tree | acfe066897cb43afd939eac8b446d7694f2200cd /android/src | |
| parent | 1bed86f9034149caa363bf870704b52c1e86fe5b (diff) | |
| download | mullvadvpn-1b655d7a0b9b864ddc07eb59e381338fb437927e.tar.xz mullvadvpn-1b655d7a0b9b864ddc07eb59e381338fb437927e.zip | |
Move `TransportProtocol` to Talpid package
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/TransportProtocol.kt) | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt index 113b416195..1fbcd9c7c2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt @@ -5,8 +5,8 @@ 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.TransportProtocol import net.mullvad.mullvadvpn.model.TunnelState +import net.mullvad.talpid.net.TransportProtocol class LocationInfo(val parentView: View, val context: Context) { private val country: TextView = parentView.findViewById(R.id.country) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt index bf1ca2cad4..32b41e5051 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt @@ -1,5 +1,6 @@ package net.mullvad.mullvadvpn.model import java.net.InetSocketAddress +import net.mullvad.talpid.net.TransportProtocol data class Endpoint(val address: InetSocketAddress, val protocol: TransportProtocol) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TransportProtocol.kt b/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt index 185461cda7..d4372f54ed 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TransportProtocol.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.net sealed class TransportProtocol { class Tcp : TransportProtocol() |