diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-05 13:43:41 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-12 13:19:37 +0000 |
| commit | acbf4f645bb08a03a93c677a4b375f701b9c9d8c (patch) | |
| tree | ea38ab3db0c45dfe521f1734a21e72abf2d8306f /android/src | |
| parent | 1788ca1c4fb23e54e4832f0d85bfd9d94d9db6fd (diff) | |
| download | mullvadvpn-acbf4f645bb08a03a93c677a4b375f701b9c9d8c.tar.xz mullvadvpn-acbf4f645bb08a03a93c677a4b375f701b9c9d8c.zip | |
Use UI-side `ConnectionProxy`
Diffstat (limited to 'android/src')
3 files changed, 6 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt index 0383500aa9..1927a0490f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -9,8 +9,8 @@ import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache import net.mullvad.mullvadvpn.dataproxy.RelayListListener import net.mullvad.mullvadvpn.service.CustomDns import net.mullvad.mullvadvpn.service.MullvadDaemon -import net.mullvad.mullvadvpn.service.endpoint.ConnectionProxy import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache +import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy import net.mullvad.mullvadvpn.ui.serviceconnection.KeyStatusListener import net.mullvad.mullvadvpn.ui.serviceconnection.LocationInfoCache import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt index 1ec6ce7da5..8c26c5dc1e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt @@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.ui.notification import android.content.Context import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.TunnelState -import net.mullvad.mullvadvpn.service.endpoint.ConnectionProxy +import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy import net.mullvad.talpid.tunnel.ActionAfterDisconnect import net.mullvad.talpid.tunnel.ErrorState import net.mullvad.talpid.tunnel.ErrorStateCause diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt index 7e7db4aa27..4536b4e7ab 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt @@ -29,7 +29,7 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main val daemon = service.daemon val accountCache = AccountCache(service.messenger, dispatcher) - val connectionProxy = service.connectionProxy + val connectionProxy = ConnectionProxy(service.messenger, dispatcher) val customDns = service.customDns val keyStatusListener = KeyStatusListener(service.messenger, dispatcher) val locationInfoCache = LocationInfoCache(dispatcher) @@ -44,7 +44,7 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main init { appVersionInfoCache.onCreate() - connectionProxy.mainActivity = mainActivity + service.connectionProxy.mainActivity = mainActivity registerListener() } @@ -52,13 +52,14 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main dispatcher.onDestroy() accountCache.onDestroy() + connectionProxy.onDestroy() keyStatusListener.onDestroy() locationInfoCache.onDestroy() settingsListener.onDestroy() appVersionInfoCache.onDestroy() relayListListener.onDestroy() - connectionProxy.mainActivity = null + service.connectionProxy.mainActivity = null } private fun registerListener() { |