diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-08 14:40:01 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-12 13:19:37 +0000 |
| commit | 06c95dbfc1a26c50d5df3a3fa18fcb8f818426b1 (patch) | |
| tree | 9c6957d2042ff5c73fd5c959c5fec0def0a7c8bf /android/src | |
| parent | 81bf1a30a4812502ec8fec99f887d3e363f3b05f (diff) | |
| download | mullvadvpn-06c95dbfc1a26c50d5df3a3fa18fcb8f818426b1.tar.xz mullvadvpn-06c95dbfc1a26c50d5df3a3fa18fcb8f818426b1.zip | |
Create `VpnPermission` inside `ServiceEndpoint`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt | 5 |
2 files changed, 5 insertions, 3 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 83c62cd5f3..9164304228 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -15,7 +15,6 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.model.Settings import net.mullvad.mullvadvpn.service.endpoint.ServiceEndpoint -import net.mullvad.mullvadvpn.service.endpoint.VpnPermission import net.mullvad.mullvadvpn.service.notifications.AccountExpiryNotification import net.mullvad.mullvadvpn.service.persistence.SplitTunnelingPersistence import net.mullvad.mullvadvpn.service.tunnelstate.TunnelStateUpdater @@ -111,7 +110,7 @@ class MullvadVpnService : TalpidVpnService() { daemonInstance.intermittentDaemon, connectivityListener, SplitTunnelingPersistence(this), - VpnPermission(this) + this ) notificationManager = diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt index 69c5b23b60..be9e03306b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt @@ -1,5 +1,6 @@ package net.mullvad.mullvadvpn.service.endpoint +import android.content.Context import android.os.DeadObjectException import android.os.Looper import android.os.Messenger @@ -23,7 +24,7 @@ class ServiceEndpoint( internal val intermittentDaemon: Intermittent<MullvadDaemon>, val connectivityListener: ConnectivityListener, splitTunnelingPersistence: SplitTunnelingPersistence, - vpnPermission: VpnPermission + context: Context ) { private val listeners = mutableSetOf<Messenger>() private val registrationQueue: SendChannel<Messenger> = startRegistrator() @@ -34,6 +35,8 @@ class ServiceEndpoint( val messenger = Messenger(dispatcher) + val vpnPermission = VpnPermission(context) + val connectionProxy = ConnectionProxy(vpnPermission, this) val settingsListener = SettingsListener(this) |