From 901c2d815451d6b08c96350efa6fccf570ea203e Mon Sep 17 00:00:00 2001 From: FC Stegerman Date: Sun, 16 Jul 2023 04:43:27 +0200 Subject: [PATCH] LoyaltyCard: fix isDuplicate() --- app/src/main/java/protect/card_locker/LoyaltyCard.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCard.java b/app/src/main/java/protect/card_locker/LoyaltyCard.java index cd4f0e26a..6b7075069 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCard.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java @@ -144,12 +144,12 @@ public class LoyaltyCard implements Parcelable { } public static boolean isDuplicate(final LoyaltyCard a, final LoyaltyCard b) { - // Skip lastUsed + // Skip lastUsed & zoomLevel return a.id == b.id && a.store.equals(b.store) && a.note.equals(b.note) && Utils.equals(a.validFrom, b.validFrom) && Utils.equals(a.expiry, b.expiry) && a.balance.equals(b.balance) && Utils.equals(a.balanceType, b.balanceType) - && a.cardId.equals(b.cardId) && Utils.equals(a.barcodeId, b.barcodeId) && Utils.equals(a.barcodeType, b.barcodeType) - && Utils.equals(a.headerColor, b.headerColor) && a.starStatus == b.starStatus && a.zoomLevel == b.zoomLevel - && a.archiveStatus == b.archiveStatus; + && a.cardId.equals(b.cardId) && Utils.equals(a.barcodeId, b.barcodeId) + && Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(), b.barcodeType == null ? null : b.barcodeType.format()) + && Utils.equals(a.headerColor, b.headerColor) && a.starStatus == b.starStatus && a.archiveStatus == b.archiveStatus; } @Override