summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-03-11 22:55:39 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-03-23 19:14:16 +0000
commit6614c093c6dec127a5c6c3aeaab34454017847cd (patch)
tree63f2c321728d255274af2f30764ac48321d6acb7 /android
parent43bf1bdcf423d48e04cf757e01c1434271f30145 (diff)
downloadmullvadvpn-6614c093c6dec127a5c6c3aeaab34454017847cd.tar.xz
mullvadvpn-6614c093c6dec127a5c6c3aeaab34454017847cd.zip
Refactor to move `onStartCommand` method position
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt20
1 files changed, 10 insertions, 10 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 49a58662d1..e11f21bb4e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -65,6 +65,16 @@ class MullvadVpnService : TalpidVpnService() {
setUp()
}
+ override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+ val startResult = super.onStartCommand(intent, flags, startId)
+
+ if (intent?.getAction() == VpnService.SERVICE_INTERFACE) {
+ shouldConnect = true
+ }
+
+ return startResult
+ }
+
override fun onBind(intent: Intent): IBinder {
bindCount += 1
@@ -105,16 +115,6 @@ class MullvadVpnService : TalpidVpnService() {
}
}
- override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
- val startResult = super.onStartCommand(intent, flags, startId)
-
- if (intent?.getAction() == VpnService.SERVICE_INTERFACE) {
- shouldConnect = true
- }
-
- return startResult
- }
-
private fun setUp() {
startDaemonJob?.cancel()
startDaemonJob = startDaemon()