From 6c09fc2e64bf5321ad8b3317cfaec66c379c6327 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 22 Jun 2023 15:47:12 -0700 Subject: [PATCH] Move addMenuProvider into onStart --- app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt b/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt index f5c9b7797..b996eec39 100644 --- a/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt @@ -48,6 +48,9 @@ abstract class BaseFragment : Fragment(), ViewModelHo override fun onStart() { super.onStart() activity?.supportActionBar?.subtitle = null + if (this is MenuProvider) { + activity?.addMenuProvider(this, viewLifecycleOwner) + } } override fun onEventDispatched(event: ViewEvent) = when(event) { @@ -66,8 +69,6 @@ abstract class BaseFragment : Fragment(), ViewModelHo override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (this is MenuProvider) - activity?.addMenuProvider(this, viewLifecycleOwner) binding.addOnRebindCallback(object : OnRebindCallback() { override fun onPreBind(binding: Binding): Boolean { this@BaseFragment.onPreBind(binding)