Fixed adding books to library while importing the bookmarks. Also imp…

…roved the convertor of room and objectbox
kiwix · Aug 24, 2024 · 31991bd · 31991bd
1 parent 58cbd5d
commit 31991bd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
@@ -417,7 +417,7 @@ class LibkiwixBookmarks @Inject constructor(
     }
     // Add the ZIM files to the library for validating the bookmarks.
     bookDao.getBooks().forEach {
-      addBookToLibrary(file = it.file)
+      addBookToLibrary(file = it.zimReaderSource.file)
     }
     // Save the imported bookmarks to the current library.
     tempLibrary.getBookmarks(false)?.toList()?.forEach {

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookOnDiskEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookOnDiskEntity.kt
@@ -86,7 +86,7 @@ data class BookOnDiskEntity(
 }
 
 class ZimSourceConverter : PropertyConverter<ZimReaderSource, String> {
-  override fun convertToDatabaseValue(entityProperty: ZimReaderSource?) =
+  override fun convertToDatabaseValue(entityProperty: ZimReaderSource?): String =
     entityProperty?.toDatabase() ?: ""
 
   override fun convertToEntityProperty(databaseValue: String?): ZimReaderSource =

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryRoomEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryRoomEntity.kt
@@ -21,15 +21,11 @@ package org.kiwix.kiwixmobile.core.dao.entities
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverter
-import androidx.room.TypeConverters
-import io.objectbox.annotation.Convert
-import io.objectbox.converter.PropertyConverter
 import org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem.HistoryItem
 import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
 import java.io.File
 
 @Entity
-@TypeConverters(ZimSourceRoomConverter::class)
 data class HistoryRoomEntity(
   @PrimaryKey(autoGenerate = true) var id: Long = 0L,
   val zimId: String,
@@ -58,7 +54,7 @@ data class HistoryRoomEntity(
 
 class ZimSourceRoomConverter {
   @TypeConverter
-  fun convertToDatabaseValue(entityProperty: ZimReaderSource?) =
+  fun convertToDatabaseValue(entityProperty: ZimReaderSource?): String =
     entityProperty?.toDatabase() ?: ""
 
   @TypeConverter

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/NotesRoomEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/NotesRoomEntity.kt
@@ -21,7 +21,6 @@ package org.kiwix.kiwixmobile.core.dao.entities
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import io.objectbox.annotation.Convert
 import org.kiwix.kiwixmobile.core.page.notes.adapter.NoteListItem
 import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
 
@@ -31,7 +30,6 @@ data class NotesRoomEntity(
   var id: Long = 0L,
   val zimId: String,
   var zimFilePath: String?, // keep this to handle previously saved notes
-  @Convert(converter = ZimSourceConverter::class, dbType = String::class)
   var zimReaderSource: ZimReaderSource?,
   val zimUrl: String,
   var noteTitle: String,