From e097ddd0b402cc155f4043ea1aa6c61dcda3e76c Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 26 Apr 2023 09:32:10 -0500 Subject: [PATCH] Fix NPE --- src/cheogram/java/com/cheogram/android/WebxdcPage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cheogram/java/com/cheogram/android/WebxdcPage.java b/src/cheogram/java/com/cheogram/android/WebxdcPage.java index 37b61319f7f2da55eb66c42c18ef7f319d8b7acb..66390d91063fec7cfdfabd18db7e2153e31b9b99 100644 --- a/src/cheogram/java/com/cheogram/android/WebxdcPage.java +++ b/src/cheogram/java/com/cheogram/android/WebxdcPage.java @@ -84,7 +84,7 @@ public class WebxdcPage implements ConversationPage { File f = xmppConnectionService.getFileForCid(cid); try { if (f != null) zip = new ZipFile(xmppConnectionService.getFileForCid(cid)); - final ZipEntry manifestEntry = zip.getEntry("manifest.toml"); + final ZipEntry manifestEntry = zip == null ? null : zip.getEntry("manifest.toml"); if (manifestEntry != null) { manifest = Toml.parse(zip.getInputStream(manifestEntry)); } @@ -101,6 +101,7 @@ public class WebxdcPage implements ConversationPage { public Drawable getIcon() { if (android.os.Build.VERSION.SDK_INT < 28) return null; + if (zip == null) return null; ZipEntry entry = zip.getEntry("icon.webp"); if (entry == null) entry = zip.getEntry("icon.png"); if (entry == null) entry = zip.getEntry("icon.jpg");