Migrate to new group id - rebase

app/src/main/java/protect/card_locker/DBHelper.java

@@ -21,11 +21,12 @@
 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 = 16;
+    public static final int DATABASE_VERSION = 17;
 
     public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
         public static final String ID = "_id";
+        public static final String NAME = "name";
         public static final String ORDER = "orderId";
     }
 
@@ -87,7 +88,8 @@ public DBHelper(Context context) {
     public void onCreate(SQLiteDatabase db) {
         // create table for card groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
-                LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
+                LoyaltyCardDbGroups.ID + " INTEGER primary key autoincrement," +
+                LoyaltyCardDbGroups.NAME + " TEXT unique not null," +
                 LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
 
         // create table for cards
@@ -112,7 +114,7 @@ public void onCreate(SQLiteDatabase db) {
         // create associative table for cards in groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                 LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
-                LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                LoyaltyCardDbIdsGroups.groupID + " INTEGER," +
                 "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID + "))");
 
         // create FTS search table
@@ -321,6 +323,78 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.VALID_FROM + " INTEGER");
         }
+
+        if (oldVersion < 17 && newVersion >= 17) {
+            // SQLite doesn't support modify column
+            // So we need to create temp columns
+            // https://www.sqlite.org/faq.html#q11
+            db.beginTransaction();
+
+            db.execSQL("CREATE TEMPORARY TABLE tmpDbGroups (" +
+                    LoyaltyCardDbGroups.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbGroups.NAME + " TEXT not null," +
+                    LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO tmpDbGroups (" +
+                    LoyaltyCardDbGroups.NAME + " ," +
+                    LoyaltyCardDbGroups.ORDER + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbGroups.ID + " ," +
+                    LoyaltyCardDbGroups.ORDER +
+                    " FROM " + LoyaltyCardDbGroups.TABLE);
+
+            db.execSQL("DROP TABLE " + LoyaltyCardDbGroups.TABLE);
+
+            db.execSQL("CREATE TEMPORARY TABLE tmpDbIdsGroups (" +
+                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                    LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID + "))");
+
+            db.execSQL("INSERT INTO tmpDbIdsGroups (" +
+                    LoyaltyCardDbIdsGroups.cardID + " ," +
+                    LoyaltyCardDbIdsGroups.groupID + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIdsGroups.cardID + " ," +
+                    LoyaltyCardDbIdsGroups.groupID +
+                    " FROM " + LoyaltyCardDbIdsGroups.TABLE);
+
+            db.execSQL("DROP TABLE " + LoyaltyCardDbIdsGroups.TABLE);
+
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
+                    LoyaltyCardDbGroups.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbGroups.NAME + " TEXT not null," +
+                    LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO " + LoyaltyCardDbGroups.TABLE + "(" +
+                    LoyaltyCardDbGroups.ID + " ," +
+                    LoyaltyCardDbGroups.NAME + " ," +
+                    LoyaltyCardDbGroups.ORDER + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbGroups.ID + " ," +
+                    LoyaltyCardDbGroups.NAME + " ," +
+                    LoyaltyCardDbGroups.ORDER +
+                    " FROM tmpDbGroups");
+
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                    LoyaltyCardDbIdsGroups.groupID + " INTEGER," +
+                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID + "))");
+
+            db.execSQL("INSERT INTO " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                    LoyaltyCardDbIdsGroups.cardID + " ," +
+                    LoyaltyCardDbIdsGroups.groupID + ")" +
+                    " SELECT " +
+                    "idsGroups." + LoyaltyCardDbIdsGroups.cardID + " ," +
+                    "groups." + LoyaltyCardDbGroups.ID +
+                    " FROM tmpDbIdsGroups AS idsGroups JOIN " + LoyaltyCardDbGroups.TABLE + " AS groups ON " +
+                    "idsGroups." + LoyaltyCardDbIdsGroups.groupID + "=" + "groups." + LoyaltyCardDbGroups.NAME);
+
+            db.execSQL("DROP TABLE tmpDbGroups");
+            db.execSQL("DROP TABLE tmpDbIdsGroups");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
     }
 
     private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -534,7 +608,7 @@ public static List<Group> getLoyaltyCardGroups(SQLiteDatabase database, final in
         Cursor data = database.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
                 " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
                 " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
-                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, withArgs(id));
+                " ORDER BY " + LoyaltyCardDbGroups.NAME, withArgs(id));
 
         List<Group> groups = new ArrayList<>();
 
