diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-10 23:05:20 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-23 12:36:35 +0000 |
| commit | 05e0d28908a4f1a85839fa80f2c0e809ce062b29 (patch) | |
| tree | 1571a83ae0cfe0ae1779611a496bd1e907d81abd /android/src | |
| parent | f5b3dc97fce788e8742162397d0e9ae7c149f5dd (diff) | |
| download | mullvadvpn-05e0d28908a4f1a85839fa80f2c0e809ce062b29.tar.xz mullvadvpn-05e0d28908a4f1a85839fa80f2c0e809ce062b29.zip | |
Use UI side `SettingsListener`
Diffstat (limited to 'android/src')
4 files changed, 6 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt index f903726867..eafe9f1493 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.model.AppVersionInfo import net.mullvad.mullvadvpn.service.MullvadDaemon -import net.mullvad.mullvadvpn.service.endpoint.SettingsListener +import net.mullvad.mullvadvpn.ui.serviceconnection.SettingsListener class AppVersionInfoCache( val context: Context, diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt index 9cad04c102..fe8142ed7d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt @@ -9,7 +9,7 @@ import net.mullvad.mullvadvpn.model.RelaySettings import net.mullvad.mullvadvpn.relaylist.RelayItem import net.mullvad.mullvadvpn.relaylist.RelayList import net.mullvad.mullvadvpn.service.MullvadDaemon -import net.mullvad.mullvadvpn.service.endpoint.SettingsListener +import net.mullvad.mullvadvpn.ui.serviceconnection.SettingsListener class RelayListListener(val daemon: MullvadDaemon, val settingsListener: SettingsListener) { private val setUpJob = setUp() 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 47dce8bbbc..6ff8b8c488 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -14,8 +14,8 @@ import net.mullvad.mullvadvpn.service.KeyStatusListener import net.mullvad.mullvadvpn.service.LocationInfoCache import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.service.SplitTunneling -import net.mullvad.mullvadvpn.service.endpoint.SettingsListener import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection +import net.mullvad.mullvadvpn.ui.serviceconnection.SettingsListener abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceAwareFragment() { enum class OnNoService { 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 d9071ca2b9..9bc22dd069 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 @@ -27,7 +27,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val customDns = service.customDns val keyStatusListener = service.keyStatusListener val locationInfoCache = service.locationInfoCache - val settingsListener = service.settingsListener + val settingsListener = SettingsListener(dispatcher) val splitTunneling = service.splitTunneling val appVersionInfoCache = AppVersionInfoCache(mainActivity, daemon, settingsListener) @@ -42,6 +42,8 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: fun onDestroy() { dispatcher.onDestroy() + settingsListener.onDestroy() + appVersionInfoCache.onDestroy() relayListListener.onDestroy() connectionProxy.mainActivity = null |