Fixed issue: duplicity after importing same zip again

Author: matuspetro

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

@@ -561,6 +561,30 @@ public static LoyaltyCard getLoyaltyCard(Context context, SQLiteDatabase databas
         return card;
     }
 
+    public static List<LoyaltyCard> getLoyaltyCardsByCardId(Context context, SQLiteDatabase database, final String cardId) {
+        List<LoyaltyCard> cards = new ArrayList<>();
+
+        Cursor data = database.query(
+                LoyaltyCardDbIds.TABLE,
+                null,
+                whereAttrs(LoyaltyCardDbIds.CARD_ID),
+                withArgs(cardId),
+                null,
+                null,
+                null
+        );
+
+        if (data.moveToFirst()) {
+            do {
+                LoyaltyCard card = LoyaltyCard.fromCursor(context, data);
+                cards.add(card);
+            } while (data.moveToNext());
+        }
+
+        data.close();
+        return cards;
+    }
+
     public static List<Group> getLoyaltyCardGroups(SQLiteDatabase database, final int id) {
         Cursor data = database.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
                 " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +

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

@@ -582,8 +582,7 @@ public static LoyaltyCard fromCursor(Context context, Cursor cursor) {
     public static boolean isDuplicate(Context context, final LoyaltyCard a, final LoyaltyCard b) {
         // Note: Bitmap comparing is slow, be careful when calling this method
         // Skip lastUsed & zoomLevel*
-        return a.id == b.id && // non-nullable int
-                a.store.equals(b.store) && // non-nullable String
+        return a.store.equals(b.store) && // non-nullable String
                 a.note.equals(b.note) && // non-nullable String
                 Utils.equals(a.validFrom, b.validFrom) && // nullable Date
                 Utils.equals(a.expiry, b.expiry) && // nullable Date

app/src/main/java/protect/card_locker/importexport/CatimaImporter.java

@@ -124,11 +124,17 @@ public Map<Integer, Integer> saveAndDeduplicate(Context context, SQLiteDatabase
         Set<String> existingImages = DBHelper.imageFiles(context, database);
 
         for (LoyaltyCard card : data.cards) {
-            LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
-            if (existing == null) {
-                DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-            } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
+            List<LoyaltyCard> candidates = DBHelper.getLoyaltyCardsByCardId(context, database, card.cardId);
+            boolean duplicateFound = false;
+
+            for (LoyaltyCard existing : candidates) {
+                if (isDuplicate(context, existing, card, existingImages, imageChecksums)) {
+                    duplicateFound = true;
+                    break;
+                }
+            }
+
+            if (!duplicateFound) {
                 long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
                         card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
                 idMap.put(card.id, (int) newId);
@@ -156,14 +162,16 @@ public boolean isDuplicate(Context context, final LoyaltyCard existing, final Lo
             return false;
         }
         for (ImageLocationType imageLocationType : ImageLocationType.values()) {
-            String name = Utils.getCardImageFileName(existing.id, imageLocationType);
-            boolean exists = existingImages.contains(name);
-            if (exists != imageChecksums.containsKey(name)) {
+            String nameExists = Utils.getCardImageFileName(existing.id, imageLocationType);
+            String nameChecksum = nameExists.replaceFirst("card_\\d+_", "card_" + card.id + "_");
+
+            boolean exists = existingImages.contains(nameExists);
+            if (exists != imageChecksums.containsKey(nameChecksum)) {
                 return false;
             }
             if (exists) {
-                File file = Utils.retrieveCardImageAsFile(context, name);
-                if (!imageChecksums.get(name).equals(Utils.checksum(new FileInputStream(file)))) {
+                File file = Utils.retrieveCardImageAsFile(context, nameExists);
+                if (!imageChecksums.get(nameChecksum).equals(Utils.checksum(new FileInputStream(file)))) {
                     return false;
                 }
             }