diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-21 12:59:46 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-22 15:13:17 +0000 |
| commit | 886c3239ada4dd6a771228d8bb8e876f03b3e029 (patch) | |
| tree | e0a9267bc69366ae8e32343df35e5c1c5f08aaf9 /android/src | |
| parent | 68f01a2aaae7d5b423e3e7b05bfe4f6fbb51fb0f (diff) | |
| download | mullvadvpn-886c3239ada4dd6a771228d8bb8e876f03b3e029.tar.xz mullvadvpn-886c3239ada4dd6a771228d8bb8e876f03b3e029.zip | |
Only initialize adapter if service is available
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt | 9 |
1 files changed, 2 insertions, 7 deletions
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) |