From 45d7953f22e4114debc4c843eb8fa8013ac2c5cf Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Thu, 15 Aug 2019 16:25:11 +0100 Subject: [PATCH] #1323 Bookmarks are not permanent over ZIM files update --- .../database/newdb/dao/NewBookmarksDao.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookmarksDao.kt b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookmarksDao.kt index 0025aa5dd..735c1109f 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookmarksDao.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookmarksDao.kt @@ -26,15 +26,13 @@ import org.kiwix.kiwixmobile.database.newdb.entities.BookmarkEntity_ import javax.inject.Inject class NewBookmarksDao @Inject constructor(val box: Box) { - fun getBookmarks(fromCurrentBook: Boolean): List { - return box.query { - if (fromCurrentBook) { - equal(BookmarkEntity_.zimId, ZimContentProvider.getId() ?: "") - } - order(BookmarkEntity_.bookmarkTitle) - }.find() - .map(::BookmarkItem) - } + fun getBookmarks(fromCurrentBook: Boolean) = box.query { + if (fromCurrentBook) { + equal(BookmarkEntity_.zimName, ZimContentProvider.getName() ?: "") + } + order(BookmarkEntity_.bookmarkTitle) + }.find() + .map(::BookmarkItem) fun getCurrentZimBookmarksUrl() = box.query { equal(BookmarkEntity_.zimId, ZimContentProvider.getId() ?: "")