summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-03 11:10:15 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-03 20:20:25 +0000
commita194cb3b280072818cfa37a6acd09aee4ee6f06f (patch)
tree19f388e224169f2f310e2e5d1b1ccf606e73fe94 /android
parent4fe8eadc8bcc353206612904a8fd32fda5be2e88 (diff)
downloadmullvadvpn-a194cb3b280072818cfa37a6acd09aee4ee6f06f.tar.xz
mullvadvpn-a194cb3b280072818cfa37a6acd09aee4ee6f06f.zip
Show "Blocked connection" status message
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt9
-rw-r--r--android/src/main/res/values/strings.xml1
2 files changed, 9 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
index e783e8e438..657e5dfde3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
@@ -27,7 +27,7 @@ class ConnectionStatus(val parentView: View, val context: Context) {
is TunnelState.Disconnected -> disconnected()
is TunnelState.Connecting -> connecting()
is TunnelState.Connected -> connected()
- is TunnelState.Blocked -> connected()
+ is TunnelState.Blocked -> blocked()
}
}
@@ -51,4 +51,11 @@ class ConnectionStatus(val parentView: View, val context: Context) {
text.setTextColor(connectedTextColor)
text.setText(R.string.secure_connection)
}
+
+ private fun blocked() {
+ spinner.visibility = View.GONE
+
+ text.setTextColor(connectedTextColor)
+ text.setText(R.string.blocked_connection)
+ }
}
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index a01506510e..37d31e758f 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -65,6 +65,7 @@
<string name="unsecured_connection">Unsecured connection</string>
<string name="creating_secure_connection">Creating secure connection</string>
<string name="secure_connection">Secure connection</string>
+ <string name="blocked_connection">Blocked connection</string>
<string name="connect">Secure my connection</string>
<string name="cancel">Cancel</string>
<string name="disconnect">Disconnect</string>