summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-03-19 05:48:58 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-03-19 05:48:58 -0300
commit8af1d42799f2be079c68aec90c6328287fbb74e3 (patch)
treeb64a118b5c0962e88ccba8d4f003e98141a48703 /android
parent019cb8ae0e4c38680d82ad354e608fbd12ef4b47 (diff)
parentf79497339d47c6a18184bbf3c98d43c35d1e93e0 (diff)
downloadmullvadvpn-8af1d42799f2be079c68aec90c6328287fbb74e3.tar.xz
mullvadvpn-8af1d42799f2be079c68aec90c6328287fbb74e3.zip
Merge branch 'fix-connection-screen-status-message'
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
index 8090a8dd08..7f608c5431 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
@@ -27,14 +27,14 @@ class ConnectionStatus(val parentView: View, val context: Context) {
spinner.visibility = View.GONE
text.setTextColor(disconnectedTextColor)
- text.setText(R.string.creating_secure_connection)
+ text.setText(R.string.unsecured_connection)
}
private fun connecting() {
spinner.visibility = View.VISIBLE
text.setTextColor(connectingTextColor)
- text.setText(R.string.unsecured_connection)
+ text.setText(R.string.creating_secure_connection)
}
private fun connected() {