Fix for crash “PdfReaderViewModel.onCleared”

zotero · Jan 9, 2025 · 9500b65 · 9500b65
1 parent 9c9fcf8
commit 9500b65
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderViewModel.kt b/app/src/main/java/org/zotero/android/pdf/reader/PdfReaderViewModel.kt
@@ -2057,7 +2057,11 @@ class PdfReaderViewModel @Inject constructor(
         fragmentManager.commit(allowStateLoss = true) {
             remove(this@PdfReaderViewModel.pdfUiFragment)
         }
-        pdfFragment.removeOnAnnotationUpdatedListener(onAnnotationUpdatedListener!!)
+        if (this::pdfFragment.isInitialized) {
+            onAnnotationUpdatedListener?.let {
+                pdfFragment.removeOnAnnotationUpdatedListener(it)
+            }
+        }
 
         EventBus.getDefault().unregister(this)
         liveAnnotations?.removeAllChangeListeners()
@@ -2072,16 +2076,18 @@ class PdfReaderViewModel @Inject constructor(
         annotationPreviewManager.cancelProcessing()
         annotationPreviewFileCache.cancelProcessing()
         clearThumbnailCaches()
-        document.annotationProvider
-            .getAllAnnotationsOfTypeAsync(AnnotationsConfig.supported)
-            .toList()
-            .blockingGet()
-            .forEach {
-                this.document.annotationProvider.removeAnnotationFromPage(it)
-            }
-        val activity = pdfUiFragment.activity
-        if (activity != null) {
-            WindowCompat.getInsetsController(activity.window, activity.window.decorView).show(
+        if (this::document.isInitialized) {
+            document.annotationProvider
+                .getAllAnnotationsOfTypeAsync(AnnotationsConfig.supported)
+                .toList()
+                .blockingGet()
+                .forEach {
+                    this.document.annotationProvider.removeAnnotationFromPage(it)
+                }
+        }
+
+        pdfUiFragment.activity?.let {
+            WindowCompat.getInsetsController(it.window, it.window.decorView).show(
                 WindowInsetsCompat.Type.systemBars()
             )
         }