Merge pull request #2956 from CatimaLoyalty/create-pull-request/patch-1768106786

Update contributors
2026-01-11 16:38:02 -05:00 · 2026-01-11 09:51:24 +01:00 · 2026-01-11 04:46:26 +00:00 · 2026-01-10 14:32:30 +01:00 · 2026-01-10 11:04:49 +01:00 · 2026-01-10 11:04:49 +01:00
34 changed files with 233 additions and 329 deletions
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import com.google.zxing.EncodeHintType;
@@ -59,7 +58,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {

    BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, @NonNull Charset barcodeEncoding, TextView textView,
+            CatimaBarcode barcodeFormat, @Nullable Charset barcodeEncoding, TextView textView,
            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
    ) {
        mContext = context;
@@ -186,6 +185,26 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        MultiFormatWriter writer = new MultiFormatWriter();

        Map<EncodeHintType, Object> encodeHints = new ArrayMap<>();
+        Charset chosenEncoding = encoding;
+        // Use charset if defined or guess otherwise
+        if (chosenEncoding != null) {
+            Log.d(TAG, "Encoding explicitly set, " + chosenEncoding.name());
+        } else {
+            // FIXME: Guessing encoding using zxing causes too many false positives and breaks the Deutschlandticket, a common public transport ticket in Germany
+            // See https://github.com/CatimaLoyalty/Android/issues/2932
+            //
+            // So, for now, we just force ISO in the "guessing" path until we figure out a better way to guess
+            // The previous code is commented before, DO NOT UNCOMMENT, IT IS BROKEN
+            //
+            // chosenEncoding = Charset.forName(StringUtils.guessEncoding(cardId.getBytes(), new ArrayMap<>()));
+            // Log.d(TAG, "Guessed encoding: " + chosenEncoding.name());
+
+            // FIXME: Figure out a good way to automatically determine the best format to use, to not break UTF-8 barcodes
+            // However, make sure to NOT break the Deutschlandticket!
+            chosenEncoding = StandardCharsets.ISO_8859_1;
+            Log.w(TAG, "The encoding guessing code path is temporarily disabled due to it breaking Deutschlandticket. Forcing ISO-8859-1...");
+        }
+
        // We don't want to pass the ISO-8859-1 as an encoding hint as zxing may add this as ECI
        // inside the barcode.
        //
@@ -199,9 +218,9 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        // cards without encode hints have never caused any issues (unless they were UTF-8), yet
        // just days after passing ISO-8859-1 as CHARACTER_SET in the encode hints already 2
        // scan failures were reported (one for QR, one for Aztec).
-        if (!Objects.equals(encoding.name(), StandardCharsets.ISO_8859_1.name())) {
+        if (!Objects.equals(chosenEncoding.name(), StandardCharsets.ISO_8859_1.name())) {
            Log.d(TAG, "Chosen encoding is not ISO_8859_1, so passing as encoding hint");
-            encodeHints.put(EncodeHintType.CHARACTER_SET, encoding);
+            encodeHints.put(EncodeHintType.CHARACTER_SET, chosenEncoding);
        } else {
            Log.d(TAG, "Not passing encoding as encoding hint");
        }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -10,7 +10,6 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import java.io.FileNotFoundException;
@@ -27,7 +26,7 @@ import java.util.Set;
 public class DBHelper extends SQLiteOpenHelper {
    public static final String DATABASE_NAME = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 20;
+    public static final int DATABASE_VERSION = 19;

    // NB: changing these values requires a migration
    public static final int DEFAULT_ZOOM_LEVEL = 100;
@@ -117,7 +116,7 @@ public class DBHelper extends SQLiteOpenHelper {
                LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
+                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT," +
                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
@@ -357,145 +356,6 @@ public class DBHelper extends SQLiteOpenHelper {
        if (oldVersion < 19 && newVersion >= 19) {
            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
        }
-
-        if (oldVersion < 20 && newVersion >= 20) {
-            // SQLite doesn't support modify column
-            // So we need to create a temp column to make barcode encoding non-nullable
-            // Let's drop header text colour too while we're at it
-            // https://www.sqlite.org/faq.html#q11
-            db.beginTransaction();
-
-            // First migrate all cards to ISO-8859-1
-            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
-
-            // create temp table
-            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
-
-            // Insert all cards into temp table
-            db.execSQL("INSERT INTO tmp (" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " , " +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS +
-                    " FROM " + LoyaltyCardDbIds.TABLE);
-
-            // Drop old table
-            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
-
-            // Create table again
-            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
-
-            // Insert all temp cards into newly created table
-            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " , " +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS +
-                    " FROM tmp");
-
-            // Drop tmp table
-            db.execSQL("DROP TABLE tmp");
-
-            db.setTransactionSuccessful();
-            db.endTransaction();
-        }
-
    }

    public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
@@ -557,7 +417,7 @@ public class DBHelper extends SQLiteOpenHelper {
    public static long insertLoyaltyCard(
            final SQLiteDatabase database, final String store, final String note, final Date validFrom,
            final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final String barcodeId, final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
            final Integer headerColor,
            final int starStatus, final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();
@@ -573,7 +433,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -593,7 +453,7 @@ public class DBHelper extends SQLiteOpenHelper {
            final SQLiteDatabase database, final int id, final String store, final String note,
            final Date validFrom, final Date expiry, final BigDecimal balance,
            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
            final Integer headerColor, final int starStatus,
            final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();
@@ -610,7 +470,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -630,7 +490,7 @@ public class DBHelper extends SQLiteOpenHelper {
            SQLiteDatabase database, final int id, final String store, final String note,
            final Date validFrom, final Date expiry, final BigDecimal balance,
            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
            final Integer headerColor, final int starStatus,
            final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();
@@ -646,7 +506,7 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -70,7 +70,7 @@ public class ImportURIHelper {
        try {
            // These values are allowed to be null
            CatimaBarcode barcodeType = null;
-            Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
+            Charset barcodeEncoding = null;
            Date validFrom = null;
            Date expiry = null;
            BigDecimal balance = new BigDecimal("0");
@@ -206,7 +206,9 @@ public class ImportURIHelper {
        if (loyaltyCard.barcodeType != null) {
            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
        }
-        fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
+        if (loyaltyCard.barcodeEncoding != null) {
+            fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
+        }
        if (loyaltyCard.headerColor != null) {
            fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;

 import java.math.BigDecimal;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -32,6 +31,7 @@ public class LoyaltyCard {
    public String barcodeId;
    @Nullable
    public CatimaBarcode barcodeType;
+    @Nullable
    public Charset barcodeEncoding;
    @Nullable
    public Integer headerColor;
@@ -94,7 +94,7 @@ public class LoyaltyCard {
        setCardId("");
        setBarcodeId(null);
        setBarcodeType(null);
-        setBarcodeEncoding(StandardCharsets.ISO_8859_1);
+        setBarcodeEncoding(null);
        setHeaderColor(null);
        setStarStatus(0);
        setLastUsed(Utils.getUnixTime());
@@ -129,7 +129,7 @@ public class LoyaltyCard {
    public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                       @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                       final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @NonNull final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
+                       @Nullable final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
                       final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
                       @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
                       @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
@@ -250,7 +250,7 @@ public class LoyaltyCard {
        this.barcodeType = barcodeType;
    }

-    public void setBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+    public void setBarcodeEncoding(@Nullable Charset barcodeEncoding) {
        this.barcodeEncoding = barcodeEncoding;
    }

@@ -478,7 +478,7 @@ public class LoyaltyCard {
            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
        }
        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
-            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding.name());
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
        }
        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
            bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
@@ -558,7 +558,8 @@ public class LoyaltyCard {
        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
        CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
        // barcodeEncoding
-        Charset barcodeEncoding = Charset.forName(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
+        int barcodeEncodingColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING);
+        Charset barcodeEncoding = !cursor.isNull(barcodeEncodingColumn) ? Charset.forName(cursor.getString(barcodeEncodingColumn)) : null;
        // headerColor
        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
        Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
@@ -614,7 +615,7 @@ public class LoyaltyCard {
                Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
                Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
                        b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
-                a.barcodeEncoding.name().equals(b.barcodeEncoding.name()) && // non-nullable String
+                Utils.equals(a.barcodeEncoding, b.barcodeEncoding) && // nullable String
                Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                a.starStatus == b.starStatus && // non-nullable int
                a.archiveStatus == b.archiveStatus && // non-nullable int
@@ -654,7 +655,7 @@ public class LoyaltyCard {
                this.cardId,
                this.barcodeId,
                this.barcodeType != null ? this.barcodeType.format() : null,
-                this.barcodeEncoding.name(),
+                this.barcodeEncoding != null ? this.barcodeEncoding.name() : null,
                this.headerColor,
                this.starStatus,
                this.lastUsed,
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -232,7 +232,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        viewModel.setHasChanged(true);
    }

-    protected void setLoyaltyCardBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+    protected void setLoyaltyCardBarcodeEncoding(@Nullable Charset barcodeEncoding) {
        viewModel.getLoyaltyCard().setBarcodeEncoding(barcodeEncoding);

        generateBarcode();
@@ -594,13 +594,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                if (!s.toString().isEmpty()) {
                    Log.d(TAG, "Setting barcode encoding to " + s.toString());
-                    setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
+                    if (s.toString().equals(getString(R.string.automatic))) {
+                        setLoyaltyCardBarcodeEncoding(null);
+                    } else {
+                        setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
+                    }
                }
            }

            @Override
            public void afterTextChanged(Editable s) {
                ArrayList<String> barcodeEncodingList = new ArrayList<>();
+                barcodeEncodingList.add(getString(R.string.automatic));
                barcodeEncodingList.add(StandardCharsets.ISO_8859_1.name());
                barcodeEncodingList.add(StandardCharsets.UTF_8.name());
                ArrayAdapter<String> barcodeEncodingAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeEncodingList);
@@ -805,7 +810,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        CatimaBarcode barcodeType = viewModel.getLoyaltyCard().barcodeType;
        barcodeTypeField.setText(barcodeType != null ? barcodeType.prettyName() : getString(R.string.noBarcode));
        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
-        barcodeEncodingField.setText(barcodeEncoding.name());
+        barcodeEncodingField.setText(barcodeEncoding != null ? barcodeEncoding.name() : getString(R.string.automatic));

        // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
        // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -89,6 +89,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    String cardIdString;
    String barcodeIdString;
    CatimaBarcode format;
+    @Nullable
    Charset barcodeEncoding;

    Bitmap frontImageBitmap;
--- a/app/src/main/java/protect/card_locker/PkpassParser.kt
+++ b/app/src/main/java/protect/card_locker/PkpassParser.kt
@@ -15,7 +15,6 @@ import java.io.FileNotFoundException
 import java.io.IOException
 import java.math.BigDecimal
 import java.nio.charset.Charset
-import java.nio.charset.StandardCharsets
 import java.text.DateFormat
 import java.text.ParseException
 import java.time.ZonedDateTime
@@ -42,7 +41,7 @@ class PkpassParser(context: Context, uri: Uri?) {
    private var cardId: String = context.getString(R.string.noBarcode)
    private var barcodeId: String? = null
    private var barcodeType: CatimaBarcode? = null
-    private var barcodeEncoding: Charset = StandardCharsets.ISO_8859_1
+    private var barcodeEncoding: Charset? = null
    private var headerColor: Int? = null
    private val starStatus = 0
    private val lastUsed: Long = 0
@@ -349,13 +348,13 @@ class PkpassParser(context: Context, uri: Uri?) {
        try {
            cardId = barcodeInfo.getString("altText")
            barcodeId = barcodeInfo.getString("message")
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
        } catch (ignored: JSONException) {
            cardId = barcodeInfo.getString("message")
            barcodeId = null
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
        }

-        barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
-
        // Don't set barcodeId if it's the same as cardId
        if (cardId == barcodeId) {
            barcodeId = null
--- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
@@ -155,7 +155,7 @@ public class CatimaExporter implements Exporter {
                    card.cardId,
                    card.barcodeId,
                    card.barcodeType != null ? card.barcodeType.name() : "",
-                    card.barcodeEncoding.name(),
+                    card.barcodeEncoding != null ? card.barcodeEncoding.name() : "",
                    card.headerColor,
                    card.starStatus,
                    card.lastUsed,
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -462,8 +462,8 @@ public class CatimaImporter implements Importer {
        // Barcode encoding information is only supported since Catima 2.41.0, so old exports will lack this field
        // Database migration 19 forcing ISO-8859-1 on all cards, so we should treat imports from old Catima versions the same and force ISO-8859-1 there too
        // This limits the risk of breaking cards when importing an old database backup
-        Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
-        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "");
+        Charset barcodeEncoding = null;
+        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "ISO-8859-1");
        if (!unparsedBarcodeEncoding.isEmpty()) {
            barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
        }
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
@@ -160,7 +160,7 @@ public class FidmeImporter implements Importer {
                cardId,
                null,
                barcodeType,
-                StandardCharsets.ISO_8859_1,
+                null,
                headerColor,
                starStatus,
                Utils.getUnixTime(),
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -162,7 +162,7 @@ public class VoucherVaultImporter implements Importer {
                    cardId,
                    null,
                    barcodeType,
-                    StandardCharsets.ISO_8859_1,
+                    null,
                    headerColor,
                    0,
                    Utils.getUnixTime(),
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -14,8 +14,8 @@ Katharine Chui
 mondstern
 IllusiveMan196
 Silvério Santos
-Altonss
 Edgars Andersons
+Altonss
 Joel A
 Michael Moroni
 Priit Jõerüüt
@@ -68,6 +68,7 @@ aradxxx
 StellarSand
 Quentin PAGÈS
 Projjal Moitra
+Traductor
 Aliaksandr Trush
 e-michalak
 JungHee Lee
@@ -78,7 +79,6 @@ Robin Liu
 Ricky Tigg
 Renko
 Gideon
-Traductor
 Denis Shilin
 しいたけ
 Alexander Ivanov
@@ -96,6 +96,7 @@ Augustin LAVILLE
 Freddo espresso
 Vasudev R.
 Kim Seohyun
+echo r"0xX4H" | rev
 rudy3
 Michael Gangolf
 PRATHAMESH BHAGAT 
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -300,5 +300,6 @@
    <string name="copied_to_clipboard">Копирано</string>
    <string name="nothing_to_copy">Няма стойност</string>
    <string name="back">Назад</string>
+    <string name="automatic">Автоматично</string>
    <string name="barcodeEncoding">Кодиране на щрихкода</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -306,5 +306,6 @@
    <string name="copied_to_clipboard">Zkopírováno do schránky</string>
    <string name="nothing_to_copy">Nenalezena žádná hodnota</string>
    <string name="barcodeEncoding">Kódování čárového kódu</string>
+    <string name="automatic">Automatické</string>
    <string name="back">Zpět</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -300,5 +300,6 @@
    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
    <string name="nothing_to_copy">Keinen Betrag gefunden</string>
    <string name="barcodeEncoding">Barcode-Kodierung</string>
+    <string name="automatic">Automatisch</string>
    <string name="back">Zurück</string>
 </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -299,6 +299,7 @@
    <string name="copy_value">Αντιγραφή τιμής</string>
    <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
    <string name="nothing_to_copy">Δεν βρέθηκε τιμή</string>
+    <string name="automatic">Αυτόματη</string>
    <string name="barcodeEncoding">Κωδικοποίηση γραμμωτού κώδικα</string>
    <string name="back">Πίσω</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -306,5 +306,6 @@
    <string name="copied_to_clipboard">Copiado al portapapeles</string>
    <string name="nothing_to_copy">Ningún valor encontrado</string>
    <string name="barcodeEncoding">Codificación de barra de código</string>
+    <string name="automatic">Automático</string>
    <string name="back">Atrás</string>
 </resources>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -300,5 +300,6 @@
    <string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
    <string name="nothing_to_copy">Ühtegi väärtust ei leidu</string>
    <string name="barcodeEncoding">Triipkoodi kodeerimine</string>
+    <string name="automatic">Automaatne</string>
    <string name="back">Tagasi</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -22,7 +22,7 @@
    <string name="noCardsMessage">Najpierw dodaj kartę</string>
    <string name="noCardExistsError">Nie można znaleźć tej karty</string>
    <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URL</string>
-    <string name="importExport">Importuj/Eksportuj</string>
+    <string name="importExport">Import/eksport</string>
    <string name="exportName">Eksportuj</string>
    <string name="importExportHelp">Kopie zapasowe umożliwiają przeniesienie danych na inne urządzenie.</string>
    <string name="importSuccessfulTitle">Zaimportowano</string>
@@ -51,7 +51,7 @@
    <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
    <string name="deleteConfirmationGroup">Usunąć grupę\?</string>
    <string name="all">Wszystko</string>
-    <string name="noGroups">Kliknij przycisk + plus, aby dodać grupy do kategoryzacji.</string>
+    <string name="noGroups">Kliknij przycisk +, aby dodać grupy do kategoryzacji</string>
    <string name="groups">Grupy</string>
    <string name="enter_group_name">Wpisz nazwę grupy</string>
    <string name="exportSuccessful">Dane zostały wyeksportowane</string>
@@ -71,8 +71,8 @@
    <string name="settings_locale">Język</string>
    <string name="turn_flashlight_off">Wyłącz latarkę</string>
    <string name="turn_flashlight_on">Włącz latarkę</string>
-    <string name="failedGeneratingShareURL">Nie można wygenerować adresu URL do udostępnienia. Proszę to zgłosić.</string>
-    <string name="passwordRequired">Proszę wpisać hasło</string>
+    <string name="failedGeneratingShareURL">Nie można wygenerować adresu URL do udostępnienia</string>
+    <string name="passwordRequired">Wprowadź hasło</string>
    <string name="no">Nie</string>
    <string name="yes">Tak</string>
    <string name="updateBarcodeQuestionText">Zmieniłeś ID. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
@@ -90,17 +90,13 @@
    <string name="setBarcodeId">Ustaw wartość kodu kreskowego</string>
    <string name="sameAsCardId">Taki sam jak ID</string>
    <string name="barcodeId">Wartość kodu kreskowego</string>
-    <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
-\nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Wybierz swój plik eksportu z Voucher Vault, aby zaimportować. \nUtwórz go wybierając Eksportuj w Voucher Vault.</string>
    <string name="importVoucherVault">Importuj z Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
-\nUtwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
+    <string name="importLoyaltyCardKeychainMessage">Wybierz swój plik eksportu z Loyalty Card Keychain, aby zaimportować. \nUtwórz go z menu Import/eksport w Loyalty Card Keychain, wybierając opcję Eksportuj.</string>
    <string name="importLoyaltyCardKeychain">Importuj z Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Wybierz swój <i>fidme-export-request-xxxxxx.zip</i> z FidMe, aby zaimportować, po czym wybierz typy kodów kreskowych.
-\nStwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
+    <string name="importFidmeMessage">Wybierz swój plik eksportu z FidMe, aby zaimportować, po czym wybierz typy kodów kreskowych. \nStwórz go ze swojego profilu FidMe, wybierając Ochrona Danych, a następnie Wyodrębnij moje dane.</string>
    <string name="importFidme">Importuj z FidMe</string>
-    <string name="importCatimaMessage">Wybierz swój <i>catima.zip</i> z Catima, aby zaimportować.
-\nUtwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
+    <string name="importCatimaMessage">Wybierz swój plik eksportu z Catima, aby zaimportować. \nUtwórz go z menu Import/eksport innej aplikacji Catima poprzez wybór opcji Eksport.</string>
    <string name="importCatima">Importuj z Catima</string>
    <string name="accept">Zaakceptuj</string>
    <string name="privacy_policy">Polityka prywatności</string>
@@ -109,7 +105,7 @@
    <string name="points">Punkty</string>
    <string name="currency">Waluta</string>
    <string name="balance">Saldo</string>
-    <string name="errorReadingImage">Nie udało się odczytać zdjęcia</string>
+    <string name="errorReadingImage">Odczytanie zdjęcia nie powiodło się</string>
    <string name="noBarcodeFound">Nie znaleziono kodu kreskowego</string>
    <string name="moveBarcodeToTopOfScreen">Przenieś kod kreskowy na górę ekranu</string>
    <string name="chooseExpiryDate">Wybierz datę wygaśnięcia</string>
@@ -137,8 +133,8 @@
    <string name="noGroupCards">Ta grupa jest pusta</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj wyłączeniu ekranu</string>
    <string name="settings_keep_screen_on">Nie wygaszaj ekranu</string>
-    <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Zasoby zewnętrzne: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Biblioteki zewnętrzne: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i współtwórcy</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Usunąć tą <xliff:g>%d</xliff:g> kartę permamentnie\?</item>
@@ -184,7 +180,7 @@
    <string name="group_name_already_in_use">Ta nazwa jest już w użytku</string>
    <string name="group_name_is_empty">Nazwa grupy nie może być pusta</string>
    <string name="group_updated">Zaktualizowano grupę</string>
-    <string name="editGroup">Edytowanie grupy: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Edycja grupy: <xliff:g>%s</xliff:g></string>
    <string name="exportPassword">Ustaw hasło, aby zabezpieczyć twoje wyeksportowane dane (opcjonalne)</string>
    <string name="exportPasswordHint">Wpisz hasło</string>
    <string name="options">Opcje</string>
@@ -243,7 +239,7 @@
    <string name="show_balance">Pokaż balans</string>
    <string name="show_validity">Pokaż ważność</string>
    <string name="show_note">Pokaż notatkę</string>
-    <string name="permissionReadCardsLabel">Odczytaj Karty Catima</string>
+    <string name="permissionReadCardsLabel">Odczytaj karty Catima</string>
    <string name="permissionReadCardsDescription">odczytywanie swoich kart Catima i ich szczegółów, włącznie z notatkami i obrazkami</string>
    <string name="settings_allow_content_provider_read_title">Pozwól innym aplikacjom na dostęp do moich danych</string>
    <string name="settings_display_barcode_max_brightness_summary">Potrzebne aby niektóre skanery działały</string>
@@ -275,9 +271,9 @@
    <string name="receive">Otrzymaj</string>
    <string name="amountParsingFailed">Nieprawidłowa ilość</string>
    <string name="add_manually_warning_title">Skanowanie jest zalecane</string>
-    <string name="failedLaunchingFileManager">Nie można znaleźć obsługiwanego menedżera plików</string>
+    <string name="failedLaunchingFileManager">Nie można znaleźć wspieranego menedżera plików</string>
    <string name="multipleBarcodesFoundPleaseChooseOne">Którego ze znalezionych kodów kreskowych chciałbyś użyć?</string>
-    <string name="add_manually_warning_message">W przypadku niektórych sklepów wartość kodu kreskowego różni się od liczby zapisanej na karcie. Z tego powodu ręczne wprowadzanie kodu kreskowego może nie zawsze działać. Zdecydowanie zaleca się zeskanowanie kodu kreskowego za pomocą aparatu. Czy nadal chcesz kontynuować?</string>
+    <string name="add_manually_warning_message">W przypadku niektórych kart wartość kodu kreskowego różni się od liczby zapisanej na karcie. Z tego powodu ręczne wprowadzanie kodu kreskowego może nie zawsze działać. Zaleca się zeskanowanie kodu kreskowego za pomocą aparatu. Czy nadal chcesz kontynuować?</string>
    <string name="noCameraFoundGuideText">Nie wykryto kamery. Jeśli twoje urządzenie posiada kamerę, spróbuj uruchomić je ponownie. W innym wypadku wybierz Więcej opcji i dodaj kartę w inny sposób.</string>
    <string name="importCancelled">Import anulowany</string>
    <string name="exportCancelled">Eksport anulowany</string>
@@ -298,17 +294,21 @@
    <string name="settings_column_count_1">1</string>
    <string name="addFromPkpass">Wybierz plik Passbook (.pkpass / .pkpasses)</string>
    <string name="unsupportedFile">Ten plik nie jest obsługiwany</string>
-    <string name="generic_error_please_retry">Coś poszło nie tak, spróbuj ponownie później...</string>
-    <string name="sort_by_valid_from">Poprawna forma</string>
+    <string name="generic_error_please_retry">Wystąpił błąd</string>
+    <string name="sort_by_valid_from">Ważne od</string>
    <string name="setBarcodeWidth">Ustaw szerokość kodu kreskowego</string>
    <string name="width">Szerokość</string>
    <string name="card_list_widget_empty">Karty lojalnościowe dodane w aplikacji Catima pokażą się tutaj. Jeżeli masz jakieś karty, upewnij się że nie są one zarchiwizowane.</string>
    <string name="card_list_widget_name">Lista kart</string>
    <string name="cardWithNumber">Karta <xliff:g>%d</xliff:g></string>
-    <string name="cardWithNumberAndLocale">Karta <xliff:g>%d</xliff:g> (%s)</string>
+    <string name="cardWithNumberAndLocale">Karta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
    <string name="pleaseDoNotRotateTheDevice">Proszę nie obracać urządzenia, gdyż anuluje to obecne zadanie</string>
    <string name="acra_explain_crash">Jeśli możliwe, dodaj więcej szczegółów na temat co robiłeś/aś tutaj:</string>
    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> raport błędu</string>
    <string name="pref_enable_acra">Zapytaj o wysłanie raportu błędu</string>
    <string name="pref_enable_acra_summary">Kiedy zaznaczone, będziesz proszony/a o zgłoszenie raportu błędu, gdyby zaistniał. Raporty błędu nigdy nie są wysyłane automatycznie.</string>
+    <string name="acra_catima_has_crashed">Przepraszamy, ale aplikacja <xliff:g id="app_name">%s</xliff:g> uległa awarii. Prosimy o pomoc w rozwiązaniu tego problemu poprzez przesłanie nam raportu o błędzie.</string>
+    <string name="copy_value">Kopiuj wartość</string>
+    <string name="copied_to_clipboard">Skopiowano do schowka</string>
+    <string name="nothing_to_copy">Nie znaleziono wartości</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -344,5 +344,6 @@
    <string name="copied_to_clipboard">Copied to clipboard</string>
    <string name="nothing_to_copy">No value found</string>
    <string name="barcodeEncoding">Barcode encoding</string>
+    <string name="automatic">Automatic</string>
    <string name="back">Back</string>
 </resources>
--- a/app/src/test/java/protect/card_locker/DatabaseTest.java
+++ b/app/src/test/java/protect/card_locker/DatabaseTest.java
@@ -42,7 +42,7 @@ public class DatabaseTest {
    @Test
    public void addRemoveOneGiftCard() {
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -58,7 +58,7 @@ public class DatabaseTest {
        assertEquals("cardId", loyaltyCard.cardId);
        assertEquals(null, loyaltyCard.barcodeId);
        assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, loyaltyCard.barcodeEncoding);
+        assertEquals(null, loyaltyCard.barcodeEncoding);
        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
        assertEquals(0, loyaltyCard.starStatus);
        assertEquals(0, loyaltyCard.archiveStatus);
@@ -71,7 +71,7 @@ public class DatabaseTest {

    @Test
    public void updateGiftCard() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -99,7 +99,7 @@ public class DatabaseTest {

    @Test
    public void updateGiftCardOnlyStar() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -119,7 +119,7 @@ public class DatabaseTest {
        assertEquals("cardId", loyaltyCard.cardId);
        assertEquals(null, loyaltyCard.barcodeId);
        assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, loyaltyCard.barcodeEncoding);
+        assertEquals(null, loyaltyCard.barcodeEncoding);
        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
        assertEquals(1, loyaltyCard.starStatus);
        assertEquals(0, loyaltyCard.archiveStatus);
@@ -130,14 +130,14 @@ public class DatabaseTest {
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));

        boolean result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, null, new BigDecimal("0"), null, "cardId1",
-                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null, 0);
+                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null, 0);
        assertEquals(false, result);
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
    }

    @Test
    public void emptyGiftCardValues() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, null, new BigDecimal("0"), null, "", null, null, StandardCharsets.ISO_8859_1, null, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, null, new BigDecimal("0"), null, "", null, null, null, null, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -153,7 +153,7 @@ public class DatabaseTest {
        assertEquals("", loyaltyCard.cardId);
        assertEquals(null, loyaltyCard.barcodeId);
        assertEquals(null, loyaltyCard.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, loyaltyCard.barcodeEncoding);
+        assertEquals(null, loyaltyCard.barcodeEncoding);
        // headerColor is randomly generated when not given, so skip
        assertEquals(0, loyaltyCard.starStatus);
        assertEquals(0, loyaltyCard.archiveStatus);
@@ -214,10 +214,10 @@ public class DatabaseTest {
        for (int index = CARDS_TO_ADD - 1; index >= 0; index--) {
            if (index == CARDS_TO_ADD - 1) {
                id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, index, 1, null,0);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, index, 1, null,0);
            } else {
                id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, index, 0, null,0);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, index, 0, null,0);
            }
            boolean result = (id != -1);
            assertTrue(result);
@@ -241,7 +241,7 @@ public class DatabaseTest {
        assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
        assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
        assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
-        assertEquals(StandardCharsets.ISO_8859_1.name(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
+        assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
        assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
        assertEquals(1, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));

@@ -317,7 +317,7 @@ public class DatabaseTest {
    public void updateGroup() {
        // Create card
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -429,7 +429,7 @@ public class DatabaseTest {
    public void cardAddAndRemoveGroups() {
        // Create card
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -525,7 +525,7 @@ public class DatabaseTest {

    @Test
    public void updateGiftCardOnlyBalance() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -545,7 +545,7 @@ public class DatabaseTest {
        assertEquals("cardId", loyaltyCard.cardId);
        assertEquals(null, loyaltyCard.barcodeId);
        assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, loyaltyCard.barcodeEncoding);
+        assertEquals(null, loyaltyCard.barcodeEncoding);
        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
        assertEquals(0, loyaltyCard.starStatus);
        assertEquals(0, loyaltyCard.archiveStatus);
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -74,7 +74,7 @@ public class ImportExportTest {
        for (int index = cardsToAdd; index > 4; index--) {
            String storeName = String.format("store, \"%4d", index);
            String note = String.format("note, \"%4d", index);
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1,  index, 1, null,0);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, null,  index, 1, null,0);
            boolean result = (id != -1);
            assertTrue(result);
        }
@@ -82,7 +82,7 @@ public class ImportExportTest {
            String storeName = String.format("store, \"%4d", index);
            String note = String.format("note, \"%4d", index);
            //if index is even
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, index, 0, null,0);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, null, index, 0, null,0);
            boolean result = (id != -1);
            assertTrue(result);
        }
@@ -91,7 +91,7 @@ public class ImportExportTest {

    @Test
    public void addLoyaltyCardsWithExpiryNeverPastTodayFuture() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, 0, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
        boolean result = (id != -1);
        assertTrue(result);

@@ -105,11 +105,11 @@ public class ImportExportTest {
        assertEquals(BARCODE_DATA, card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Integer.valueOf(0), card.headerColor);
        assertEquals(0, card.starStatus);

-        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", null, new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", null, new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
        result = (id != -1);
        assertTrue(result);

@@ -123,11 +123,11 @@ public class ImportExportTest {
        assertEquals(BARCODE_DATA, card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Integer.valueOf(0), card.headerColor);
        assertEquals(0, card.starStatus);

-        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", null, new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", null, new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
        result = (id != -1);
        assertTrue(result);

@@ -142,13 +142,13 @@ public class ImportExportTest {
        assertEquals(BARCODE_DATA, card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Integer.valueOf(0), card.headerColor);
        assertEquals(0, card.starStatus);

        // This will break after 19 January 2038
        // If someone is still maintaining this code base by then: I love you
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", null, new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", null, new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
        result = (id != -1);
        assertTrue(result);

@@ -162,7 +162,7 @@ public class ImportExportTest {
        assertEquals(BARCODE_DATA, card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Integer.valueOf(0), card.headerColor);
        assertEquals(0, card.starStatus);

@@ -193,7 +193,7 @@ public class ImportExportTest {
            assertEquals(BARCODE_DATA, card.cardId);
            assertEquals(null, card.barcodeId);
            assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-            assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+            assertEquals(null, card.barcodeEncoding);
            assertEquals(Integer.valueOf(index), card.headerColor);
            assertEquals(0, card.starStatus);

@@ -225,7 +225,7 @@ public class ImportExportTest {
            assertEquals(BARCODE_DATA, card.cardId);
            assertEquals(null, card.barcodeId);
            assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-            assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+            assertEquals(null, card.barcodeEncoding);
            assertEquals(Integer.valueOf(index), card.headerColor);
            assertEquals(0, card.starStatus);
        }
@@ -257,7 +257,7 @@ public class ImportExportTest {
            assertEquals(BARCODE_DATA, card.cardId);
            assertEquals(null, card.barcodeId);
            assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-            assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+            assertEquals(null, card.barcodeEncoding);
            assertEquals(Integer.valueOf(index), card.headerColor);
            assertEquals(1, card.starStatus);

@@ -280,7 +280,7 @@ public class ImportExportTest {
            assertEquals(BARCODE_DATA, card.cardId);
            assertEquals(null, card.barcodeId);
            assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
-            assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+            assertEquals(null, card.barcodeEncoding);
            assertEquals(Integer.valueOf(index), card.headerColor);
            assertEquals(0, card.starStatus);

@@ -859,7 +859,7 @@ public class ImportExportTest {
        loyaltyCardIconImages.put(loyaltyCardId, bitmap1);

        // Create card 2
-        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, StandardCharsets.ISO_8859_1, 2, 1, null,0);
+        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, null, 2, 1, null,0);
        loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardId));

        // Export everything
@@ -977,7 +977,7 @@ public class ImportExportTest {
        assertEquals("1234", card1.cardId);
        assertEquals("5432", card1.barcodeId);
        assertEquals(BarcodeFormat.QR_CODE, card1.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card1.barcodeEncoding);
+        assertEquals(null, card1.barcodeEncoding);
        assertEquals(1, (long) card1.headerColor);
        assertEquals(0, card1.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card1.id, ImageLocationType.front));
@@ -995,7 +995,7 @@ public class ImportExportTest {
        assertEquals("a", card8.cardId);
        assertEquals(null, card8.barcodeId);
        assertEquals(null, card8.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card8.barcodeEncoding);
+        assertEquals(null, card8.barcodeEncoding);
        assertEquals(-5317, (long) card8.headerColor);
        assertEquals(0, card8.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card8.id, ImageLocationType.front));
@@ -1013,7 +1013,7 @@ public class ImportExportTest {
        assertEquals("A", card2.cardId);
        assertEquals(null, card2.barcodeId);
        assertEquals(null, card2.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card2.barcodeEncoding);
+        assertEquals(null, card2.barcodeEncoding);
        assertEquals(-9977996, (long) card2.headerColor);
        assertEquals(0, card2.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card2.id, ImageLocationType.front));
@@ -1031,7 +1031,7 @@ public class ImportExportTest {
        assertEquals("dhd", card3.cardId);
        assertEquals(null, card3.barcodeId);
        assertEquals(null, card3.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card3.barcodeEncoding);
+        assertEquals(null, card3.barcodeEncoding);
        assertEquals(-9977996, (long) card3.headerColor);
        assertEquals(0, card3.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card3.id, ImageLocationType.front));
@@ -1049,7 +1049,7 @@ public class ImportExportTest {
        assertEquals("dhshsvshs", card4.cardId);
        assertEquals(null, card4.barcodeId);
        assertEquals(null, card4.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card4.barcodeEncoding);
+        assertEquals(null, card4.barcodeEncoding);
        assertEquals(-10902850, (long) card4.headerColor);
        assertEquals(1, card4.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card4.id, ImageLocationType.front));
@@ -1085,7 +1085,7 @@ public class ImportExportTest {
        assertEquals("a", card6.cardId);
        assertEquals("-5317", card6.barcodeId);
        assertEquals(BarcodeFormat.AZTEC, card6.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card6.barcodeEncoding);
+        assertEquals(null, card6.barcodeEncoding);
        assertEquals(null, card6.headerColor);
        assertEquals(0, card6.starStatus);
        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card6.id, ImageLocationType.front));
@@ -1133,7 +1133,7 @@ public class ImportExportTest {
        assertEquals("82825292629272726", card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(null, card.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(0, card.starStatus);

        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
@@ -1147,7 +1147,7 @@ public class ImportExportTest {
        assertEquals("123456", card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(null, card.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(0, card.starStatus);

        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
@@ -1161,7 +1161,7 @@ public class ImportExportTest {
        assertEquals("123435363634", card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(null, card.barcodeType);
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(0, card.starStatus);

        TestHelpers.getEmptyDb(activity);
@@ -1187,7 +1187,7 @@ public class ImportExportTest {
        assertEquals("123456", card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BarcodeFormat.CODE_128, card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Color.GRAY, (long) card.headerColor);
        assertEquals(0, card.starStatus);

@@ -1202,7 +1202,7 @@ public class ImportExportTest {
        assertEquals("26846363", card.cardId);
        assertEquals(null, card.barcodeId);
        assertEquals(BarcodeFormat.CODE_39, card.barcodeType.format());
-        assertEquals(StandardCharsets.ISO_8859_1, card.barcodeEncoding);
+        assertEquals(null, card.barcodeEncoding);
        assertEquals(Color.rgb(128, 0, 128), (long) card.headerColor);
        assertEquals(0, card.starStatus);

--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -73,7 +73,7 @@ public class ImportURITest {
    @Test
    public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException, UnsupportedEncodingException {
        // Generate card
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), StandardCharsets.ISO_8859_1, null, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, null, 0, null,0);

        // Get card
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
@@ -187,7 +187,7 @@ public class ImportURITest {
            assertEquals("12345", parsedCard.cardId);
            assertEquals(null, parsedCard.barcodeId);
            assertEquals(BarcodeFormat.ITF, parsedCard.barcodeType.format());
-            assertEquals(StandardCharsets.ISO_8859_1, parsedCard.barcodeEncoding);
+            assertEquals(null, parsedCard.barcodeEncoding);
            assertEquals(Integer.valueOf(-416706), parsedCard.headerColor);
            assertEquals(0, parsedCard.starStatus);
        }
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -25,7 +25,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowLog;

 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.util.Currency;

@RunWith(RobolectricTestRunner.class)
@@ -97,7 +96,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapterEmptyNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -112,7 +111,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapterWithNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -127,10 +126,10 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapterStarring() {
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,1));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 1, null,1));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 1, null,0));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,0));

        assertEquals(4, DBHelper.getLoyaltyCardCount(mDatabase));

@@ -178,7 +177,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapter0Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -193,7 +192,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapter0EUR() {
-        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -208,7 +207,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapter100Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -223,7 +222,7 @@ public class LoyaltyCardCursorAdapterTest {

    @Test
    public void TestCursorAdapter10USD() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);

        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -213,7 +213,12 @@ public class LoyaltyCardViewActivityTest {
            assertEquals(CatimaBarcode.fromName(barcodeType).format(), card.barcodeType.format());
        }

-        assertEquals(Charset.forName(barcodeEncoding), card.barcodeEncoding);
+        // The special "Automatic" string shouldn't actually be written to the loyalty card
+        if (barcodeEncoding.equals(activity.getApplicationContext().getString(R.string.automatic))) {
+            assertEquals(null, card.barcodeEncoding);
+        } else {
+            assertEquals(Charset.forName(barcodeEncoding), card.barcodeEncoding);
+        }

        assertNotNull(card.headerColor);

@@ -369,7 +374,7 @@ public class LoyaltyCardViewActivityTest {
        shadowOf(getMainLooper()).idle();

        // Check default settings
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
    }

    @Test
@@ -404,7 +409,7 @@ public class LoyaltyCardViewActivityTest {
            shadowOf(getMainLooper()).idle();

            // Check default settings
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), newCard ? "ISO-8859-1" : "UTF-8", null, null);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), newCard ? context.getString(R.string.automatic) : StandardCharsets.UTF_8.name(), null, null);

            // Change everything
            final EditText storeField = activity.findViewById(R.id.storeNameEdit);
@@ -483,7 +488,7 @@ public class LoyaltyCardViewActivityTest {
        Activity activity = (Activity) activityController.get();
        final Context context = activity.getApplicationContext();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
    }

    @Test
@@ -543,18 +548,18 @@ public class LoyaltyCardViewActivityTest {
        Activity activity = (Activity) activityController.get();
        final Context context = activity.getApplicationContext();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);

        // Complete barcode capture successfully
        captureBarcodeWithResult(activity, true);
        activityController.resume();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        shadowOf(getMainLooper()).idle();

        // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.name(), "ISO-8859-1", true);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.name(), context.getString(R.string.automatic), true);
    }

    @Test
@@ -567,7 +572,7 @@ public class LoyaltyCardViewActivityTest {
        Activity activity = (Activity) activityController.get();
        final Context context = activity.getApplicationContext();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);

        // Complete barcode capture in failure
        captureBarcodeWithResult(activity, false);
@@ -575,7 +580,7 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
    }

    @Test
@@ -588,13 +593,13 @@ public class LoyaltyCardViewActivityTest {
        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
        final Context context = activity.getApplicationContext();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);

        // Complete barcode capture successfully
        captureBarcodeWithResult(activity, true);
        activityController.resume();

-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Cancel the loyalty card creation
        assertEquals(false, activity.isFinishing());
@@ -639,7 +644,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -648,7 +653,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -702,7 +707,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
@@ -711,13 +716,13 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Complete barcode capture successfully
        captureBarcodeWithResult(activity, true);
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Cancel the loyalty card creation
        assertEquals(false, activity.isFinishing());
@@ -741,7 +746,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -750,7 +755,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Set date to today
        MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
@@ -764,17 +769,17 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }

    @Test
-    public void startWithLoyaltyCardExpirySetNoExpiry() {
+    public void startWithLoyaltyCardExpirySetNoExpiry() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -783,13 +788,13 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Set date to never
        MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
        expiryField.setText(expiryField.getAdapter().getItem(0).toString(), false);

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -799,7 +804,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -808,7 +813,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Set balance to 10 points
        EditText balanceField = activity.findViewById(R.id.balanceField);
@@ -837,7 +842,7 @@ public class LoyaltyCardViewActivityTest {

                shadowOf(getMainLooper()).idle();

-                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString(), "ISO-8859-1", null, null);
+                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString(), context.getString(R.string.automatic), null, null);

                database.close();
            }
@@ -850,7 +855,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -859,7 +864,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        shadowOf(getMainLooper()).idle();

@@ -881,7 +886,7 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -891,7 +896,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -900,7 +905,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Change barcode ID
        EditText barcodeField = activity.findViewById(R.id.barcodeIdField);
@@ -913,7 +918,7 @@ public class LoyaltyCardViewActivityTest {
        AlertDialog updateBarcodeIdDialog = (AlertDialog) (ShadowDialog.getLatestDialog());
        assertNull(updateBarcodeIdDialog);

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -923,7 +928,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -932,7 +937,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Change card ID
        EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -947,7 +952,7 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -957,7 +962,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -966,7 +971,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Change card ID
        EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -984,7 +989,7 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }
@@ -994,7 +999,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1003,7 +1008,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Change card ID
        EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -1021,17 +1026,17 @@ public class LoyaltyCardViewActivityTest {

        shadowOf(getMainLooper()).idle();

-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", "123456", EAN_BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        database.close();
    }

    @Test
-    public void checkMenu() {
+    public void checkMenu() throws IOException {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1076,7 +1081,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1097,7 +1102,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, null, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, null, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1118,7 +1123,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, null, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, null, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1128,7 +1133,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.resume();

        // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), BARCODE_TYPE.name(), "ISO-8859-1", false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), BARCODE_TYPE.name(), activity.getApplicationContext().getString(R.string.automatic), false);

        database.close();
    }
@@ -1138,7 +1143,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1148,7 +1153,7 @@ public class LoyaltyCardViewActivityTest {
        activityController.resume();

        // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), activity.getApplicationContext().getString(R.string.noBarcode), "ISO-8859-1", false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), activity.getApplicationContext().getString(R.string.noBarcode), activity.getApplicationContext().getString(R.string.automatic), false);

        database.close();
    }
@@ -1158,7 +1163,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1168,18 +1173,18 @@ public class LoyaltyCardViewActivityTest {
        activityController.resume();

        // First check if the card is as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);

        // Complete empty barcode selection successfully
        selectBarcodeWithResult(activity, BARCODE_DATA, null, true);
        activityController.resume();

        // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
        assertEquals(View.GONE, activity.findViewById(R.id.barcodeLayout).getVisibility());

        // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), "ISO-8859-1", false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), false);

        database.close();
    }
@@ -1189,7 +1194,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        Activity activity = (Activity) activityController.get();
@@ -1226,7 +1231,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        AppCompatActivity activity = (AppCompatActivity) activityController.get();
@@ -1322,7 +1327,7 @@ public class LoyaltyCardViewActivityTest {
        final Context context = ApplicationProvider.getApplicationContext();
        SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();

-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, StandardCharsets.ISO_8859_1, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, null, Color.BLACK, 0, null, 0);

        ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
        AppCompatActivity activity = (AppCompatActivity) activityController.get();
@@ -1397,7 +1402,7 @@ public class LoyaltyCardViewActivityTest {
        Activity activity = (Activity) activityController.get();
        final Context context = activity.getApplicationContext();

-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), "Aztec", "ISO-8859-1", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), "Aztec", context.getString(R.string.automatic), null, null);
        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
    }
 }
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -32,7 +32,6 @@ import org.robolectric.android.controller.ActivityController;
 import org.robolectric.shadows.ShadowActivity;

 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

@@ -98,7 +97,7 @@ public class MainActivityTest {
        assertEquals(0, list.getAdapter().getItemCount());

        SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);

        assertEquals(View.VISIBLE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -133,10 +132,10 @@ public class MainActivityTest {
        assertEquals(0, list.getAdapter().getItemCount());

        SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
-        DBHelper.insertLoyaltyCard(database, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
-        DBHelper.insertLoyaltyCard(database, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 1, null,0);
-        DBHelper.insertLoyaltyCard(database, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 1, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,0);

        assertEquals(View.VISIBLE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -230,8 +229,8 @@ public class MainActivityTest {
        TabLayout groupTabs = mainActivity.findViewById(R.id.groups);

        SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
-        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);

        DBHelper.insertGroup(database, "Group one");
        List<Group> groups = new ArrayList<>();
@@ -486,8 +485,8 @@ public class MainActivityTest {


        SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
-        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);

        String finalQuery = "store";
        assert mSearchView != null;
--- a/app/src/test/java/protect/card_locker/PkpassTest.kt
+++ b/app/src/test/java/protect/card_locker/PkpassTest.kt
@@ -492,7 +492,7 @@ class PkpassTest {
        Assert.assertEquals("No barcode", parsedCard.cardId)
        Assert.assertEquals(null, parsedCard.barcodeId)
        Assert.assertEquals(null, parsedCard.barcodeType)
-        Assert.assertEquals(StandardCharsets.ISO_8859_1, parsedCard.barcodeEncoding)
+        Assert.assertEquals(null, parsedCard.barcodeEncoding)
        Assert.assertEquals(Color.parseColor("#FFFFFF"), parsedCard.headerColor)
        Assert.assertEquals(0, parsedCard.starStatus)
        Assert.assertEquals(0, parsedCard.archiveStatus)
@@ -559,7 +559,7 @@ class PkpassTest {
        Assert.assertEquals("No barcode", parsedCard.cardId)
        Assert.assertEquals(null, parsedCard.barcodeId)
        Assert.assertEquals(null, parsedCard.barcodeType)
-        Assert.assertEquals(StandardCharsets.ISO_8859_1, parsedCard.barcodeEncoding)
+        Assert.assertEquals(null, parsedCard.barcodeEncoding)
        Assert.assertEquals(Color.parseColor("#FFFFFF"), parsedCard.headerColor)
        Assert.assertEquals(0, parsedCard.starStatus)
        Assert.assertEquals(0, parsedCard.archiveStatus)
--- a/app/src/test/java/protect/card_locker/ShortcutHelperTest.java
+++ b/app/src/test/java/protect/card_locker/ShortcutHelperTest.java
@@ -21,7 +21,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;

 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.util.Comparator;

@RunWith(RobolectricTestRunner.class)
@@ -39,10 +38,10 @@ public class ShortcutHelperTest {
        mDatabase = TestHelpers.getEmptyDb(mActivity).getWritableDatabase();

        long now = System.currentTimeMillis();
-        id1 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store1", "note1", null, null, new BigDecimal("0"), null, "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, now,0);
-        id2 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store2", "note2", null, null, new BigDecimal("0"), null, "cardId2", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, now + 10,0);
-        id3 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store3", "note3", null, null, new BigDecimal("0"), null, "cardId3", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, now + 20,0);
-        id4 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store4", "note4", null, null, new BigDecimal("0"), null, "cardId4", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.ISO_8859_1, Color.BLACK, 0, now + 30,0);
+        id1 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store1", "note1", null, null, new BigDecimal("0"), null, "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, now,0);
+        id2 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store2", "note2", null, null, new BigDecimal("0"), null, "cardId2", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, now + 10,0);
+        id3 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store3", "note3", null, null, new BigDecimal("0"), null, "cardId3", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, now + 20,0);
+        id4 = (int) DBHelper.insertLoyaltyCard(mDatabase, "store4", "note4", null, null, new BigDecimal("0"), null, "cardId4", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, now + 30,0);

        ShortcutHelper.maxShortcuts = 3;
    }
--- a/app/src/test/java/protect/card_locker/TestHelpers.java
+++ b/app/src/test/java/protect/card_locker/TestHelpers.java
@@ -11,7 +11,6 @@ import com.google.zxing.BarcodeFormat;

 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;

 public class TestHelpers {
    private static final String BARCODE_DATA = "428311627547";
@@ -56,7 +55,7 @@ public class TestHelpers {
        for (int index = cardsToAdd; index > 0; index--) {
            String storeName = String.format("store, \"%4d", index);
            String note = String.format("note, \"%4d", index);
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.ISO_8859_1, index, 0, null,0);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, null, index, 0, null,0);
            boolean result = (id != -1);
            assertTrue(result);
        }
--- a/fastlane/metadata/android/en-US/changelogs/162.txt
+++ b/fastlane/metadata/android/en-US/changelogs/162.txt
@@ -1,2 +1,3 @@
 - Fix list widget sometimes opening wrong card
+- Fix several bugs with shortcut handling
 - Fix About activity not using pure black title bar in OLED mode
--- a/fastlane/metadata/android/pl-PL/changelogs/153.txt
+++ b/fastlane/metadata/android/pl-PL/changelogs/153.txt
@@ -0,0 +1,4 @@
+- Obsługa systemu Android 16
+- Naprawiono potencjalną awarię po usunięciu obrazu z karty
+- Usunięto funkcję „Orientacja ekranu” (Google usunęło możliwość sterowania obrotem ekranu przez aplikacje w systemie Android 16)
+- Dodano narzędzie do zgłaszania awarii do kompilacji FOSS (nie jest używane w wersji Google Play, tylko w innych sklepach z aplikacjami)
--- a/fastlane/metadata/android/pl-PL/changelogs/154.txt
+++ b/fastlane/metadata/android/pl-PL/changelogs/154.txt
@@ -0,0 +1 @@
+- Naprawiono potencjalną awarię, która mogła wystąpić w przypadku kart bez informacji o kolorze w bazie danych
--- a/fastlane/metadata/android/pl-PL/changelogs/156.txt
+++ b/fastlane/metadata/android/pl-PL/changelogs/156.txt
@@ -0,0 +1,2 @@
+- Dodano kopiowanie identyfikatora karty z „okna dialogowego widoku” lub poprzez „długie kliknięcie” do schowka
+- Zamieniono pola salda i waluty, aby zmniejszyć ryzyko niezamierzonego zaokrąglenia
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
@@ -8,7 +8,7 @@ Dzięki temu niezbędnemu narzędziu codziennego noszenia (CDN) możesz zastąpi
 - Unikaj szpiegowania dzięki niewielkiej liczbie uprawnień. Niepotrzebny dostęp do Internetu oraz brak reklam.
 - Dodaj karty lub kody z nazwami i dostosuj je kolorami.
 - Ręczne wprowadzanie kodu, jeśli nie ma kodu kreskowego do zapisania lub nie można go użyć.
- Importuj karty lub kody z plików „Catima”, „FidMe”, „Loyalty Card Keychain”, „Stocard” oraz „Voucher Vault”.
+- Importuj karty lub kody z plików „Catima”, „FidMe”, „Loyalty Card Keychain” oraz „Voucher Vault”.
 - Utwórz kopię zapasową wszystkich swoich kart i przenieś je na nowe urządzenie, jeśli chcesz.
 - Udostępniaj kupony, ekskluzywne oferty, kody promocyjne lub karty i kody za pomocą dowolnej aplikacji.
 - Ciemny motyw i opcje dostępności dla użytkowników z upośledzeniem wzroku.
Author	SHA1	Message	Date
Sylvia van Os	a9f402cd6d	Merge pull request #2956 from CatimaLoyalty/create-pull-request/patch-1768106786 Update contributors	2026-01-11 09:51:24 +01:00
TheLastProject	2798ba7648	Update contributors	2026-01-11 04:46:26 +00:00
Sylvia van Os	349558e62e	Merge pull request #2955 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2026-01-10 14:32:30 +01:00
Hosted Weblate	91ca2a220e	Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/	2026-01-10 11:04:49 +01:00
m45ked	93104e4b40	Translated using Weblate (Polish) Currently translated at 98.0% (151 of 154 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/	2026-01-10 11:04:49 +01:00
m45ked	d8adcdd1e5	Translated using Weblate (Polish) Currently translated at 100.0% (313 of 313 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/pl/	2026-01-10 11:04:48 +01:00
Maciej Błędkowski	c4b210a8db	Translated using Weblate (Polish) Currently translated at 100.0% (313 of 313 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/pl/	2026-01-10 11:04:48 +01:00
Sylvia van Os	d54323fde0	Merge pull request #2954 from CatimaLoyalty/create-pull-request/patch-1767975957 Update Fastlane changelogs	2026-01-09 17:28:06 +01:00
TheLastProject	c02be50242	Update Fastlane changelogs	2026-01-09 16:25:57 +00:00
				`@@ -0,0 +1 @@`
				`- Naprawiono potencjalną awarię, która mogła wystąpić w przypadku kart bez informacji o kolorze w bazie danych`