...

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainPresenter.kt

@@ -48,6 +48,12 @@ class MainPresenter(
     private lateinit var scannerLauncher: ActivityResultLauncher<IntentSenderRequest>
 
     fun initAllDocumentData() = lifecycleScope.launch(Dispatchers.IO) {
+        pdfDocuments.clear()
+        wordDocuments.clear()
+        excelDocuments.clear()
+        pptDocuments.clear()
+
+
         context.upDateDemoStore()
         if (!ConstObject.haveSaveDemo) {
             context.saveAssetsFile()
@@ -81,6 +87,9 @@ class MainPresenter(
 
         when (documentType) {
             TYPE_PDF -> {
+                pdfDocuments.forEach {
+                    it.isBookmarked = bookmarkList.contains(it.path)
+                }
                 when (dataType) {
                     DOCUMENT_DATA_TYPE -> {
                         return pdfDocuments
@@ -91,9 +100,6 @@ class MainPresenter(
                     }
 
                     BOOKMARK_DATA_TYPE -> {
-                        pdfDocuments.forEach {
-                            it.isBookmarked = bookmarkList.contains(it.path)
-                        }
                         return pdfDocuments.filter { it.isBookmarked }
                     }
 
@@ -101,7 +107,11 @@ class MainPresenter(
             }
 
             TYPE_WORD -> {
+                wordDocuments.forEach {
+                    it.isBookmarked = bookmarkList.contains(it.path)
+                }
                 when (dataType) {
+
                     DOCUMENT_DATA_TYPE -> {
                         return wordDocuments
                     }
@@ -111,9 +121,7 @@ class MainPresenter(
                     }
 
                     BOOKMARK_DATA_TYPE -> {
-                        wordDocuments.forEach {
-                            it.isBookmarked = bookmarkList.contains(it.path)
-                        }
+
                         return wordDocuments.filter { it.isBookmarked }
                     }
 
@@ -121,6 +129,9 @@ class MainPresenter(
             }
 
             TYPE_EXCEL -> {
+                excelDocuments.forEach {
+                    it.isBookmarked = bookmarkList.contains(it.path)
+                }
                 when (dataType) {
                     DOCUMENT_DATA_TYPE -> {
                         return excelDocuments
@@ -131,9 +142,6 @@ class MainPresenter(
                     }
 
                     BOOKMARK_DATA_TYPE -> {
-                        excelDocuments.forEach {
-                            it.isBookmarked = bookmarkList.contains(it.path)
-                        }
                         return excelDocuments.filter { it.isBookmarked }
                     }
 
@@ -141,6 +149,9 @@ class MainPresenter(
             }
 
             TYPE_PPT -> {
+                pptDocuments.forEach {
+                    it.isBookmarked = bookmarkList.contains(it.path)
+                }
                 when (dataType) {
                     DOCUMENT_DATA_TYPE -> {
                         return pptDocuments
@@ -151,9 +162,6 @@ class MainPresenter(
                     }
 
                     BOOKMARK_DATA_TYPE -> {
-                        pptDocuments.forEach {
-                            it.isBookmarked = bookmarkList.contains(it.path)
-                        }
                         return pptDocuments.filter { it.isBookmarked }
                     }
 
@@ -163,7 +171,7 @@ class MainPresenter(
         return listOf()
     }
 
-    fun recentFilter(documentBean: DocumentBean): Boolean {
+    private fun recentFilter(documentBean: DocumentBean): Boolean {
         return (System.currentTimeMillis() - File(documentBean.path).lastModified()) < 300L * 24 * 60 * 60 * 1000
     }
 
@@ -347,17 +355,18 @@ class MainPresenter(
 
     fun changeBookmark(path: String, isBookmarked: Boolean, documentPageFragment: DocumentPageFragment) =
         lifecycleScope.launch(Dispatchers.IO) {
+            if (isBookmarked) {
+                SpStringUtils.addSpString(BOOKMARK_KEY, path)
+            } else {
+                SpStringUtils.deleteSpString(BOOKMARK_KEY, path)
+            }
             when (documentPageFragment.type) {
                 TYPE_PDF -> pdfDocuments.find { it.path == path }?.isBookmarked = isBookmarked
                 TYPE_WORD -> wordDocuments.find { it.path == path }?.isBookmarked = isBookmarked
                 TYPE_EXCEL -> excelDocuments.find { it.path == path }?.isBookmarked = isBookmarked
                 TYPE_PPT -> pptDocuments.find { it.path == path }?.isBookmarked = isBookmarked
             }
-            if (isBookmarked) {
-                SpStringUtils.addSpString(BOOKMARK_KEY, path)
-            } else {
-                SpStringUtils.deleteSpString(BOOKMARK_KEY, path)
-            }
+
             launch(Dispatchers.Main) {
                 documentPageFragment.refreshData()
             }