From 75c393af92cbef6e056e741d29917a7bf88237d5 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 12 Dec 2024 17:13:49 +0100
Subject: [PATCH] Fix crash when trying to load invalid pkpass file

---
 app/src/main/java/protect/card_locker/Utils.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java
index 6817605d2..473a9da40 100644
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -180,10 +180,17 @@ public class Utils {
         if (uri == null) {
             Log.e(TAG, "Pkpass did not contain any data");
             Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-            return null;
+            return new ArrayList<>();
         }
 
-        PkpassParser pkpassParser = new PkpassParser(context, uri);
+        PkpassParser pkpassParser;
+        try {
+             pkpassParser = new PkpassParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpass file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
 
         List<String> locales = pkpassParser.listLocales();
         if (locales.isEmpty()) {