From 26bbea737773e5f252f34a74be2d58a8c739b61c Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 22 Mar 2022 20:25:39 +0100
Subject: [PATCH] Fix Stocard import getting stuck

---
 .../protect/card_locker/importexport/StocardImporter.java | 2 +-
 .../test/java/protect/card_locker/ImportExportTest.java   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
index d51091986..d3ac1103a 100644
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
@@ -162,7 +162,7 @@ public class StocardImporter implements Importer {
             String cardId = (String) loyaltyCardData.get("cardId");
             String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
             CatimaBarcode barcodeType = null;
-            if (barcodeTypeString != null) {
+            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
                 if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
                     barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
                 } else {
diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java
index f5e3085f5..8627c0af0 100644
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -64,9 +64,6 @@ import static org.robolectric.Shadows.shadowOf;
 public class ImportExportTest {
     private Activity activity;
     private SQLiteDatabase mDatabase;
-    private long nowMs;
-    private long lastYearMs;
-    private final int MONTHS_PER_YEAR = 12;
 
     private final String BARCODE_DATA = "428311627547";
     private final CatimaBarcode BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A);
@@ -77,11 +74,6 @@ public class ImportExportTest {
 
         activity = Robolectric.setupActivity(MainActivity.class);
         mDatabase = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        nowMs = System.currentTimeMillis();
-
-        Calendar lastYear = Calendar.getInstance();
-        lastYear.set(Calendar.YEAR, lastYear.get(Calendar.YEAR) - 1);
-        lastYearMs = lastYear.getTimeInMillis();
     }
 
     /**