From d287a45d485af809ffdd01660d2b330af98a340a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 Nov 2023 12:38:41 +0100
Subject: [PATCH] Simplification

---
 .../java/eu/faircode/email/AdapterMessage.java  |  6 +-----
 app/src/main/java/eu/faircode/email/JsonLd.java | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index da06a404cb..604c87b07a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3167,11 +3167,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     // Check for structured email
                     if (json_ld)
                         for (Element struct : document.select("script[type=application/ld+json]"))
-                            try {
-                                document.body().append(new JsonLd(struct.html()).getHtml(context));
-                            } catch (Throwable ex) {
-                                Log.w(ex);
-                            }
+                            document.body().append(new JsonLd(struct.html()).getHtml(context));
 
                     // Format message
                     if (show_full) {
diff --git a/app/src/main/java/eu/faircode/email/JsonLd.java b/app/src/main/java/eu/faircode/email/JsonLd.java
index b26caba1e7..a157cc4768 100644
--- a/app/src/main/java/eu/faircode/email/JsonLd.java
+++ b/app/src/main/java/eu/faircode/email/JsonLd.java
@@ -35,14 +35,23 @@ import java.util.Iterator;
 // https://structured.email/content/introduction/getting_started.html
 
 public class JsonLd {
-    private final JSONObject jroot;
+    private JSONObject jroot;
+    private Throwable error = null;
 
-    public JsonLd(String json) throws JSONException {
-        jroot = new JSONObject(json);
+    public JsonLd(String json) {
+        try {
+            jroot = new JSONObject(json);
+        } catch (Throwable ex) {
+            Log.e(ex);
+            error = ex;
+        }
     }
 
-    public String getHtml(Context context) throws JSONException {
+    public String getHtml(Context context) {
         try {
+            if (error != null)
+                throw error;
+
             Document d = Document.createShell("");
             d.body().appendElement("hr");
             d.body().appendElement("div")