diff options
| author | Emīls <emils@mullvad.net> | 2020-01-24 12:43:58 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-01-30 15:36:26 +0000 |
| commit | 050730166dde25e6af847e4003f5d13cf600f349 (patch) | |
| tree | f172cf70f4d8b06166066cc0092ccbb99769f1c0 /android | |
| parent | 708b14e627c91ac6bafa0b2df72a405b233e80af (diff) | |
| download | mullvadvpn-050730166dde25e6af847e4003f5d13cf600f349.tar.xz mullvadvpn-050730166dde25e6af847e4003f5d13cf600f349.zip | |
Use system settings to conenct on startup
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 9 |
1 files changed, 9 insertions, 0 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 cd4e13015a..db3cbfb7ec 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -1,6 +1,7 @@ package net.mullvad.mullvadvpn.service import android.content.Intent +import android.net.VpnService import android.os.Binder import android.os.IBinder import kotlinx.coroutines.Deferred @@ -61,6 +62,14 @@ 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) { + runBlocking { daemon.await().connect() } + } + return startResult + } + private fun setUp() { daemon = startDaemon() connectionProxy = ConnectionProxy(this, daemon) |
