diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-03 21:08:28 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-27 16:21:52 +0000 |
| commit | 8208fbed62c1f87de476de08961b23b0465a26d0 (patch) | |
| tree | 3e142ebdaa44d9220b1245a886b41f8fd85e5db9 /android/src | |
| parent | e98d095b58780de9508540e705f41977078bef0d (diff) | |
| download | mullvadvpn-8208fbed62c1f87de476de08961b23b0465a26d0.tar.xz mullvadvpn-8208fbed62c1f87de476de08961b23b0465a26d0.zip | |
Update WireGuard Key screen buttons
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt | 34 | ||||
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 26 |
2 files changed, 30 insertions, 30 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 e910d75d4f..c9621ee4fb 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -82,7 +82,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private lateinit var statusMessage: TextView private lateinit var verifyingKeySpinner: View private lateinit var manageKeysButton: UrlButton - private lateinit var generateKeyButton: android.widget.Button + private lateinit var generateKeyButton: Button private lateinit var verifyKeyButton: Button override fun onAttach(context: Context) { @@ -107,13 +107,13 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre keyAge = view.findViewById(R.id.key_age) generateKeyButton = view.findViewById<Button>(R.id.generate_key).apply { - setOnClickListener { + setOnClickAction("action", jobTracker) { onGenerateKeyPress() } } verifyKeyButton = view.findViewById<Button>(R.id.verify_key).apply { - setOnClickListener { + setOnClickAction("action", jobTracker) { onValidateKeyPress() } } @@ -272,26 +272,22 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre } } - private fun onGenerateKeyPress() { - jobTracker.newBackgroundJob("action") { - synchronized(this) { - actionState = ActionState.Generating() - reconnectionExpected = !(tunnelState is TunnelState.Disconnected) - } + private suspend fun onGenerateKeyPress() { + synchronized(this) { + actionState = ActionState.Generating() + reconnectionExpected = !(tunnelState is TunnelState.Disconnected) + } - keyStatus = null - keyStatusListener.generateKey().join() + keyStatus = null + keyStatusListener.generateKey().join() - actionState = ActionState.Idle(false) - } + actionState = ActionState.Idle(false) } - private fun onValidateKeyPress() { - jobTracker.newBackgroundJob("action") { - actionState = ActionState.Verifying() - keyStatusListener.verifyKey().join() - actionState = ActionState.Idle(true) - } + private suspend fun onValidateKeyPress() { + actionState = ActionState.Verifying() + keyStatusListener.verifyKey().join() + actionState = ActionState.Idle(true) } private fun resetReconnectionExpected() { diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index c29300393e..6cd827e421 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -80,27 +80,31 @@ android:layout_height="0dp" android:layout_weight="1" /> <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/generate_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginHorizontal="24dp" - android:paddingHorizontal="8dp" - android:text="@string/wireguard_generate_key" - style="@style/GreenButton" /> + mullvad:buttonColor="green" + mullvad:text="@string/wireguard_generate_key" + mullvad:showSpinner="true" /> <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/verify_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginTop="24dp" android:layout_marginHorizontal="24dp" - android:paddingHorizontal="8dp" - android:text="@string/wireguard_verify_key" - style="@style/BlueButton" /> + mullvad:buttonColor="blue" + mullvad:text="@string/wireguard_verify_key" + mullvad:showSpinner="true" /> <net.mullvad.mullvadvpn.ui.widget.UrlButton android:id="@+id/manage_keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="24dp" - android:paddingHorizontal="8dp" - android:text="@string/wireguard_manage_keys" - android:drawableRight="@drawable/icon_extlink" + mullvad:text="@string/wireguard_manage_keys" + mullvad:buttonColor="blue" mullvad:url="@string/wg_key_url" - mullvad:withToken="true" - style="@style/BlueButton" /> + mullvad:withToken="true" /> </LinearLayout> |