mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-07 21:52:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

LoyaltyCard: fix isDuplicate()

Browse Source
This commit is contained in:
FC Stegerman
2023-07-16 04:43:27 +02:00
parent 84d7e15b5c
commit 901c2d8154
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/protect/card_locker/LoyaltyCard.java
View File

@@ -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