From 696c2a5c602b7f04c47f1b513d341505a32dc948 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 16 Sep 2023 09:21:32 +0200
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/EditTextCompose.java    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index 0a4703d92c..a2cf448508 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -111,8 +111,9 @@ public class EditTextCompose extends FixedEditText {
         boolean undo_manager = prefs.getBoolean("undo_manager", false);
 
         addTextChangedListener(new TextWatcher() {
-            private Integer left;
-            private Integer right;
+            private Integer replace;
+            private Integer length;
+            private String what;
             private boolean replacing = false;
 
             @Override
@@ -128,29 +129,29 @@ public class EditTextCompose extends FixedEditText {
                     if (c == '>' &&
                             text.charAt(index - 1) == '-' &&
                             text.charAt(index - 2) == '-') {
-                        left = index - 2;
+                        replace = index - 2;
+                        length = 3;
+                        what = "→";
                     } else if (c == '-' &&
                             text.charAt(index - 1) == '-' &&
                             text.charAt(index - 2) == '<') {
-                        right = index - 2;
+                        replace = index - 2;
+                        length = 3;
+                        what = "←";
                     }
                 }
             }
 
             @Override
             public void afterTextChanged(Editable text) {
-                if (!replacing && (left != null || right != null))
+                if (!replacing && replace != null)
                     try {
                         replacing = true;
-                        if (left != null)
-                            text.replace(left, left + 3, "\u2192"); // ←
-                        else if (right != null)
-                            text.replace(right, right + 3, "\u2190"); // →
+                        text.replace(replace, replace + length, what);
                     } catch (Throwable ex) {
                         Log.e(ex);
                     } finally {
-                        left = null;
-                        right = null;
+                        replace = null;
                         replacing = false;
                     }
             }