summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-23 19:25:26 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-24 12:42:43 +0000
commit10dd93721ae6ebef99de497ff5fc678bc1257879 (patch)
tree2bb9bf6fefe7f5d097c3be8366ef5b035d4b97b1 /android/src/main
parentac7837d2c19ef50b7c002c451e8a43b0ddf1036d (diff)
downloadmullvadvpn-10dd93721ae6ebef99de497ff5fc678bc1257879.tar.xz
mullvadvpn-10dd93721ae6ebef99de497ff5fc678bc1257879.zip
Handle after disconnect in `ConnectActionButton`
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
index 00ebdd8f64..aaa8032542 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn
import android.view.View
import android.widget.Button
+import net.mullvad.mullvadvpn.model.ActionAfterDisconnect
import net.mullvad.mullvadvpn.model.KeygenEvent
import net.mullvad.mullvadvpn.model.TunnelState
@@ -47,7 +48,13 @@ class ConnectActionButton(val parentView: View) {
set(value) {
when (value) {
is TunnelState.Disconnected -> disconnected()
- is TunnelState.Disconnecting -> disconnected()
+ is TunnelState.Disconnecting -> {
+ when (value.actionAfterDisconnect) {
+ is ActionAfterDisconnect.Nothing -> disconnected()
+ is ActionAfterDisconnect.Block -> connected()
+ is ActionAfterDisconnect.Reconnect -> connecting()
+ }
+ }
is TunnelState.Connecting -> connecting()
is TunnelState.Connected -> connected()
is TunnelState.Blocked -> connected()