summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-20 23:34:43 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-24 19:00:24 +0000
commit0159da367e2938804c9c50425c1322eb32d277cb (patch)
treeb8e92e1b97a09925f5e32e39a8c1d8e03a0035a6 /android/src/main
parent16de71464cf78755326910b301c61ad8cc374fda (diff)
downloadmullvadvpn-0159da367e2938804c9c50425c1322eb32d277cb.tar.xz
mullvadvpn-0159da367e2938804c9c50425c1322eb32d277cb.zip
Change spelling in `ServiceDependentFragment`
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt4
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt16
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
}
}