diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-10 18:06:11 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-10 18:06:11 -0300 |
| commit | f16be4bf36d414f99d5d2d6f7eb414f2dde985a0 (patch) | |
| tree | 8d987b764250aeccbedd243ee44d268ec961efd5 | |
| parent | 537eb7a60fdc4ec7c4abd9c5799f31b19782d5d2 (diff) | |
| parent | 42aed455d460c6749f74936bbef6df952eb9641f (diff) | |
| download | mullvadvpn-f16be4bf36d414f99d5d2d6f7eb414f2dde985a0.tar.xz mullvadvpn-f16be4bf36d414f99d5d2d6f7eb414f2dde985a0.zip | |
Merge branch 'tweak-key-verified-position'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt index 787032eaab..483a4e58c6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -224,8 +224,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private fun updateStatusMessage() { when (val state = actionState) { - is ActionState.Generating -> statusMessage.visibility = View.GONE - is ActionState.Verifying -> statusMessage.visibility = View.GONE + is ActionState.Generating -> statusMessage.visibility = View.INVISIBLE + is ActionState.Verifying -> statusMessage.visibility = View.INVISIBLE is ActionState.Idle -> { if (hasConnectivity) { updateKeyStatus(state.verified, keyStatus) @@ -254,7 +254,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre updateKeyIsValid(verificationWasDone, keyStatus.verified) } } else { - statusMessage.visibility = View.GONE + statusMessage.visibility = View.INVISIBLE } } @@ -266,7 +266,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre if (verificationWasDone) { setStatusMessage(R.string.wireguard_key_verification_failure, redColor) } else { - statusMessage.visibility = View.GONE + statusMessage.visibility = View.INVISIBLE } } } @@ -298,7 +298,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private fun updateVerifyingKeySpinner() { verifyingKeySpinner.visibility = when (actionState) { is ActionState.Verifying -> View.VISIBLE - else -> View.GONE + else -> View.INVISIBLE } } |