summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-25 15:01:19 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-26 11:23:57 +0000
commitc44cfad21dcb6434545a43a0488977994036aec1 (patch)
tree9835959300b5f85d15cdaf38a0160e0056e94274 /android/src
parent9b1cbfddfe43e63539ca2e803fd8b77ac5e2809c (diff)
downloadmullvadvpn-c44cfad21dcb6434545a43a0488977994036aec1.tar.xz
mullvadvpn-c44cfad21dcb6434545a43a0488977994036aec1.zip
Update state in the `restart` method
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 0df44d150d..00a486b065 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -132,7 +132,6 @@ class MullvadVpnService : TalpidVpnService() {
}
if (state == State.Stopping && !quitCommand) {
- state = State.Running
restart()
}
@@ -151,7 +150,6 @@ class MullvadVpnService : TalpidVpnService() {
isBound = true
if (state == State.Stopping) {
- state = State.Running
restart()
}
}
@@ -256,6 +254,9 @@ class MullvadVpnService : TalpidVpnService() {
private fun restart() {
if (state != State.Stopped) {
Log.d(TAG, "Restarting service")
+
+ state = State.Running
+
daemonInstance.apply {
stop()
start()