From f4237392fed03d5bda99896e2bcc0a50d3c0111f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 1 Dec 2023 21:58:06 +0100
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../email/FragmentDialogOpenLink.java         |  2 +-
 .../main/java/eu/faircode/email/Helper.java   | 26 -------------------
 .../java/eu/faircode/email/TextHelper.java    | 26 +++++++++++++++++++
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3f5a0d2b4f..eb15d80131 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2518,7 +2518,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         }
                     } else {
                         ssb.append(personal);
-                        if (!Helper.isSingleScript(personal)) {
+                        if (!TextHelper.isSingleScript(personal)) {
                             int start = ssb.length() - personal.length();
                             ssb.setSpan(new StrikethroughSpan(), start, ssb.length(), 0);
                             ssb.setSpan(new ForegroundColorSpan(colorError), start, ssb.length(), 0);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 332b854839..5eda75ca13 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -538,7 +538,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         } else {
             etLink.setText(format(uri, context));
             tvLink.setText(null);
-            tvSuspicious.setVisibility(Helper.isSingleScript(host) ? View.GONE : View.VISIBLE);
+            tvSuspicious.setVisibility(TextHelper.isSingleScript(host) ? View.GONE : View.VISIBLE);
         }
 
         if (check_links_dbl &&
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 103e3733d5..3dbc7b78aa 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2448,32 +2448,6 @@ public class Helper {
         return false;
     }
 
-    static boolean isSingleScript(String s) {
-        // https://en.wikipedia.org/wiki/IDN_homograph_attack
-
-        if (TextUtils.isEmpty(s))
-            return true;
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
-            return true;
-
-        int codepoint;
-        Character.UnicodeScript us;
-        Character.UnicodeScript script = null;
-        for (int i = 0; i < s.length(); ) {
-            codepoint = s.codePointAt(i);
-            i += Character.charCount(codepoint);
-            us = Character.UnicodeScript.of(codepoint);
-            if (us.equals(Character.UnicodeScript.COMMON))
-                continue;
-            if (script == null)
-                script = us;
-            else if (!us.equals(script))
-                return false;
-        }
-        return true;
-    }
-
     static Integer parseInt(String text) {
         if (TextUtils.isEmpty(text))
             return null;
diff --git a/app/src/main/java/eu/faircode/email/TextHelper.java b/app/src/main/java/eu/faircode/email/TextHelper.java
index fbf377ccac..644905e172 100644
--- a/app/src/main/java/eu/faircode/email/TextHelper.java
+++ b/app/src/main/java/eu/faircode/email/TextHelper.java
@@ -128,6 +128,32 @@ public class TextHelper {
         }
     }
 
+    static boolean isSingleScript(String s) {
+        // https://en.wikipedia.org/wiki/IDN_homograph_attack
+
+        if (TextUtils.isEmpty(s))
+            return true;
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
+            return true;
+
+        int codepoint;
+        Character.UnicodeScript us;
+        Character.UnicodeScript script = null;
+        for (int i = 0; i < s.length(); ) {
+            codepoint = s.codePointAt(i);
+            i += Character.charCount(codepoint);
+            us = Character.UnicodeScript.of(codepoint);
+            if (us.equals(Character.UnicodeScript.COMMON))
+                continue;
+            if (script == null)
+                script = us;
+            else if (!us.equals(script))
+                return false;
+        }
+        return true;
+    }
+
     static String normalizeNotification(Context context, String text) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean notify_transliterate = prefs.getBoolean("notify_transliterate", false);