mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-02 14:51:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Stocard import getting stuck

Browse Source
This commit is contained in:
Sylvia van Os
2022-03-22 20:25:39 +01:00
parent 50385c6e0e
commit 26bbea7377
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/protect/card_locker/importexport/StocardImporter.java
View File

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

8
app/src/test/java/protect/card_locker/ImportExportTest.java
View File

@@ -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();
}
/**