TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when fragment is detached from activity

Browse Source
This commit is contained in:
LoveSy 2022-01-27 17:54:24 +08:00 committed by GitHub
parent f5e5ab2436
commit 1893359142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
View File

@ -15,11 +15,11 @@ import com.topjohnwu.magisk.ktx.startAnimations
abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder { abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
val activity get() = requireActivity() as NavigationActivity<*> val activity get() = getActivity() as? NavigationActivity<*>
protected lateinit var binding: Binding protected lateinit var binding: Binding
protected abstract val layoutRes: Int protected abstract val layoutRes: Int
private val navigation get() = activity.navigation private val navigation get() = activity?.navigation
open val snackbarAnchorView: View? get() = null open val snackbarAnchorView: View? get() = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -41,12 +41,12 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.supportActionBar?.subtitle = null activity?.supportActionBar?.subtitle = null
} }
override fun onEventDispatched(event: ViewEvent) = when(event) { override fun onEventDispatched(event: ViewEvent) = when(event) {
is ContextExecutor -> event(requireContext()) is ContextExecutor -> event(requireContext())
is ActivityExecutor -> event(activity) is ActivityExecutor -> activity?.let { event(it) } ?: Unit
is FragmentExecutor -> event(this) is FragmentExecutor -> event(this)
else -> Unit else -> Unit
} }

2
app/src/main/java/com/topjohnwu/magisk/events/ViewEvents.kt
View File

@ -83,7 +83,7 @@ class SelectModuleEvent : ViewEvent(), FragmentExecutor {
override fun invoke(fragment: BaseFragment<*>) { override fun invoke(fragment: BaseFragment<*>) {
try { try {
fragment.apply { fragment.apply {
activity.getContent("application/zip") { activity?.getContent("application/zip") {
MainDirections.actionFlashFragment(Const.Value.FLASH_ZIP, it).navigate() MainDirections.actionFlashFragment(Const.Value.FLASH_ZIP, it).navigate()
} }
} }

2
app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListFragment.kt
View File

@ -26,7 +26,7 @@ class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>() {
override fun onAttach(context: Context) { override fun onAttach(context: Context) {
super.onAttach(context) super.onAttach(context)
activity.setTitle(R.string.denylist) activity?.setTitle(R.string.denylist)
setHasOptionsMenu(true) setHasOptionsMenu(true)
} }

10
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
View File

@ -31,10 +31,10 @@ class FlashFragment : BaseFragment<FragmentFlashMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setHasOptionsMenu(true) setHasOptionsMenu(true)
activity.setTitle(R.string.flash_screen_title) activity?.setTitle(R.string.flash_screen_title)
viewModel.subtitle.observe(this) { viewModel.subtitle.observe(this) {
activity.supportActionBar?.setSubtitle(it) activity?.supportActionBar?.setSubtitle(it)
} }
} }
@ -49,15 +49,15 @@ class FlashFragment : BaseFragment<FragmentFlashMd2Binding>() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
defaultOrientation = activity.requestedOrientation defaultOrientation = activity?.requestedOrientation ?: -1
activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
viewModel.startFlashing() viewModel.startFlashing()
} }
@SuppressLint("WrongConstant") @SuppressLint("WrongConstant")
override fun onDestroyView() { override fun onDestroyView() {
if (defaultOrientation != -1) { if (defaultOrientation != -1) {
activity.requestedOrientation = defaultOrientation activity?.requestedOrientation = defaultOrientation
} }
super.onDestroyView() super.onDestroyView()
} }

4
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View File

@ -19,7 +19,7 @@ class HomeFragment : BaseFragment<FragmentHomeMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.title = resources.getString(R.string.section_home) activity?.title = resources.getString(R.string.section_home)
setHasOptionsMenu(true) setHasOptionsMenu(true)
DownloadService.observeProgress(this, viewModel::onProgressUpdate) DownloadService.observeProgress(this, viewModel::onProgressUpdate)
} }
@ -64,7 +64,7 @@ class HomeFragment : BaseFragment<FragmentHomeMd2Binding>() {
when (item.itemId) { when (item.itemId) {
R.id.action_settings -> R.id.action_settings ->
HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate() HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate()
R.id.action_reboot -> RebootEvent.inflateMenu(activity).show() R.id.action_reboot -> activity?.let { RebootEvent.inflateMenu(it).show() }
else -> return super.onOptionsItemSelected(item) else -> return super.onOptionsItemSelected(item)
} }
return true return true

2
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View File

@ -38,7 +38,7 @@ class LogFragment : BaseFragment<FragmentLogMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setHasOptionsMenu(true) setHasOptionsMenu(true)
activity.title = resources.getString(R.string.logs) activity?.title = resources.getString(R.string.logs)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View File

@ -19,7 +19,7 @@ class ModuleFragment : BaseFragment<FragmentModuleMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setHasOptionsMenu(true) setHasOptionsMenu(true)
activity.title = resources.getString(R.string.modules) activity?.title = resources.getString(R.string.modules)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View File

@ -18,7 +18,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.title = resources.getString(R.string.settings) activity?.title = resources.getString(R.string.settings)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View File

@ -17,7 +17,7 @@ class SuperuserFragment : BaseFragment<FragmentSuperuserMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.title = resources.getString(R.string.superuser) activity?.title = resources.getString(R.string.superuser)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
View File

@ -61,7 +61,7 @@ class ThemeFragment : BaseFragment<FragmentThemeMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.title = getString(R.string.section_theme) activity?.title = getString(R.string.section_theme)
} }
} }