mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-01 10:42:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Consistent barcode naming

Browse Source
This commit is contained in:
Sylvia van Os
2021-09-10 00:49:06 +02:00
parent 61b1317fc5
commit 6f1dc74f66
20 changed files with 226 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
View File

@@ -38,14 +38,14 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
private final WeakReference<ImageView> imageViewReference;
private final WeakReference<TextView> textViewReference;
private String cardId;
private final BarcodeFormat format;
private final CatimaBarcode format;
private final int imageHeight;
private final int imageWidth;
private final boolean showFallback;
private final Runnable callback;
BarcodeImageWriterTask(Context context, ImageView imageView, String cardIdString,
BarcodeFormat barcodeFormat, TextView textView,
CatimaBarcode barcodeFormat, TextView textView,
boolean showFallback, Runnable callback)
{
mContext = context;
@@ -78,9 +78,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
this.showFallback = showFallback;
}
private int getMaxWidth(BarcodeFormat format)
private int getMaxWidth(CatimaBarcode format)
{
switch(format)
switch(format.format())
{
// 2D barcodes
case AZTEC:
@@ -108,9 +108,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
}
}
private String getFallbackString(BarcodeFormat format)
private String getFallbackString(CatimaBarcode format)
{
switch(format)
switch(format.format())
{
// 2D barcodes
case AZTEC:
@@ -157,7 +157,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
{
try
{
bitMatrix = writer.encode(cardId, format, imageWidth, imageHeight, null);
bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
}
catch(Exception e)
{
@@ -247,7 +247,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
return;
}
String formatPrettyName = format.name().replace("_", " ");
String formatPrettyName = format.prettyName();
imageView.setTag(isSuccesful);

21
app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
View File

@@ -40,25 +40,6 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
public static final String BARCODE_CONTENTS = "contents";
public static final String BARCODE_FORMAT = "format";
// These are all the barcode types that the zxing library
// is able to generate a barcode for, and thus should be
// the only barcodes which we should attempt to scan.
public static final Collection<String> SUPPORTED_BARCODE_TYPES = Collections.unmodifiableList(
Arrays.asList(
BarcodeFormat.AZTEC.name(),
BarcodeFormat.CODE_39.name(),
BarcodeFormat.CODE_128.name(),
BarcodeFormat.CODABAR.name(),
BarcodeFormat.DATA_MATRIX.name(),
BarcodeFormat.EAN_8.name(),
BarcodeFormat.EAN_13.name(),
BarcodeFormat.ITF.name(),
BarcodeFormat.PDF_417.name(),
BarcodeFormat.QR_CODE.name(),
BarcodeFormat.UPC_A.name(),
BarcodeFormat.UPC_E.name()
));
private Map<String, Pair<Integer, Integer>> barcodeViewMap;
private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
@@ -151,7 +132,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
{
final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
final CatimaBarcode format = CatimaBarcode.fromName(formatType);
if(format == null)
{
Log.w(TAG, "Unsupported barcode format: " + formatType);

76
app/src/main/java/protect/card_locker/CatimaBarcode.java Normal file
View File

@@ -0,0 +1,76 @@
package protect.card_locker;
import com.google.zxing.BarcodeFormat;
import java.util.Arrays;
import java.util.List;
public class CatimaBarcode {
public static final List<BarcodeFormat> barcodeFormats = Arrays.asList(
BarcodeFormat.AZTEC,
BarcodeFormat.CODE_39,
BarcodeFormat.CODE_128,
BarcodeFormat.CODABAR,
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.EAN_8,
BarcodeFormat.EAN_13,
BarcodeFormat.ITF,
BarcodeFormat.PDF_417,
BarcodeFormat.QR_CODE,
BarcodeFormat.UPC_A,
BarcodeFormat.UPC_E
);
public static final List<String> barcodePrettyNames = Arrays.asList(
"Aztec",
"Code 39",
"Code 128",
"Codabar",
"Data Matrix",
"EAN 8",
"EAN 13",
"ITF",
"PDF 417",
"QR Code",
"UPC A",
"UPC E"
);
private final BarcodeFormat mBarcodeFormat;
private CatimaBarcode(BarcodeFormat barcodeFormat) {
mBarcodeFormat = barcodeFormat;
}
public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
return new CatimaBarcode(barcodeFormat);
}
public static CatimaBarcode fromName(String name) {
return new CatimaBarcode(BarcodeFormat.valueOf(name));
}
public static CatimaBarcode fromPrettyName(String prettyName) {
try {
return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
} catch (IndexOutOfBoundsException e) {
throw new IllegalArgumentException("No barcode type with pretty name " + prettyName + " known!");
}
}
public boolean isSupported() {
return barcodeFormats.contains(mBarcodeFormat);
}
public BarcodeFormat format() {
return mBarcodeFormat;
}
public String name() {
return mBarcodeFormat.name();
}
public String prettyName() {
return barcodePrettyNames.get(barcodeFormats.indexOf(mBarcodeFormat));
}
}

18
app/src/main/java/protect/card_locker/DBHelper.java
View File

@@ -8,8 +8,6 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import com.google.zxing.BarcodeFormat;
import java.io.FileNotFoundException;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -257,7 +255,7 @@ public class DBHelper extends SQLiteOpenHelper
public long insertLoyaltyCard(final String store, final String note, final Date expiry,
final BigDecimal balance, final Currency balanceType,
final String cardId, final String barcodeId,
final BarcodeFormat barcodeType, final Integer headerColor,
final CatimaBarcode barcodeType, final Integer headerColor,
final int starStatus)
{
SQLiteDatabase db = getWritableDatabase();
@@ -269,7 +267,7 @@ public class DBHelper extends SQLiteOpenHelper
contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
@@ -278,7 +276,7 @@ public class DBHelper extends SQLiteOpenHelper
public long insertLoyaltyCard(final SQLiteDatabase db, final String store,
final String note, final Date expiry, final BigDecimal balance,
final Currency balanceType, final String cardId,
final String barcodeId, final BarcodeFormat barcodeType,
final String barcodeId, final CatimaBarcode barcodeType,
final Integer headerColor, final int starStatus)
{
ContentValues contentValues = new ContentValues();
@@ -289,7 +287,7 @@ public class DBHelper extends SQLiteOpenHelper
contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
@@ -298,7 +296,7 @@ public class DBHelper extends SQLiteOpenHelper
public long insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
final String note, final Date expiry, final BigDecimal balance,
final Currency balanceType, final String cardId,
final String barcodeId, final BarcodeFormat barcodeType,
final String barcodeId, final CatimaBarcode barcodeType,
final Integer headerColor, final int starStatus)
{
ContentValues contentValues = new ContentValues();
@@ -310,7 +308,7 @@ public class DBHelper extends SQLiteOpenHelper
contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
@@ -319,7 +317,7 @@ public class DBHelper extends SQLiteOpenHelper
public boolean updateLoyaltyCard(final int id, final String store, final String note,
final Date expiry, final BigDecimal balance,
final Currency balanceType, final String cardId,
final String barcodeId, final BarcodeFormat barcodeType,
final String barcodeId, final CatimaBarcode barcodeType,
final Integer headerColor)
{
SQLiteDatabase db = getWritableDatabase();
@@ -331,7 +329,7 @@ public class DBHelper extends SQLiteOpenHelper
contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));

6
app/src/main/java/protect/card_locker/ImportURIHelper.java
View File

@@ -63,7 +63,7 @@ public class ImportURIHelper {
try {
// These values are allowed to be null
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
Date expiry = null;
BigDecimal balance = new BigDecimal("0");
Currency balanceType = null;
@@ -97,7 +97,7 @@ public class ImportURIHelper {
String unparsedBarcodeType = kv.get(BARCODE_TYPE);
if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
{
barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
}
String unparsedBalance = kv.get(BALANCE);
@@ -164,7 +164,7 @@ public class ImportURIHelper {
}
if(loyaltyCard.barcodeType != null) {
fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.toString());
fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
}
if(loyaltyCard.headerColor != null) {
fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());

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

@@ -25,7 +25,7 @@ public class LoyaltyCard implements Parcelable {
public final String barcodeId;
@Nullable
public final BarcodeFormat barcodeType;
public final CatimaBarcode barcodeType;
@Nullable
public final Integer headerColor;
@@ -34,7 +34,7 @@ public class LoyaltyCard implements Parcelable {
public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
final BigDecimal balance, final Currency balanceType, final String cardId,
@Nullable final String barcodeId, @Nullable final BarcodeFormat barcodeType, @Nullable final Integer headerColor,
@Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType, @Nullable final Integer headerColor,
final int starStatus)
{
this.id = id;
@@ -61,7 +61,7 @@ public class LoyaltyCard implements Parcelable {
cardId = in.readString();
barcodeId = in.readString();
String tmpBarcodeType = in.readString();
barcodeType = !tmpBarcodeType.isEmpty() ? BarcodeFormat.valueOf(tmpBarcodeType) : null;
barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
int tmpHeaderColor = in.readInt();
headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
starStatus = in.readInt();
@@ -77,7 +77,7 @@ public class LoyaltyCard implements Parcelable {
parcel.writeValue(balanceType);
parcel.writeString(cardId);
parcel.writeString(barcodeId);
parcel.writeString(barcodeType != null ? barcodeType.toString() : "");
parcel.writeString(barcodeType != null ? barcodeType.name() : "");
parcel.writeInt(headerColor != null ? headerColor : -1);
parcel.writeInt(starStatus);
}
@@ -97,14 +97,14 @@ public class LoyaltyCard implements Parcelable {
int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
Currency balanceType = null;
Date expiry = null;
Integer headerColor = null;
if (cursor.isNull(barcodeTypeColumn) == false)
{
barcodeType = BarcodeFormat.valueOf(cursor.getString(barcodeTypeColumn));
barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
}
if (cursor.isNull(balanceTypeColumn) == false)

18
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -150,7 +150,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
(Currency) (fieldName == LoyaltyCardField.balanceType ? value : loyaltyCard.balanceType),
(String) (fieldName == LoyaltyCardField.cardId ? value : loyaltyCard.cardId),
(String) (fieldName == LoyaltyCardField.barcodeId ? value : loyaltyCard.barcodeId),
(BarcodeFormat) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
(CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
(Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
(int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus)
);
@@ -462,11 +462,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
updateTempState(LoyaltyCardField.barcodeType, null);
} else {
try {
BarcodeFormat barcodeFormat = BarcodeFormat.valueOf(s.toString());
CatimaBarcode barcodeFormat = CatimaBarcode.fromPrettyName(s.toString());
updateTempState(LoyaltyCardField.barcodeType, barcodeFormat);
if (!BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
if (!barcodeFormat.isSupported()) {
Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
}
} catch (IllegalArgumentException e) {}
@@ -478,7 +478,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
@Override
public void afterTextChanged(Editable s) {
ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
ArrayList<String> barcodeList = new ArrayList<>(CatimaBarcode.barcodePrettyNames);
barcodeList.add(0, getString(R.string.noBarcode));
ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeList);
barcodeTypeField.setAdapter(barcodeAdapter);
@@ -560,7 +560,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
cardIdFieldView.setText(tempLoyaltyCard.cardId);
barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.name() : getString(R.string.noBarcode));
barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.prettyName() : getString(R.string.noBarcode));
if(groupsChips.getChildCount() == 0)
{
@@ -620,7 +620,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
// Update from intent
if (barcodeType != null) {
try {
barcodeTypeField.setText(BarcodeFormat.valueOf(barcodeType).name());
barcodeTypeField.setText(CatimaBarcode.fromName(barcodeType).prettyName());
} catch (IllegalArgumentException e) {
barcodeTypeField.setText(getString(R.string.noBarcode));
}
@@ -1126,16 +1126,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity
private void generateOrHideBarcode() {
String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
BarcodeFormat barcodeFormat = tempLoyaltyCard.barcodeType;
CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
if (barcodeFormat == null || cardIdString.isEmpty() || !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
hideBarcode();
} else {
generateBarcode(cardIdString, barcodeFormat);
}
}
private void generateBarcode(String cardIdString, BarcodeFormat barcodeFormat) {
private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
if (barcodeImage.getHeight() == 0) {
Log.d(TAG, "ImageView size is not known known at start, waiting for load");
// The size of the ImageView is not yet available as it has not

4
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -80,7 +80,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
String cardIdString;
String barcodeIdString;
BarcodeFormat format;
CatimaBarcode format;
FloatingActionButton editButton;
@@ -538,7 +538,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
// Set shadow colour of store text so even same color on same color would be readable
storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
if (format != null && !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(format.name())) {
if (format != null && !format.isSupported()) {
isBarcodeSupported = false;
Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();

2
app/src/main/java/protect/card_locker/ScanActivity.java
View File

@@ -81,7 +81,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
Intent scanResult = new Intent();
Bundle scanResultBundle = new Bundle();
scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().toString());
scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
if (addGroup != null) {
scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
}

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

@@ -143,7 +143,7 @@ public class CatimaExporter implements Exporter
card.balanceType,
card.cardId,
card.barcodeId,
card.barcodeType,
card.barcodeType != null ? card.barcodeType.name() : "",
card.headerColor,
card.starStatus);

5
app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
View File

@@ -27,6 +27,7 @@ import java.util.Currency;
import java.util.Date;
import java.util.List;
import protect.card_locker.CatimaBarcode;
import protect.card_locker.DBHelper;
import protect.card_locker.FormatException;
import protect.card_locker.Group;
@@ -331,11 +332,11 @@ public class CatimaImporter implements Importer
barcodeId = null;
}
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
if(!unparsedBarcodeType.isEmpty())
{
barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
}
Integer headerColor = null;

3
app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
View File

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import protect.card_locker.CatimaBarcode;
import protect.card_locker.DBHelper;
import protect.card_locker.FormatException;
@@ -127,7 +128,7 @@ public class FidmeImporter implements Importer
// Sadly, Fidme exports don't contain the card type
// I guess they have an online DB of all the different companies and what type they use
// TODO: Hook this into our own loyalty card DB if we ever get one
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
// No favourite data in the export either
int starStatus = 0;

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

@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.HashMap;
import protect.card_locker.CatimaBarcode;
import protect.card_locker.DBHelper;
import protect.card_locker.FormatException;
import protect.card_locker.R;
@@ -165,12 +166,12 @@ public class StocardImporter implements Importer
String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
String cardId = (String) loyaltyCardData.get("cardId");
String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
if (barcodeTypeString != null) {
if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
barcodeType = BarcodeFormat.RSS_EXPANDED;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
} else {
barcodeType = BarcodeFormat.valueOf(barcodeTypeString);
barcodeType = CatimaBarcode.fromName(barcodeTypeString);
}
}

13
app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
View File

@@ -23,6 +23,7 @@ import java.util.Currency;
import java.util.Date;
import java.util.TimeZone;
import protect.card_locker.CatimaBarcode;
import protect.card_locker.DBHelper;
import protect.card_locker.FormatException;
@@ -74,24 +75,24 @@ public class VoucherVaultImporter implements Importer
String cardId = jsonCard.getString("code");
BarcodeFormat barcodeType = null;
CatimaBarcode barcodeType = null;
String codeTypeFromJSON = jsonCard.getString("codeType");
switch (codeTypeFromJSON) {
case "CODE128":
barcodeType = BarcodeFormat.CODE_128;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
break;
case "CODE39":
barcodeType = BarcodeFormat.CODE_39;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_39);
break;
case "EAN13":
barcodeType = BarcodeFormat.EAN_13;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13);
break;
case "PDF417":
barcodeType = BarcodeFormat.PDF_417;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417);
break;
case "QR":
barcodeType = BarcodeFormat.QR_CODE;
barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE);
break;
case "TEXT":
break;