Merge branch 'fix-blocked-status-message'

2 files changed, 13 insertions, 5 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..d2f397d260 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
@@ -11,9 +11,9 @@ class ConnectionStatus(val parentView: View, val context: Context) {
     private val spinner: View = parentView.findViewById(R.id.connecting_spinner)
     private val text: TextView = parentView.findViewById(R.id.connection_status)
 
-    private val disconnectedTextColor = context.getColor(R.color.red)
+    private val unsecuredTextColor = context.getColor(R.color.red)
     private val connectingTextColor = context.getColor(R.color.white)
-    private val connectedTextColor = context.getColor(R.color.green)
+    private val securedTextColor = context.getColor(R.color.green)
 
     fun setState(state: TunnelState) {
         when (state) {
@@ -27,14 +27,14 @@ 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()
         }
     }
 
     private fun disconnected() {
         spinner.visibility = View.GONE
 
-        text.setTextColor(disconnectedTextColor)
+        text.setTextColor(unsecuredTextColor)
         text.setText(R.string.unsecured_connection)
     }
 
@@ -48,7 +48,14 @@ class ConnectionStatus(val parentView: View, val context: Context) {
     private fun connected() {
         spinner.visibility = View.GONE
 
-        text.setTextColor(connectedTextColor)
+        text.setTextColor(securedTextColor)
         text.setText(R.string.secure_connection)
     }
+
+    private fun blocked() {
+        spinner.visibility = View.GONE
+
+        text.setTextColor(securedTextColor)
+        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>