Fixed: Application crashes at first launch.

kiwix · Dec 6, 2024 · c26138c · c26138c
1 parent c33fc58
commit c26138c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/KiwixReaderFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/KiwixReaderFragment.kt
@@ -257,9 +257,10 @@ class KiwixReaderFragment : CoreReaderFragment() {
     when (restoreOrigin) {
       FromExternalLaunch -> {
         coreReaderLifeCycleScope?.launch {
+          if (!isAdded) return@launch
           val settings =
-            requireActivity().getSharedPreferences(SharedPreferenceUtil.PREF_KIWIX_MOBILE, 0)
-          val zimReaderSource = fromDatabaseValue(settings.getString(TAG_CURRENT_FILE, null))
+            activity?.getSharedPreferences(SharedPreferenceUtil.PREF_KIWIX_MOBILE, 0)
+          val zimReaderSource = fromDatabaseValue(settings?.getString(TAG_CURRENT_FILE, null))
           if (zimReaderSource?.canOpenInLibkiwix() == true) {
             if (zimReaderContainer?.zimReaderSource == null) {
               openZimFile(zimReaderSource, isFromManageExternalLaunch = true)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
@@ -1220,6 +1220,7 @@ abstract class CoreReaderFragment :
   override fun onDestroyView() {
     super.onDestroyView()
     try {
+      coreReaderLifeCycleScope?.cancel()
       readerLifeCycleScope?.cancel()
       readerLifeCycleScope = null
     } catch (ignore: Exception) {