diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-18 15:34:02 +0000 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-04-08 13:26:19 +0200 |
| commit | 5007aac3ed193b07cc637d1931363a9352ee6458 (patch) | |
| tree | 0065b354c43c70e450425077cdf4ceb7499c7951 /android/src | |
| parent | b4956ac00e2ab6c3dc47398e7297097b93d4f78d (diff) | |
| download | mullvadvpn-5007aac3ed193b07cc637d1931363a9352ee6458.tar.xz mullvadvpn-5007aac3ed193b07cc637d1931363a9352ee6458.zip | |
Use UI-side `SplitTunneling`
Diffstat (limited to 'android/src')
6 files changed, 6 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt index 3664defbe3..adbafc3dbd 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView.Adapter import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.endpoint.SplitTunneling +import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling import net.mullvad.mullvadvpn.util.JobTracker class AppListAdapter( diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt index 102d7aeb27..6f52604018 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView.ViewHolder import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.endpoint.SplitTunneling +import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling import net.mullvad.mullvadvpn.ui.widget.CellSwitch import net.mullvad.mullvadvpn.util.JobTracker 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 21278cb71a..0cb33c3334 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -10,12 +10,12 @@ import net.mullvad.mullvadvpn.dataproxy.RelayListListener import net.mullvad.mullvadvpn.service.ConnectionProxy import net.mullvad.mullvadvpn.service.CustomDns import net.mullvad.mullvadvpn.service.MullvadDaemon -import net.mullvad.mullvadvpn.service.endpoint.SplitTunneling import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache import net.mullvad.mullvadvpn.ui.serviceconnection.KeyStatusListener import net.mullvad.mullvadvpn.ui.serviceconnection.LocationInfoCache import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection import net.mullvad.mullvadvpn.ui.serviceconnection.SettingsListener +import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling 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 2d2bad5553..c5c1716ea9 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 @@ -28,7 +28,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val keyStatusListener = KeyStatusListener(service.messenger, dispatcher) val locationInfoCache = LocationInfoCache(dispatcher) val settingsListener = SettingsListener(dispatcher) - val splitTunneling = service.splitTunneling + val splitTunneling = SplitTunneling(service.messenger, dispatcher) val appVersionInfoCache = AppVersionInfoCache(mainActivity, daemon, settingsListener) var relayListListener = RelayListListener(daemon, settingsListener) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt index 7b0ab9cc91..9e18a90ab7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt @@ -18,7 +18,7 @@ import net.mullvad.mullvadvpn.applist.ApplicationsProvider import net.mullvad.mullvadvpn.applist.ViewIntent import net.mullvad.mullvadvpn.model.ListItemData import net.mullvad.mullvadvpn.model.WidgetState -import net.mullvad.mullvadvpn.service.endpoint.SplitTunneling +import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling class SplitTunnelingViewModel( private val appsProvider: ApplicationsProvider, diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt b/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt index 4bfd98f9da..00e6174487 100644 --- a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt +++ b/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt @@ -21,7 +21,7 @@ import net.mullvad.mullvadvpn.applist.ViewIntent import net.mullvad.mullvadvpn.assertLists import net.mullvad.mullvadvpn.model.ListItemData import net.mullvad.mullvadvpn.model.WidgetState -import net.mullvad.mullvadvpn.service.SplitTunneling +import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling import org.junit.After import org.junit.Before import org.junit.Rule |