From 3f4d0ab5dfb1e6fbc417590f022aaab84153ddcb Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Wed, 18 Dec 2019 12:18:32 +0100 Subject: [PATCH] Grab highest quality icon --- app/src/main/java/protect/card_locker/PkpassImporter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/PkpassImporter.java b/app/src/main/java/protect/card_locker/PkpassImporter.java index 7a77f61f4..8afc0a260 100644 --- a/app/src/main/java/protect/card_locker/PkpassImporter.java +++ b/app/src/main/java/protect/card_locker/PkpassImporter.java @@ -53,6 +53,11 @@ public class PkpassImporter { private void loadBitmap(ByteArrayOutputStream byteArrayOutputStream) { byte[] bytes = byteArrayOutputStream.toByteArray(); + // Only keep the largest icon + if(icon != null && bytes.length < icon.getByteCount()) + { + return; + } icon = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); } @@ -171,7 +176,7 @@ public class PkpassImporter { { passJSONString = readZipInputStream(zipInputStream).toString("UTF-8"); } - else if(entry.getName().equals("icon.png")) + else if(entry.getName().equals("icon.png") || entry.getName().equals("icon@2x.png")) { loadBitmap(readZipInputStream(zipInputStream)); }