diff options
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunnelling.kt) | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 4 |
6 files changed, 9 insertions, 9 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 0fb1d94d47..b92fd5139b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt @@ -6,12 +6,12 @@ import android.view.LayoutInflater import android.view.ViewGroup import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.SplitTunnelling +import net.mullvad.mullvadvpn.service.SplitTunneling import net.mullvad.mullvadvpn.util.JobTracker class AppListAdapter( context: Context, - private val splitTunnelling: SplitTunnelling + private val splitTunnelling: SplitTunneling ) : Adapter<AppListItemHolder>() { private val appList = ArrayList<AppInfo>() private val jobTracker = JobTracker() 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 b623721000..8246820411 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt @@ -8,12 +8,12 @@ import android.widget.ImageView import android.widget.TextView import kotlin.properties.Delegates.observable import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.SplitTunnelling +import net.mullvad.mullvadvpn.service.SplitTunneling import net.mullvad.mullvadvpn.ui.widget.CellSwitch import net.mullvad.mullvadvpn.util.JobTracker class AppListItemHolder( - private val splitTunnelling: SplitTunnelling, + private val splitTunnelling: SplitTunneling, private val packageManager: PackageManager, private val jobTracker: JobTracker, view: View diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 6ba1a42c1e..c197bafe00 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -238,7 +238,7 @@ class MullvadVpnService : TalpidVpnService() { pendingAction = null } - val splitTunnelling = SplitTunnelling(this).apply { + val splitTunnelling = SplitTunneling(this).apply { onChange = { excludedApps -> disallowedApps = excludedApps markTunAsStale() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt index ecca6b12f0..4685e46c54 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -7,7 +7,7 @@ class ServiceInstance( val connectionProxy: ConnectionProxy, val connectivityListener: ConnectivityListener, val settingsListener: SettingsListener, - val splitTunnelling: SplitTunnelling + val splitTunnelling: SplitTunneling ) { val accountCache = AccountCache(daemon, settingsListener) val keyStatusListener = KeyStatusListener(daemon) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunnelling.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt index 13f6b242f1..d4bebad3cc 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunnelling.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt @@ -7,7 +7,7 @@ import kotlin.properties.Delegates.observable private const val SHARED_PREFERENCES = "split_tunnelling" private const val KEY_ENABLED = "enabled" -class SplitTunnelling(context: Context) { +class SplitTunneling(context: Context) { private val appListFile = File(context.filesDir, "split-tunnelling.txt") private val excludedApps = HashSet<String>() private val preferences = context.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE) 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 29577058b8..ed4f0e159a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.service.KeyStatusListener import net.mullvad.mullvadvpn.service.LocationInfoCache import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.service.SettingsListener -import net.mullvad.mullvadvpn.service.SplitTunnelling +import net.mullvad.mullvadvpn.service.SplitTunneling import net.mullvad.talpid.ConnectivityListener abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceAwareFragment() { @@ -59,7 +59,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA lateinit var settingsListener: SettingsListener private set - lateinit var splitTunnelling: SplitTunnelling + lateinit var splitTunnelling: SplitTunneling override fun onNewServiceConnection(serviceConnection: ServiceConnection) { // This method is always either called first or after an `onNoServiceConnection`, so the |
