summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-04 02:20:05 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-27 16:21:52 +0000
commit79485af101a34262292975a37f5f8428cbc213b9 (patch)
treee21528955d1e4d7cd4b1771366ece08826de91f4 /android
parentf119a4ce3b566ae4a46a91cfaafd55b82709b6ae (diff)
downloadmullvadvpn-79485af101a34262292975a37f5f8428cbc213b9.tar.xz
mullvadvpn-79485af101a34262292975a37f5f8428cbc213b9.zip
Update Generate Key button text
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt17
1 files changed, 9 insertions, 8 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 91e368dbbb..bd74c2c8c5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -56,6 +56,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
field = value
updateKeyInformation()
updateStatusMessage()
+ updateGenerateKeyButtonText()
updateVerifyKeyButtonState()
}
}
@@ -241,6 +242,14 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
generateKeyButton.setEnabled(actionState is ActionState.Idle && hasConnectivity)
}
+ private fun updateGenerateKeyButtonText() {
+ if (keyStatus is KeygenEvent.NewKey) {
+ generateKeyButton.setText(R.string.wireguard_replace_key)
+ } else {
+ generateKeyButton.setText(R.string.wireguard_generate_key)
+ }
+ }
+
private fun updateVerifyKeyButtonState() {
val isIdle = actionState is ActionState.Idle
val hasKey = keyStatus is KeygenEvent.NewKey
@@ -272,14 +281,6 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
}
}
- private fun setGenerateButton() {
- if (keyStatus is KeygenEvent.NewKey) {
- generateKeyButton.setText(R.string.wireguard_replace_key)
- } else {
- generateKeyButton.setText(R.string.wireguard_generate_key)
- }
- }
-
private suspend fun onGenerateKeyPress() {
synchronized(this) {
actionState = ActionState.Generating()