summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-20 19:56:56 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-22 20:18:35 +0000
commit8cda25a7bcf6ba54cbf0dd0d0fca9ee9afd6bd10 (patch)
tree16feb2630130fc399fae8435b8db2841c7c40fbf /android/src
parent8bf5bdc3b3669c5e465dad9072178a42df431904 (diff)
downloadmullvadvpn-8cda25a7bcf6ba54cbf0dd0d0fca9ee9afd6bd10.tar.xz
mullvadvpn-8cda25a7bcf6ba54cbf0dd0d0fca9ee9afd6bd10.zip
Send requests from service side `VpnPermission`
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
index 50b5a606d4..6872a276bf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
@@ -3,11 +3,12 @@ package net.mullvad.mullvadvpn.service.endpoint
import android.content.Context
import android.content.Intent
import android.net.VpnService
+import net.mullvad.mullvadvpn.ipc.Event
import net.mullvad.mullvadvpn.ipc.Request
import net.mullvad.mullvadvpn.ui.MainActivity
import net.mullvad.mullvadvpn.util.Intermittent
-class VpnPermission(private val context: Context, endpoint: ServiceEndpoint) {
+class VpnPermission(private val context: Context, private val endpoint: ServiceEndpoint) {
private val isGranted = Intermittent<Boolean>()
init {
@@ -31,6 +32,7 @@ class VpnPermission(private val context: Context, endpoint: ServiceEndpoint) {
isGranted.update(null)
context.startActivity(activityIntent)
+ endpoint.sendEvent(Event.VpnPermissionRequest)
}
return isGranted.await()