summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-08 14:47:43 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-12 13:19:37 +0000
commit1788ca1c4fb23e54e4832f0d85bfd9d94d9db6fd (patch)
tree6fd33660a392ae954d12de6244c9bbb84c50b833 /android/src/main
parent71e4553601f43b701ed0a2289ef4875b75fcb03e (diff)
downloadmullvadvpn-1788ca1c4fb23e54e4832f0d85bfd9d94d9db6fd.tar.xz
mullvadvpn-1788ca1c4fb23e54e4832f0d85bfd9d94d9db6fd.zip
Move `SplitTunnelingPersistence` initialization
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt3
2 files changed, 1 insertions, 4 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 9164304228..3665a2b7e2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -16,7 +16,6 @@ import kotlinx.coroutines.launch
import net.mullvad.mullvadvpn.model.Settings
import net.mullvad.mullvadvpn.service.endpoint.ServiceEndpoint
import net.mullvad.mullvadvpn.service.notifications.AccountExpiryNotification
-import net.mullvad.mullvadvpn.service.persistence.SplitTunnelingPersistence
import net.mullvad.mullvadvpn.service.tunnelstate.TunnelStateUpdater
import net.mullvad.mullvadvpn.ui.MainActivity
import net.mullvad.talpid.TalpidVpnService
@@ -109,7 +108,6 @@ class MullvadVpnService : TalpidVpnService() {
Looper.getMainLooper(),
daemonInstance.intermittentDaemon,
connectivityListener,
- SplitTunnelingPersistence(this),
this
)
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 346c95222d..89722d039a 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
@@ -23,7 +23,6 @@ class ServiceEndpoint(
looper: Looper,
internal val intermittentDaemon: Intermittent<MullvadDaemon>,
val connectivityListener: ConnectivityListener,
- splitTunnelingPersistence: SplitTunnelingPersistence,
context: Context
) {
private val listeners = mutableSetOf<Messenger>()
@@ -43,7 +42,7 @@ class ServiceEndpoint(
val accountCache = AccountCache(this)
val keyStatusListener = KeyStatusListener(this)
val locationInfoCache = LocationInfoCache(this)
- val splitTunneling = SplitTunneling(splitTunnelingPersistence, this)
+ val splitTunneling = SplitTunneling(SplitTunnelingPersistence(context), this)
init {
dispatcher.registerHandler(Request.RegisterListener::class) { request ->