diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt | 16 |
2 files changed, 10 insertions, 10 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 986e98b40f..efcdfdec05 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -59,7 +59,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA lateinit var settingsListener: SettingsListener private set - lateinit var splitTunnelling: SplitTunneling + lateinit var splitTunneling: SplitTunneling override fun onNewServiceConnection(serviceConnection: ServiceConnection) { // This method is always either called first or after an `onNoServiceConnection`, so the @@ -73,7 +73,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA locationInfoCache = serviceConnection.locationInfoCache relayListListener = serviceConnection.relayListListener settingsListener = serviceConnection.settingsListener - splitTunnelling = serviceConnection.splitTunneling + splitTunneling = serviceConnection.splitTunneling synchronized(this) { when (state) { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt index 93f697d5d3..6118cfeb5a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt @@ -54,7 +54,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc override fun onAttach(context: Context) { super.onAttach(context) - appListAdapter = AppListAdapter(context, splitTunnelling) + appListAdapter = AppListAdapter(context, splitTunneling) } override fun onSafelyCreateView( @@ -88,7 +88,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc override fun onSafelyPause() { jobTracker.newBackgroundJob("persistExcludedApps") { - splitTunnelling.persist() + splitTunneling.persist() } } @@ -119,14 +119,14 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc } } - if (splitTunnelling.enabled) { + if (splitTunneling.enabled) { jobTracker.newUiJob("showExcludedApplications") { excludeApplications.visibility = View.VISIBLE } } enabledToggle = header.findViewById<ToggleCell>(R.id.enabled).apply { - if (splitTunnelling.enabled) { + if (splitTunneling.enabled) { forcefullySetState(CellSwitch.State.ON) } else { forcefullySetState(CellSwitch.State.OFF) @@ -146,20 +146,20 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc } private fun enable() { - splitTunnelling.enabled = true + splitTunneling.enabled = true appListAdapter.enabled = configureSpinner() excludeApplications.visibility = View.VISIBLE excludeApplicationsFadeOut.reverse() } private fun disable() { - splitTunnelling.enabled = false + splitTunneling.enabled = false appListAdapter.enabled = false excludeApplicationsFadeOut.start() } private fun configureSpinner(): Boolean { - if (splitTunnelling.enabled && !appListAdapter.isListReady) { + if (splitTunneling.enabled && !appListAdapter.isListReady) { showLoadingSpinner() appListAdapter.onListReady = { @@ -168,7 +168,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc return false } else { - return splitTunnelling.enabled + return splitTunneling.enabled } } |