From 5fb25a708de7f051b52392409c4ac7f10e34b67d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 27 Mar 2023 18:22:44 +0200
Subject: [PATCH] Simple task: spanned by value

---
 app/src/main/java/eu/faircode/email/HtmlEx.java     | 4 ----
 app/src/main/java/eu/faircode/email/SimpleTask.java | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlEx.java b/app/src/main/java/eu/faircode/email/HtmlEx.java
index f2de37f388..451a3f16cd 100644
--- a/app/src/main/java/eu/faircode/email/HtmlEx.java
+++ b/app/src/main/java/eu/faircode/email/HtmlEx.java
@@ -78,10 +78,6 @@ public class HtmlEx {
      * @return string containing input converted to HTML
      */
     public /* static */ String toHtml(Spanned text, int option) {
-        if (!Helper.isUiThread()) {
-            text = new SpannableStringBuilderEx(text);
-            BaseInputConnection.removeComposingSpans((Spannable) text);
-        }
         StringBuilder out = new StringBuilder();
         withinHtml(out, text, option);
         return out.toString();
diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index 531a77cd36..0217160ba8 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -25,6 +25,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.text.Spanned;
 import android.view.ContextThemeWrapper;
 
 import androidx.annotation.NonNull;
@@ -167,6 +168,12 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
         this.name = name;
         this.started = new Date().getTime();
 
+        for (String key : args.keySet()) {
+            Object value = args.get(key);
+            if (value instanceof Spanned)
+                args.putCharSequence(key, new SpannableStringBuilderEx((Spanned) value));
+        }
+
         if (owner instanceof TwoStateOwner)
             Log.e(new Throwable("SimpleTask/TwoStateOwner"));