diff --git a/CHANGELOG.md b/CHANGELOG.md index 822266013..c4581c6d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Add Monochrome icon for Android 13 - Improve first launch screen - Move archive info from overflow menu to bottom of card list +- Fidme import fixes ## v2.19.0 - 113 diff --git a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java index 296b380f5..62ab8c464 100644 --- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java +++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java @@ -110,7 +110,10 @@ public class FidmeImporter implements Importer { // The ID is called reference String cardId = CSVHelpers.extractString("Reference", record, ""); if (cardId.isEmpty()) { - throw new FormatException("No card ID listed, but is required"); + // Fidme deletes the card id if a card is expired + // Because Catima considers the card id a required field, we ignore these expired cards + // https://github.com/CatimaLoyalty/Android/issues/1005 + return; } // Sadly, Fidme exports don't contain the card type diff --git a/app/src/test/res/protect/card_locker/fidme.zip b/app/src/test/res/protect/card_locker/fidme.zip index 0308e7474..c06d6b210 100644 Binary files a/app/src/test/res/protect/card_locker/fidme.zip and b/app/src/test/res/protect/card_locker/fidme.zip differ