Improved ZimReaderSource creation for previously saved notes/bookmark…

…s/history items.
kiwix · Feb 8, 2024 · 5d69248 · 5d69248
1 parent bc64d43
commit 5d69248
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/HistoryDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/HistoryDao.kt
@@ -25,8 +25,7 @@ import org.kiwix.kiwixmobile.core.dao.entities.HistoryEntity
 import org.kiwix.kiwixmobile.core.dao.entities.HistoryEntity_
 import org.kiwix.kiwixmobile.core.page.adapter.Page
 import org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem.HistoryItem
-import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
-import java.io.File
+import org.kiwix.kiwixmobile.core.reader.ZimReaderSource.Companion.fromDatabaseValue
 import javax.inject.Inject
 
 class HistoryDao @Inject constructor(val box: Box<HistoryEntity>) : PageDao {
@@ -39,7 +38,9 @@ class HistoryDao @Inject constructor(val box: Box<HistoryEntity>) : PageDao {
     it.map { historyEntity ->
       historyEntity.zimFilePath?.let { filePath ->
         // set zimReaderSource for previously saved history items
-        historyEntity.zimReaderSource = ZimReaderSource.ZimFile(File(filePath))
+        fromDatabaseValue(filePath)?.let { zimReaderSource ->
+          historyEntity.zimReaderSource = zimReaderSource
+        }
       }
       HistoryItem(historyEntity)
     }

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookmarksDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookmarksDao.kt
@@ -27,8 +27,7 @@ import org.kiwix.kiwixmobile.core.dao.entities.BookmarkEntity_
 import org.kiwix.kiwixmobile.core.page.adapter.Page
 import org.kiwix.kiwixmobile.core.page.bookmark.adapter.BookmarkItem
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
-import org.kiwix.kiwixmobile.core.reader.ZimReaderSource.ZimFile
-import java.io.File
+import org.kiwix.kiwixmobile.core.reader.ZimReaderSource.Companion.fromDatabaseValue
 import javax.inject.Inject
 
 class NewBookmarksDao @Inject constructor(val box: Box<BookmarkEntity>) : PageDao {
@@ -40,7 +39,9 @@ class NewBookmarksDao @Inject constructor(val box: Box<BookmarkEntity>) : PageDa
     it.map { bookmarkEntity ->
       bookmarkEntity.zimFilePath?.let { filePath ->
         // set zimReaderSource for previously saved bookmarks
-        bookmarkEntity.zimReaderSource = ZimFile(File(filePath))
+        fromDatabaseValue(filePath)?.let { zimReaderSource ->
+          bookmarkEntity.zimReaderSource = zimReaderSource
+        }
       }
       BookmarkItem(bookmarkEntity)
     }

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewNoteDao.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewNoteDao.kt
@@ -26,8 +26,7 @@ import org.kiwix.kiwixmobile.core.dao.entities.NotesEntity
 import org.kiwix.kiwixmobile.core.dao.entities.NotesEntity_
 import org.kiwix.kiwixmobile.core.page.adapter.Page
 import org.kiwix.kiwixmobile.core.page.notes.adapter.NoteListItem
-import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
-import java.io.File
+import org.kiwix.kiwixmobile.core.reader.ZimReaderSource.Companion.fromDatabaseValue
 import javax.inject.Inject
 
 class NewNoteDao @Inject constructor(val box: Box<NotesEntity>) : PageDao {
@@ -39,7 +38,9 @@ class NewNoteDao @Inject constructor(val box: Box<NotesEntity>) : PageDao {
     it.map { notesEntity ->
       notesEntity.zimFilePath?.let { filePath ->
         // set zimReaderSource for previously saved notes
-        notesEntity.zimReaderSource = ZimReaderSource.ZimFile(File(filePath))
+        fromDatabaseValue(filePath)?.let { zimReaderSource ->
+          notesEntity.zimReaderSource = zimReaderSource
+        }
       }
       NoteListItem(notesEntity)
     }