From 6fb79f3332edcb81d5e85d9113a9889cd4ff301a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 23 Sep 2021 16:17:49 +0200
Subject: [PATCH] Selectively clear styles

---
 .../java/eu/faircode/email/StyleHelper.java   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index b774ed8e2c..fe7d8e258d 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -60,12 +60,28 @@ import com.flask.colorpicker.builder.ColorPickerClickListener;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
 public class StyleHelper {
+    private static final List<Class> CLEAR_STYLES = Collections.unmodifiableList(Arrays.asList(
+            StyleSpan.class,
+            UnderlineSpan.class,
+            RelativeSizeSpan.class,
+            BackgroundColorSpan.class,
+            ForegroundColorSpan.class,
+            AlignmentSpan.class,
+            BulletSpan.class,
+            QuoteSpan.class, IndentSpan.class,
+            StrikethroughSpan.class,
+            URLSpan.class,
+            TypefaceSpan.class
+    ));
+
     static boolean apply(int action, LifecycleOwner owner, View anchor, EditText etBody, Object... args) {
         Log.i("Style action=" + action);
 
@@ -633,16 +649,13 @@ public class StyleHelper {
                             e++;
 
                         for (Object span : edit.getSpans(start, e, Object.class)) {
-                            if (span instanceof ImageSpan || span instanceof SuggestionSpan)
+                            if (!CLEAR_STYLES.contains(span.getClass()))
                                 continue;
 
                             int sstart = edit.getSpanStart(span);
                             int send = edit.getSpanEnd(span);
                             int flags = edit.getSpanFlags(span);
 
-                            if ((flags & Spanned.SPAN_COMPOSING) != 0)
-                                continue;
-
                             if (sstart < start && send > start)
                                 setSpan(edit, span, sstart, start, flags, etBody.getContext());
                             if (sstart < end && send > end)
@@ -703,13 +716,8 @@ public class StyleHelper {
                 Log.breadcrumb("style", "action", "clear/all");
 
                 for (Object span : edit.getSpans(0, etBody.length(), Object.class)) {
-                    if (span instanceof ImageSpan || span instanceof SuggestionSpan)
+                    if (!CLEAR_STYLES.contains(span.getClass()))
                         continue;
-
-                    int flags = edit.getSpanFlags(span);
-                    if ((flags & Spanned.SPAN_COMPOSING) != 0)
-                        continue;
-
                     edit.removeSpan(span);
                 }