@@ -602,14 +676,14 @@ public static int getArchivedCardsCount(SQLiteDatabase database) {
                 whereAttrs(LoyaltyCardDbIds.ARCHIVE_STATUS), withArgs(1));
     }
 
-    public static int getArchivedCardsCount(SQLiteDatabase database, final String groupName) {
+    public static int getArchivedCardsCount(SQLiteDatabase database, final int groupId) {
         Cursor data = database.rawQuery(
                 "select * from " + LoyaltyCardDbIds.TABLE + " c " +
                         " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " cg " +
                         " ON c." + LoyaltyCardDbIds.ID + " = cg." + LoyaltyCardDbIdsGroups.cardID +
                 " where " + LoyaltyCardDbIds.ARCHIVE_STATUS + " = 1" +
                 " AND " + LoyaltyCardDbIdsGroups.groupID + "= ?",
-                withArgs(groupName)
+                withArgs(groupId)
         );
 
         int count = data.getCount();
@@ -717,7 +791,7 @@ public static int getLoyaltyCardCount(SQLiteDatabase database) {
      */
     public static Cursor getGroupCursor(SQLiteDatabase database) {
         return database.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
+                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.NAME + " ASC", null, null);
     }
 
     public static List<Group> getGroups(SQLiteDatabase database) {
@@ -747,16 +821,29 @@ public static void reorderGroups(SQLiteDatabase database, final List<Group> grou
             contentValues.put(LoyaltyCardDbGroups.ORDER, order);
 
             database.update(LoyaltyCardDbGroups.TABLE, contentValues,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(group._id));
+                    whereAttrs(LoyaltyCardDbGroups.ID), withArgs(group._id));
 
             order++;
         }
     }
 
-    public static Group getGroup(SQLiteDatabase database, final String groupName) {
+    public static Group getGroup(SQLiteDatabase database, final int groupId) {
         Cursor data = database.query(LoyaltyCardDbGroups.TABLE, null,
-                whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupName), null, null, null);
+                whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupId), null, null, null);
+
+        Group group = null;
+        if (data.getCount() == 1) {
+            data.moveToFirst();
+            group = Group.toGroup(data);
+        }
+        data.close();
+
+        return group;
+    }
+
+    public static Group getGroupByName(SQLiteDatabase database, String groupName) {
+        Cursor data = database.query(LoyaltyCardDbGroups.TABLE, null,
+                whereAttrs(LoyaltyCardDbGroups.NAME), withArgs(groupName), null, null, null);
 
         Group group = null;
         if (data.getCount() == 1) {
@@ -772,9 +859,9 @@ public static int getGroupCount(SQLiteDatabase database) {
         return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbGroups.TABLE);
     }
 
-    public static List<Integer> getGroupCardIds(SQLiteDatabase database, final String groupName) {
+    public static List<Integer> getGroupCardIds(SQLiteDatabase database, final int groupId) {
         Cursor data = database.query(LoyaltyCardDbIdsGroups.TABLE, withArgs(LoyaltyCardDbIdsGroups.cardID),
-                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName), null, null, null);
+                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupId), null, null, null);
         List<Integer> cardIds = new ArrayList<>();
 
         if (!data.moveToFirst()) {
@@ -793,36 +880,27 @@ public static List<Integer> getGroupCardIds(SQLiteDatabase database, final Strin
     }
 
     public static long insertGroup(SQLiteDatabase database, final String name) {
-        if (name.isEmpty()) return -1;
+        if (name.isEmpty() || getGroupByName(database, name)!= null) return -1;
 
         ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.NAME, name);
         contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount(database));
         return database.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
     }
 
