diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-19 17:51:41 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-20 12:16:34 +0000 |
| commit | 6f23a483ca28fd809236719330b253ca1e2fbbf6 (patch) | |
| tree | bd7261fc93f3580fc2152962c23ed0375608809f | |
| parent | dd8d06a3ce9741908600c20241ba40cdb7445981 (diff) | |
| download | mullvadvpn-6f23a483ca28fd809236719330b253ca1e2fbbf6.tar.xz mullvadvpn-6f23a483ca28fd809236719330b253ca1e2fbbf6.zip | |
Remove string parameters from tunnel info. strings
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt | 13 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt index c46d4a3b3f..61d5bc73d3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt @@ -104,17 +104,14 @@ class LocationInfo(val parentView: View, val context: Context) { private fun showInAddress(endpoint: Endpoint?) { if (endpoint != null) { - val transportProtocol = when (endpoint.protocol) { + val host = endpoint.address.address.hostAddress + val port = endpoint.address.port + val protocol = when (endpoint.protocol) { TransportProtocol.Tcp -> context.getString(R.string.tcp) TransportProtocol.Udp -> context.getString(R.string.udp) } - inAddress.text = context.getString( - R.string.in_address, - endpoint.address.address.hostAddress, - endpoint.address.port, - transportProtocol - ) + inAddress.text = context.getString(R.string.in_address) + " $host:$port $protocol" } else { inAddress.text = "" } @@ -136,7 +133,7 @@ class LocationInfo(val parentView: View, val context: Context) { ipAddress = "${ipv4.hostAddress} / ${ipv6.hostAddress}" } - outAddress.text = context.getString(R.string.out_address, ipAddress) + outAddress.text = context.getString(R.string.out_address) + " $ipAddress" } else { outAddress.text = "" } diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index c4b38a424d..dd6f84acda 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -106,8 +106,8 @@ <string name="wireguard">WireGuard</string> <string name="tcp">TCP</string> <string name="udp">UDP</string> - <string name="in_address">In %1$s:%2$d %3$s</string> - <string name="out_address">Out %1$s</string> + <string name="in_address">In</string> + <string name="out_address">Out</string> <string name="blocking_internet">Blocking internet</string> <string name="not_blocking_internet">YOU MIGHT BE LEAKING NETWORK TRAFFIC</string> <string name="failed_to_block_internet">Failed to block all network traffic. Please |