Merge pull request #2389 from CatimaLoyalty/fix/pkpassCrash

Fix pkpass reading crashing Catima

Author: TheLastProject

app/src/main/java/protect/card_locker/Utils.java

@@ -198,12 +198,25 @@ static public List<ParseResult> retrieveBarcodesFromPkPass(Context context, Uri
 
         List<String> locales = pkpassParser.listLocales();
         if (locales.isEmpty()) {
-            return Collections.singletonList(new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null)));
+            try {
+                return Collections.singletonList(new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null)));
+            } catch (Exception e) {
+                Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
         }
 
         List<ParseResult> parseResultList = new ArrayList<>();
         for (String locale : locales) {
-            ParseResult parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+            ParseResult parseResult;
+            try {
+                 parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+            } catch (Exception e) {
+                Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
             parseResult.setNote(locale);
             parseResultList.add(parseResult);
         }