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

Merge pull request #2963 from CatimaLoyalty/fix/pkpassEncodingCrashSafety

Browse Source 
Fix crash risk on pkpass encoding
This commit is contained in:
Sylvia van Os
2026-01-15 20:43:32 +01:00
committed by GitHub
parent 442c7c28d4 d5b3796ae9
commit cabae400e6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/protect/card_locker/PkpassParser.kt
View File

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