kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-11 16:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3757 from kiwix/Fix#3756

Browse Source 
Fixed: Migration of bookmarks is not working with recent versions of custom apps.
This commit is contained in:
Kelson 2024-03-19 20:27:19 +01:00 committed by GitHub
commit d4a3db11ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/ObjectBoxToLibkiwixMigrator.kt
View File

@ -55,15 +55,22 @@ class ObjectBoxToLibkiwixMigrator {
try { try {
// for saving book to library, otherwise it does not save the // for saving book to library, otherwise it does not save the
// favicon and zimFilePath in library. // favicon and zimFilePath in library.
val archive = Archive(bookmarkEntity.zimFilePath) var archive: Archive? = null
val libkiwixBook = Book().apply { val libkiwixBook = bookmarkEntity.zimFilePath?.let {
update(archive) archive = Archive(bookmarkEntity.zimFilePath)
Book().apply {
update(archive)
}
} ?: kotlin.run {
// for migrating bookmarks for recent custom apps since in recent version of
// custom app we are using the `assetFileDescriptor` which does not have the filePath.
null
} }
libkiwixBookmarks.saveBookmark( libkiwixBookmarks.saveBookmark(
LibkiwixBookmarkItem(bookmarkEntity, libkiwixBook), LibkiwixBookmarkItem(bookmarkEntity, libkiwixBook),
shouldWriteBookmarkToFile = index == bookMarksList.size - 1 shouldWriteBookmarkToFile = index == bookMarksList.size - 1
) )
archive.dispose() archive?.dispose()
// TODO should we remove data from objectBox? // TODO should we remove data from objectBox?
// removing the single entity from the object box after migration. // removing the single entity from the object box after migration.
// box.query { // box.query {

2
core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/adapter/LibkiwixBookmarkItem.kt
View File

@ -68,7 +68,7 @@ data class LibkiwixBookmarkItem(
constructor( constructor(
bookmarkEntity: BookmarkEntity, bookmarkEntity: BookmarkEntity,
libkiwixBook: Book libkiwixBook: Book?
) : this( ) : this(
zimId = bookmarkEntity.zimId, zimId = bookmarkEntity.zimId,
zimFilePath = bookmarkEntity.zimFilePath, zimFilePath = bookmarkEntity.zimFilePath,