From 1b87a8b7854381dec217bc867d02dfe8b1fc5dea Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Mon, 1 Feb 2021 21:32:22 -0800 Subject: [PATCH] Let the link-driven add-on install logic build with our collection fetcher --- .../org/mozilla/fenix/addons/AddonsManagementFragment.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index 5078e1002..78e62ab14 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -176,14 +176,14 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) val allowCache = args.installAddonId == null || installExternalAddonComplete lifecycleScope.launch(IO) { try { - addons = requireContext().components.addonManager.getAddons(allowCache = allowCache) + val addons = requireContext().components.addonManager.getAddons(allowCache = allowCache) lifecycleScope.launch(Dispatchers.Main) { runIfFragmentIsAttached { if (!shouldRefresh) { adapter = PagedAddonsManagerAdapter( requireContext().components.addonCollectionProvider, managementView, - addons!!, + addons, style = createAddonStyle(requireContext()) ) } @@ -193,7 +193,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) recyclerView.adapter = adapter if (shouldRefresh) { - adapter?.updateAddons(addons!!) + adapter?.updateAddons(addons) } args.installAddonId?.let { addonIn -> @@ -244,7 +244,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) } private fun createAddonStyle(context: Context): PagedAddonsManagerAdapter.Style { - return AddonsManagerAdapter.Style( + return PagedAddonsManagerAdapter.Style( sectionsTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context), addonNameTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context), addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context),