From 4e8c9a0ae23bf5702702562d2932545b7497b9ac Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:10:11 +0100
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/EditTextCompose.java    | 19 +++++++++----------
 app/src/main/res/values/strings.xml           |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index 69c618e6b7..faa6a4fe88 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -117,10 +117,10 @@ public class EditTextCompose extends FixedEditText {
                                 order++, context.getString(R.string.title_insert_brackets));
                         menu.add(Menu.CATEGORY_SECONDARY, R.string.title_insert_quotes,
                                 order++, context.getString(R.string.title_insert_quotes));
-                        menu.add(Menu.CATEGORY_SECONDARY, R.string.title_dictionary_add,
-                                order++, context.getString(R.string.title_dictionary_add));
-                        menu.add(Menu.CATEGORY_SECONDARY, R.string.title_dictionary_delete,
-                                order++, context.getString(R.string.title_dictionary_delete));
+                        menu.add(Menu.CATEGORY_SECONDARY, R.string.title_lt_add,
+                                order++, context.getString(R.string.title_lt_add));
+                        menu.add(Menu.CATEGORY_SECONDARY, R.string.title_lt_delete,
+                                order++, context.getString(R.string.title_lt_delete));
                     } catch (Throwable ex) {
                         Log.e(ex);
                     }
@@ -134,16 +134,15 @@ public class EditTextCompose extends FixedEditText {
                     boolean selection = (start >= 0 && start < end);
                     Context context = getContext();
                     Editable edit = getText();
-                    boolean dictionary = (BuildConfig.DEBUG &&
+                    boolean dictionary = (selection &&
                             context instanceof AppCompatActivity &&
                             LanguageTool.isPremium(context) &&
-                            selection &&
                             edit != null &&
                             edit.subSequence(start, end).toString().indexOf(' ') < 0);
                     menu.findItem(R.string.title_insert_brackets).setVisible(selection);
                     menu.findItem(R.string.title_insert_quotes).setVisible(selection);
-                    menu.findItem(R.string.title_dictionary_add).setVisible(dictionary);
-                    menu.findItem(R.string.title_dictionary_delete).setVisible(dictionary);
+                    menu.findItem(R.string.title_lt_add).setVisible(dictionary);
+                    menu.findItem(R.string.title_lt_delete).setVisible(dictionary);
                     return false;
                 }
 
@@ -155,9 +154,9 @@ public class EditTextCompose extends FixedEditText {
                             return surround("(", ")");
                         else if (id == R.string.title_insert_quotes)
                             return surround("\"", "\"");
-                        else if (id == R.string.title_dictionary_add)
+                        else if (id == R.string.title_lt_add)
                             return modifyDictionary(true);
-                        else if (id == R.string.title_dictionary_delete)
+                        else if (id == R.string.title_lt_delete)
                             return modifyDictionary(false);
                     }
                     return false;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82043e30b4..544a5430ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1966,8 +1966,8 @@
     <string name="title_select_block">Select block</string>
     <string name="title_insert_brackets">Bracket</string>
     <string name="title_insert_quotes">Quote</string>
-    <string name="title_dictionary_add" translatable="false">Add word</string>
-    <string name="title_dictionary_delete" translatable="false">Delete word</string>
+    <string name="title_lt_add">Add word</string>
+    <string name="title_lt_delete">Remove word</string>
     <string name="title_add">Add</string>
     <string name="title_browse">Open with</string>
     <string name="title_info">Info</string>