diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd053e12..c52cff790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v2.7.3 - 88 (2021-10-10) + +- Fix incorrect migration making first card become invisible + ## v2.7.2 - 87 (2021-10-09) - Fix regression breaking import/export diff --git a/app/build.gradle b/app/build.gradle index 13daae009..e7257e7f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "me.hackerchick.catima" minSdkVersion 21 targetSdkVersion 31 - versionCode 87 - versionName "2.7.2" + versionCode 88 + versionName "2.7.3" vectorDrawables.useSupportLibrary true multiDexEnabled true diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java index d7fc4569d..71bdc310b 100644 --- a/app/src/main/java/protect/card_locker/DBHelper.java +++ b/app/src/main/java/protect/card_locker/DBHelper.java @@ -21,7 +21,7 @@ public class DBHelper extends SQLiteOpenHelper { public static final String DATABASE_NAME = "Catima.db"; public static final int ORIGINAL_DATABASE_VERSION = 1; - public static final int DATABASE_VERSION = 12; + public static final int DATABASE_VERSION = 13; public static class LoyaltyCardDbGroups { @@ -294,6 +294,24 @@ public class DBHelper extends SQLiteOpenHelper insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note); } } + + if(oldVersion < 13 && newVersion >= 13) + { + db.execSQL("DELETE FROM " + LoyaltyCardDbFTS.TABLE + ";"); + + Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null); + + if (cursor.moveToFirst()) { + LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor); + insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note); + + while (cursor.moveToNext()) { + loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor); + insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note); + } + } + cursor.close(); + } } private ContentValues generateFTSContentValues(final int id, final String store, final String note) {