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

#1323 Bookmarks are not permanent over ZIM files update

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-08-15 16:25:11 +01:00
parent 189e1b4b9f
commit 45d7953f22
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookmarksDao.kt
View File

@ -26,15 +26,13 @@ import org.kiwix.kiwixmobile.database.newdb.entities.BookmarkEntity_
import javax.inject.Inject import javax.inject.Inject
class NewBookmarksDao @Inject constructor(val box: Box<BookmarkEntity>) { class NewBookmarksDao @Inject constructor(val box: Box<BookmarkEntity>) {
fun getBookmarks(fromCurrentBook: Boolean): List<BookmarkItem> { fun getBookmarks(fromCurrentBook: Boolean) = box.query {
return box.query {
if (fromCurrentBook) { if (fromCurrentBook) {
equal(BookmarkEntity_.zimId, ZimContentProvider.getId() ?: "") equal(BookmarkEntity_.zimName, ZimContentProvider.getName() ?: "")
} }
order(BookmarkEntity_.bookmarkTitle) order(BookmarkEntity_.bookmarkTitle)
}.find() }.find()
.map(::BookmarkItem) .map(::BookmarkItem)
}
fun getCurrentZimBookmarksUrl() = box.query { fun getCurrentZimBookmarksUrl() = box.query {
equal(BookmarkEntity_.zimId, ZimContentProvider.getId() ?: "") equal(BookmarkEntity_.zimId, ZimContentProvider.getId() ?: "")