diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt index f5175168d..d68ad6d89 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt @@ -70,6 +70,7 @@ class LanguageFragment : BaseFragment() { private val compositeDisposable = CompositeDisposable() private var activityLanguageBinding: ActivityLanguageBinding? = null + private var searchView: SearchView? = null private val languageAdapter = LanguageAdapter( @@ -127,8 +128,8 @@ class LanguageFragment : BaseFragment() { object : MenuProvider { override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.menu_language, menu) - val search = menu.findItem(R.id.menu_language_search).actionView as SearchView - search.apply { + searchView = menu.findItem(R.id.menu_language_search).actionView as SearchView + searchView?.apply { setUpSearchView(requireActivity()) setOnQueryTextListener( SimpleTextListener { query, _ -> @@ -172,6 +173,8 @@ class LanguageFragment : BaseFragment() { override fun onDestroyView() { super.onDestroyView() + searchView?.setOnQueryTextListener(null) + searchView = null activityLanguageBinding = null } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt index d2be1b0ca..d30249621 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt @@ -489,6 +489,7 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal copyMoveFileHandler?.fileCopyMoveCallback = null copyMoveFileHandler?.lifecycleScope = null copyMoveFileHandler?.fileSystemDisposable?.dispose() + copyMoveFileHandler = null } private fun sideEffects() = zimManageViewModel.sideEffects diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt index a6ab9f50f..7ac7e1132 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt @@ -206,6 +206,7 @@ class SearchFragment : BaseFragment() { renderingJob?.cancel() renderingJob = null activity?.intent?.action = null + searchView?.setOnQueryTextListener(null) searchView = null searchInTextMenuItem = null findInPageTextView = null