diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-03 12:38:01 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-03 12:55:29 +0000 |
| commit | 6b1749e7e1233e027fca018f7a4132868ed70623 (patch) | |
| tree | e7c5774c6b80a98e4b336d51abf44b442f68affe /android | |
| parent | 7836975d4f2a584661d7052568dfe51354fbead0 (diff) | |
| download | mullvadvpn-6b1749e7e1233e027fca018f7a4132868ed70623.tar.xz mullvadvpn-6b1749e7e1233e027fca018f7a4132868ed70623.zip | |
Fix NPE when the service is restarted by Android
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 4 |
1 files changed, 2 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 4c24ad62e2..1623400336 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -83,9 +83,9 @@ class MullvadVpnService : TalpidVpnService() { } } - override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { val startResult = super.onStartCommand(intent, flags, startId) - if (intent.getAction() == VpnService.SERVICE_INTERFACE) { + if (intent?.getAction() == VpnService.SERVICE_INTERFACE) { runBlocking { daemon.await().connect() } } return startResult |