diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-22 15:10:19 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-22 15:10:19 -0300 |
| commit | 0318bd3d8601b324efe35b069c1e5dac1dd34aa4 (patch) | |
| tree | 15570c6951a248f34a9a064e94a9870dfe813434 /android/src/main | |
| parent | 7f073236b020f2042e89fc6f2e005c2ad89fc464 (diff) | |
| parent | 766ac541361f78f3fccac7ac579a662da16bbb25 (diff) | |
| download | mullvadvpn-0318bd3d8601b324efe35b069c1e5dac1dd34aa4.tar.xz mullvadvpn-0318bd3d8601b324efe35b069c1e5dac1dd34aa4.zip | |
Merge branch 'fix-split-tunneling-adapter-initialization'
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt | 9 |
2 files changed, 3 insertions, 7 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 ad8863b2c5..7f84f09008 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -60,6 +60,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA private set lateinit var splitTunneling: SplitTunneling + private set override fun onNewServiceConnection(serviceConnection: ServiceConnection) { // This method is always either called first or after an `onNoServiceConnection`, so the 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 b5779f9f72..3d915c9a6b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt @@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.ui import android.animation.Animator import android.animation.Animator.AnimatorListener import android.animation.ObjectAnimator -import android.content.Context import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.view.LayoutInflater @@ -51,12 +50,6 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc private lateinit var excludeApplications: View private lateinit var loadingSpinner: View - override fun onAttach(context: Context) { - super.onAttach(context) - - appListAdapter = AppListAdapter(context, splitTunneling) - } - override fun onSafelyCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,6 +63,8 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc titleController = CollapsibleTitleController(view, R.id.app_list) + appListAdapter = AppListAdapter(parentActivity, splitTunneling) + view.findViewById<CustomRecyclerView>(R.id.app_list).apply { layoutManager = LinearLayoutManager(parentActivity) |