Fix crash risk on pkpass encoding

2026-01-25 15:28:21 -05:00 · 2026-01-15 18:14:55 +01:00
parent 442c7c28d4
commit d5b3796ae9
1 changed files with 5 additions and 1 deletions
--- a/app/src/main/java/protect/card_locker/PkpassParser.kt
+++ b/app/src/main/java/protect/card_locker/PkpassParser.kt
@@ -354,7 +354,11 @@ class PkpassParser(context: Context, uri: Uri?) {
            barcodeId = null
        }

-        barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
+        try {
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
+        } catch (ignored: Exception) {
+            // If encoding is not defined, null or otherwise invalid, stick to the default
+        }

        // Don't set barcodeId if it's the same as cardId
        if (cardId == barcodeId) {