From 66d718ffa24acd08fcd0048019a862fda96357f6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 11 Sep 2023 16:20:02 +0200
Subject: [PATCH] Use generic bg executor for LT and DeepL

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 8 +++++---
 app/src/main/java/eu/faircode/email/LanguageTool.java    | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 7698a11f68..d74bb2fe6b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2756,6 +2756,8 @@ public class FragmentCompose extends FragmentBase {
 
                         @Override
                         protected void onExecuted(Bundle args, DeepL.Translation translation) {
+                            if (etSubject == null)
+                                return;
                             etSubject.setText(translation.translated_text);
                         }
 
@@ -2763,7 +2765,7 @@ public class FragmentCompose extends FragmentBase {
                         protected void onException(Bundle args, Throwable ex) {
                             Log.unexpectedError(getParentFragmentManager(), ex, !(ex instanceof IOException));
                         }
-                    }.serial().execute(FragmentCompose.this, args, "compose:translate");
+                    }.execute(FragmentCompose.this, args, "compose:translate");
                 } else {
                     final Pair<Integer, Integer> paragraph = StyleHelper.getParagraph(etBody);
                     if (paragraph == null)
@@ -2890,7 +2892,7 @@ public class FragmentCompose extends FragmentBase {
                             etBody.setSelection(paragraph.second);
                             Log.unexpectedError(getParentFragmentManager(), ex, !(ex instanceof IOException));
                         }
-                    }.serial().execute(FragmentCompose.this, args, "compose:translate");
+                    }.execute(FragmentCompose.this, args, "compose:translate");
                 }
             }
         });
@@ -2970,7 +2972,7 @@ public class FragmentCompose extends FragmentBase {
                     Log.unexpectedError(getParentFragmentManager(), exex, false);
                 }
             }
-        }.serial().execute(this, args, "compose:lt");
+        }.execute(this, args, "compose:lt");
     }
 
     private void onActionRecordAudio() {
diff --git a/app/src/main/java/eu/faircode/email/LanguageTool.java b/app/src/main/java/eu/faircode/email/LanguageTool.java
index 30d240c7f3..c6f530b16a 100644
--- a/app/src/main/java/eu/faircode/email/LanguageTool.java
+++ b/app/src/main/java/eu/faircode/email/LanguageTool.java
@@ -409,6 +409,8 @@ public class LanguageTool {
     }
 
     static void applySuggestions(EditText etBody, int start, int end, List<Suggestion> suggestions) {
+        if (etBody == null)
+            return;
         Editable edit = etBody.getText();
         if (edit == null)
             return;