From 4b6f4cb0db344a84a41e388f657dcf7b27b8c19a Mon Sep 17 00:00:00 2001 From: MohitMali Date: Fri, 20 May 2022 14:58:29 +0530 Subject: [PATCH] fixing merging issue with develop --- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../core/dao/entities/BookmarkEntity.kt | 8 ++++---- .../core/dao/entities/RecentSearchEntity.kt | 4 ++-- .../core/data/local/KiwixDatabase.java | 15 ++++++++++++--- .../kiwixmobile/core/data/local/dao/BookDao.java | 7 +++++-- .../core/data/local/dao/BookmarksDao.java | 16 +++++++++++----- .../core/data/local/dao/NetworkLanguageDao.java | 9 ++++++--- .../core/data/local/dao/RecentSearchDao.java | 7 +++++-- .../core/data/local/entity/BookmarksSpec.java | 2 -- .../core/data/local/entity/RecentSearchSpec.java | 5 ----- lintConfig.xml | 5 +---- 11 files changed, 47 insertions(+), 33 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c4db2fe27..ff73480f0 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -28,7 +28,7 @@ object Versions { const val com_google_dagger: String = "2.29.1" - const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3" + const val com_yahoo_squidb: String = "4.0.0-beta.2" // available: "3.2.3" const val com_jakewharton: String = "10.2.3" diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookmarkEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookmarkEntity.kt index 31ef33df7..e552dfb01 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookmarkEntity.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/BookmarkEntity.kt @@ -44,11 +44,11 @@ data class BookmarkEntity( private constructor(bookmark: Bookmark, zimFilePath: String?, favicon: String?) : this( 0, - bookmark.zimId, - bookmark.zimName, + bookmark.zimId!!, + bookmark.zimName!!, zimFilePath, - bookmark.bookmarkUrl, - bookmark.bookmarkTitle, + bookmark.bookmarkUrl!!, + bookmark.bookmarkTitle!!, favicon ) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/RecentSearchEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/RecentSearchEntity.kt index e36d84450..4855b3666 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/RecentSearchEntity.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/RecentSearchEntity.kt @@ -30,7 +30,7 @@ data class RecentSearchEntity( constructor(recentSearch: RecentSearch) : this( 0, - recentSearch.searchString, - recentSearch.zimID + recentSearch.searchString!!, + recentSearch.zimID!! ) } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/KiwixDatabase.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/KiwixDatabase.java index 5a0c4d43c..5e73075c0 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/KiwixDatabase.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/KiwixDatabase.java @@ -20,8 +20,11 @@ package org.kiwix.kiwixmobile.core.data.local; import android.content.Context; import android.util.Log; +import androidx.annotation.NonNull; +import com.yahoo.squidb.android.AndroidOpenHelper; +import com.yahoo.squidb.data.ISQLiteDatabase; +import com.yahoo.squidb.data.ISQLiteOpenHelper; import com.yahoo.squidb.data.SquidDatabase; -import com.yahoo.squidb.data.adapter.SQLiteDatabaseWrapper; import com.yahoo.squidb.sql.Table; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -63,7 +66,7 @@ public class KiwixDatabase extends SquidDatabase { public KiwixDatabase(Context context, NewBookDao bookDao, NewLanguagesDao languagesDao, NewBookmarksDao bookmarksDao, NewRecentSearchDao recentSearchDao) { - super(context); + super(); this.context = context; this.bookDao = bookDao; this.languagesDao = languagesDao; @@ -86,8 +89,14 @@ public class KiwixDatabase extends SquidDatabase { }; } + @NonNull @Override protected ISQLiteOpenHelper createOpenHelper( + @NonNull String databaseName, + @NonNull OpenHelperDelegate delegate, int version) { + return new AndroidOpenHelper(context, getName(), delegate, getVersion()); + } + @Override - protected boolean onUpgrade(SQLiteDatabaseWrapper db, int oldVersion, int newVersion) { + protected boolean onUpgrade(ISQLiteDatabase db, int oldVersion, int newVersion) { Log.e("UPGRADE", "oldversion: " + oldVersion + " newVersion: " + newVersion); switch (oldVersion) { case 1: diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookDao.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookDao.java index f5f8f9dd9..63d0f1754 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookDao.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookDao.java @@ -58,13 +58,16 @@ public class BookDao { public ArrayList getBooks() { ArrayList books = new ArrayList<>(); - try (SquidCursor bookCursor = kiwixDatabase.query(BookDatabaseEntity.class, - Query.select())) { + try { + SquidCursor bookCursor = kiwixDatabase.query(BookDatabaseEntity.class, + Query.select()); while (bookCursor.moveToNext()) { Book book = new Book(); setBookDetails(book, bookCursor); books.add(book); } + } catch (Exception exception) { + exception.printStackTrace(); } return filterBookResults(books); } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.java index 4dd020e65..d3e652546 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/BookmarksDao.java @@ -42,8 +42,9 @@ public class BookmarksDao { public List getBookmarks() { ArrayList bookmarks = new ArrayList<>(); Query query = Query.select(); - try (SquidCursor squidCursor = kiwixDatabase - .query(Bookmark.class, query.orderBy(Bookmark.BOOKMARK_TITLE.asc()))) { + try { + SquidCursor squidCursor = kiwixDatabase + .query(Bookmark.class, query.orderBy(Bookmark.BOOKMARK_TITLE.asc())); while (squidCursor.moveToNext()) { Bookmark bookmark = new Bookmark(); bookmark.setZimId(squidCursor.get(Bookmark.ZIM_ID)); @@ -52,22 +53,27 @@ public class BookmarksDao { bookmark.setBookmarkUrl(squidCursor.get(Bookmark.BOOKMARK_URL)); bookmarks.add(bookmark); } + } catch (Exception exception) { + exception.printStackTrace(); } return bookmarks; } public void processBookmark(StringOperation operation) { - try (SquidCursor bookmarkCursor = kiwixDatabase.query(Bookmark.class, - Query.select(Bookmark.ID, Bookmark.BOOKMARK_URL))) { + try { + SquidCursor bookmarkCursor = kiwixDatabase.query(Bookmark.class, + Query.select(Bookmark.ROWID, Bookmark.BOOKMARK_URL)); while (bookmarkCursor.moveToNext()) { String url = bookmarkCursor.get(Bookmark.BOOKMARK_URL); url = operation.apply(url); if (url != null) { kiwixDatabase.update(Update.table(Bookmark.TABLE) - .where(Bookmark.ID.eq(bookmarkCursor.get(Bookmark.ID))) + .where(Bookmark.ROWID.eq(bookmarkCursor.get(Bookmark.ROWID))) .set(Bookmark.BOOKMARK_URL, url)); } } + } catch (Exception exception) { + exception.printStackTrace(); } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/NetworkLanguageDao.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/NetworkLanguageDao.java index 9367628ca..b5a53d114 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/NetworkLanguageDao.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/NetworkLanguageDao.java @@ -37,14 +37,17 @@ public class NetworkLanguageDao { public ArrayList getFilteredLanguages() { ArrayList result = new ArrayList<>(); - try (SquidCursor languageCursor = mDb.query( - NetworkLanguageDatabaseEntity.class, - Query.select())) { + try { + SquidCursor languageCursor = mDb.query( + NetworkLanguageDatabaseEntity.class, + Query.select()); while (languageCursor.moveToNext()) { String languageCode = languageCursor.get(NetworkLanguageDatabaseEntity.LANGUAGE_I_S_O_3); boolean enabled = languageCursor.get(NetworkLanguageDatabaseEntity.ENABLED); result.add(new Language(languageCode, enabled, 0)); } + } catch (Exception exception) { + exception.printStackTrace(); } return result; } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/RecentSearchDao.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/RecentSearchDao.java index 28ff62320..53fc78439 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/RecentSearchDao.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/dao/RecentSearchDao.java @@ -44,11 +44,14 @@ public class RecentSearchDao { */ public List getRecentSearches() { List result = new ArrayList<>(); - try (SquidCursor searchCursor = mDb.query( - RecentSearch.class, Query.select())) { + try { + SquidCursor searchCursor = mDb.query( + RecentSearch.class, Query.select()); while (searchCursor.moveToNext()) { result.add(new RecentSearch(searchCursor)); } + } catch (Exception exception) { + exception.printStackTrace(); } return result; } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/BookmarksSpec.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/BookmarksSpec.java index 0ed8f9d47..1ddf25eb0 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/BookmarksSpec.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/BookmarksSpec.java @@ -17,7 +17,6 @@ */ package org.kiwix.kiwixmobile.core.data.local.entity; -import com.yahoo.squidb.annotations.ColumnSpec; import com.yahoo.squidb.annotations.TableModelSpec; /** @@ -25,7 +24,6 @@ import com.yahoo.squidb.annotations.TableModelSpec; */ @TableModelSpec(className = "Bookmark", tableName = "Bookmarks") public class BookmarksSpec { - @ColumnSpec(constraints = "NOT NULL") public String ZimId; public String ZimName; public String bookmarkUrl; diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/RecentSearchSpec.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/RecentSearchSpec.java index c535ba718..954b0b480 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/RecentSearchSpec.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/local/entity/RecentSearchSpec.java @@ -17,7 +17,6 @@ */ package org.kiwix.kiwixmobile.core.data.local.entity; -import com.yahoo.squidb.annotations.ColumnSpec; import com.yahoo.squidb.annotations.TableModelSpec; /** @@ -25,10 +24,6 @@ import com.yahoo.squidb.annotations.TableModelSpec; */ @TableModelSpec(className = "RecentSearch", tableName = "recentSearches") public class RecentSearchSpec { - - @ColumnSpec(constraints = "NOT NULL") public String searchString; - - @ColumnSpec(constraints = "NOT NULL") public String zimID; } diff --git a/lintConfig.xml b/lintConfig.xml index 1bfd165ce..40d40b41b 100644 --- a/lintConfig.xml +++ b/lintConfig.xml @@ -28,11 +28,9 @@ - - - + @@ -41,5 +39,4 @@ -