-    public static boolean updateGroup(SQLiteDatabase database, final String groupName, final String newName) {
-        if (newName.isEmpty()) return false;
+    public static boolean updateGroup(SQLiteDatabase database, final int groupId, final String newName) {
+        if (newName.isEmpty() || getGroupByName(database, newName)!= null) return false;
 
         boolean success = false;
 
         ContentValues groupContentValues = new ContentValues();
-        groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
-
-        ContentValues lookupContentValues = new ContentValues();
-        lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
+        groupContentValues.put(LoyaltyCardDbGroups.NAME, newName);
 
         database.beginTransaction();
         try {
             // Update group name
             int groupsChanged = database.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(groupName));
-
-            // Also update lookup tables
-            database.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
-                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
-                    withArgs(groupName));
+                    whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupId));
 
             if (groupsChanged == 1) {
                 database.setTransactionSuccessful();
@@ -836,20 +914,18 @@ public static boolean updateGroup(SQLiteDatabase database, final String groupNam
         return success;
     }
 
-    public static boolean deleteGroup(SQLiteDatabase database, final String groupName) {
+    public static boolean deleteGroup(SQLiteDatabase database, final int groupId) {
         boolean success = false;
 
         database.beginTransaction();
         try {
             // Delete group
             int groupsDeleted = database.delete(LoyaltyCardDbGroups.TABLE,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(groupName));
+                    whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupId));
 
             // And delete lookup table entries associated with this group
             database.delete(LoyaltyCardDbIdsGroups.TABLE,
-                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
-                    withArgs(groupName));
+                    whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupId));
 
             if (groupsDeleted == 1) {
                 database.setTransactionSuccessful();
@@ -865,9 +941,9 @@ public static boolean deleteGroup(SQLiteDatabase database, final String groupNam
         return success;
     }
 
-    public static int getGroupCardCount(SQLiteDatabase database, final String groupName) {
+    public static int getGroupCardCount(SQLiteDatabase database, final int groupId) {
         return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName));
+                whereAttrs(LoyaltyCardDbIdsGroups.groupID),withArgs(groupId));
     }
 
     static private String whereAttrs(String... attrs) {

app/src/main/java/protect/card_locker/Group.java

@@ -5,36 +5,21 @@
 import androidx.annotation.Nullable;
 
 public class Group {
-    public final String _id;
+    public final int _id;
+    public final String name;
     public final int order;
 
-    public Group(final String _id, final int order) {
+    public Group(final int _id, final String name, final int order) {
         this._id = _id;
+        this.name = name;
         this.order = order;
     }
 
     public static Group toGroup(Cursor cursor) {
-        String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+        int _id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+        String name = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.NAME));
         int order = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ORDER));
 
-        return new Group(_id, order);
-    }
-
-    @Override
-    public boolean equals(@Nullable Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof Group)) {
-            return false;
-        }
-        Group anotherGroup = (Group) obj;
-        return _id.equals(anotherGroup._id) && order == anotherGroup.order;
-    }
-
-    @Override
-    public int hashCode() {
-        String combined = _id + "_" + order;
-        return combined.hashCode();
+        return new Group(_id, name, order);
     }
 }

app/src/main/java/protect/card_locker/GroupCursorAdapter.java

@@ -48,7 +48,7 @@ public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(@NonNull Vi
     public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCursor) {
         Group group = Group.toGroup(inputCursor);
 
-        inputHolder.mName.setText(group._id);
+        inputHolder.mName.setText(group.name);
 
         int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
         int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id);

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -157,7 +157,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     String cardId;
     String barcodeId;
     String barcodeType;
-    String addGroup;
+    Integer addGroup;
 
     Uri importLoyaltyCardUri = null;
 
@@ -245,7 +245,7 @@ private void extractIntentFields(Intent intent) {
         cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
         barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
         barcodeType = b != null ? b.getString(BUNDLE_BARCODETYPE) : null;
-        addGroup = b != null ? b.getString(BUNDLE_ADDGROUP) : null;
+        addGroup = b != null ? b.getInt(BUNDLE_ADDGROUP) : null;
 
         importLoyaltyCardUri = intent.getData();
 
@@ -820,15 +820,15 @@ public void onResume() {
                 LayoutChipChoiceBinding chipChoiceBinding = LayoutChipChoiceBinding
                         .inflate(LayoutInflater.from(groupsChips.getContext()), groupsChips, false);
                 Chip chip = chipChoiceBinding.getRoot();
-                chip.setText(group._id);
+                chip.setText(group.name);
                 chip.setTag(group);
 
-                if (group._id.equals(addGroup)) {
+                if (group._id == addGroup) {
                     chip.setChecked(true);
                 } else {
                     chip.setChecked(false);
                     for (Group loyaltyCardGroup : loyaltyCardGroups) {
-                        if (loyaltyCardGroup._id.equals(group._id)) {
+                        if (loyaltyCardGroup._id == group._id) {
                             chip.setChecked(true);
                             break;
                         }

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -516,7 +516,7 @@ private void showInfoDialog() {
         if (loyaltyCardGroups.size() > 0) {
             List<String> groupNames = new ArrayList<>();
             for (Group group : loyaltyCardGroups) {
-                groupNames.add(group._id);
+                groupNames.add(group.name);
             }
 
             padSpannableString(infoText);