From cbfccc50b8cf91cb5064ade1f9cd472627bedd31 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:53:10 +0100
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterAttachment.java  |  2 +-
 .../eu/faircode/email/EntityAttachment.java   | 22 +++++++++++++++++++
 .../eu/faircode/email/FragmentCompose.java    |  2 +-
 .../main/java/eu/faircode/email/Helper.java   | 20 -----------------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 3ab2bc724d..7c09ee95dd 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -167,7 +167,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                                 ? View.VISIBLE : View.INVISIBLE);
             }
 
-            boolean dangerous = Helper.DANGEROUS_EXTENSIONS.contains(Helper.getExtension(attachment.name));
+            boolean dangerous = EntityAttachment.DANGEROUS_EXTENSIONS.contains(Helper.getExtension(attachment.name));
             tvName.setText(attachment.name);
             tvName.setTextColor(dangerous ? colorWarning : textColorPrimary);
             tvName.setTypeface(null, dangerous ? Typeface.BOLD : Typeface.NORMAL);
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 45629e3f27..9bb16cde3a 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -42,6 +42,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -76,6 +78,26 @@ public class EntityAttachment {
 
     static final String VCARD_PREFIX = BuildConfig.APPLICATION_ID + ".vcard.";
 
+    // https://support.google.com/mail/answer/6590#zippy=%2Cmessages-that-have-attachments
+    static final List<String> DANGEROUS_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
+            "ade", "adp", "apk", "appx", "appxbundle",
+            "bat",
+            "cab", "chm", "cmd", "com", "cpl",
+            "dll", "dmg",
+            "ex", "ex_", "exe",
+            "hta",
+            "ins", "isp", "iso",
+            "jar", "js", "jse",
+            "lib", "lnk",
+            "mde", "msc", "msi", "msix", "msixbundle", "msp", "mst",
+            "nsh",
+            "pif", "ps1",
+            "rdp", // https://www.microsoft.com/en-us/security/blog/2024/10/29/midnight-blizzard-conducts-large-scale-spear-phishing-campaign-using-rdp-files/
+            "scr", "sct", "shb", "sys",
+            "vb", "vbe", "vbs", "vxd",
+            "wsc", "wsf", "wsh"
+    ));
+
     @PrimaryKey(autoGenerate = true)
     public Long id;
     public String section;
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a3aa5a67d8..7d5e463610 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7438,7 +7438,7 @@ public class FragmentCompose extends FragmentBase {
                                 else if (attachment.isAttachment())
                                     attached++;
                                 String ext = Helper.getExtension(attachment.name);
-                                if (Helper.DANGEROUS_EXTENSIONS.contains(ext))
+                                if (EntityAttachment.DANGEROUS_EXTENSIONS.contains(ext))
                                     dangerous.add(attachment.name);
                             }
                             if (dangerous.size() > 0)
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 398af213e2..21a851bdc4 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -261,26 +261,6 @@ public class Helper {
                     ")+"
     );
 
-    // https://support.google.com/mail/answer/6590#zippy=%2Cmessages-that-have-attachments
-    static final List<String> DANGEROUS_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
-            "ade", "adp", "apk", "appx", "appxbundle",
-            "bat",
-            "cab", "chm", "cmd", "com", "cpl",
-            "dll", "dmg",
-            "ex", "ex_", "exe",
-            "hta",
-            "ins", "isp", "iso",
-            "jar", "js", "jse",
-            "lib", "lnk",
-            "mde", "msc", "msi", "msix", "msixbundle", "msp", "mst",
-            "nsh",
-            "pif", "ps1",
-            "rdp", // https://www.microsoft.com/en-us/security/blog/2024/10/29/midnight-blizzard-conducts-large-scale-spear-phishing-campaign-using-rdp-files/
-            "scr", "sct", "shb", "sys",
-            "vb", "vbe", "vbs", "vxd",
-            "wsc", "wsf", "wsh"
-    ));
-
     private static ExecutorService sSerialExecutor = null;
     private static ExecutorService sParallelExecutor = null;
     private static ExecutorService sUIExecutor = null;