diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 17:59:22 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 15:16:54 +0000 |
| commit | 31fe190e7a713ccce59562855e1242840576f9a0 (patch) | |
| tree | e848c33fa1b561f82342f0f4a259ed7e72c18fc2 /android/src | |
| parent | 3f87e2df6ccaa5ec86d5eaced0a7e979d786792b (diff) | |
| download | mullvadvpn-31fe190e7a713ccce59562855e1242840576f9a0.tar.xz mullvadvpn-31fe190e7a713ccce59562855e1242840576f9a0.zip | |
Derive `IntoJava` for `TransportProtocol`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt index 9278bb315f..9210712365 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt @@ -99,8 +99,8 @@ class LocationInfo(val parentView: View, val context: Context) { private fun showInAddress(endpoint: Endpoint?) { if (endpoint != null) { val transportProtocol = when (endpoint.protocol) { - is TransportProtocol.Tcp -> context.getString(R.string.tcp) - is TransportProtocol.Udp -> context.getString(R.string.udp) + TransportProtocol.Tcp -> context.getString(R.string.tcp) + TransportProtocol.Udp -> context.getString(R.string.udp) } inAddress.text = context.getString( diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt b/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt index d4372f54ed..013399dc52 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt @@ -1,6 +1,5 @@ package net.mullvad.talpid.net -sealed class TransportProtocol { - class Tcp : TransportProtocol() - class Udp : TransportProtocol() +enum class TransportProtocol { + Tcp, Udp } |