From b70e9fd085cbcb34e59473b0887f9ea3eec32f10 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 May 2024 08:32:18 +0200
Subject: [PATCH] Added fail safe

---
 .../java/eu/faircode/email/AdapterMessage.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4ef3014e65..3671430674 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2572,14 +2572,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         }
 
                         Matcher m = Helper.EMAIL_ADDRESS.matcher(personal);
-                        while (m.find()) {
-                            String e = personal.substring(m.start(), m.end());
-                            if (!e.equalsIgnoreCase(email)) {
-                                int start = ssb.length() - personal.length();
-                                ssb.setSpan(new StyleSpan(Typeface.BOLD), start + m.start(), start + m.end(), 0);
-                                ssb.setSpan(new ForegroundColorSpan(colorError), start + m.start(), start + m.end(), 0);
+                        while (m.find())
+                            try {
+                                String e = personal.substring(m.start(), m.end());
+                                if (!e.equalsIgnoreCase(email)) {
+                                    int start = ssb.length() - personal.length();
+                                    ssb.setSpan(new StyleSpan(Typeface.BOLD), start + m.start(), start + m.end(), 0);
+                                    ssb.setSpan(new ForegroundColorSpan(colorError), start + m.start(), start + m.end(), 0);
+                                }
+                            } catch (Throwable ex) {
+                                Log.e(ex);
+                                break;
                             }
-                        }
 
                         if (full) {
                             ssb.append(" <");