From e3b053e2607a8b7280cc8ac0ebc26ef864e9dff5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Jun 2021 13:45:28 +0200
Subject: [PATCH] Cleanup

---
 app/src/main/java/eu/faircode/email/Core.java | 46 -------------------
 .../java/eu/faircode/email/MessageHelper.java | 22 ---------
 2 files changed, 68 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 856689782c..8ff56c4295 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -80,9 +80,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
@@ -3349,49 +3346,6 @@ class Core {
                     message.warning = Log.formatThrowable(ex, false);
                 }
 
-            boolean check_spam = prefs.getBoolean("check_spam", false);
-            if (check_spam) {
-                String host = helper.getReceivedFromHost();
-                if (host != null) {
-                    try {
-                        InetAddress addr = InetAddress.getByName(host);
-                        Log.i("Received from " + host + "=" + addr);
-
-                        StringBuilder lookup = new StringBuilder();
-                        if (addr instanceof Inet4Address) {
-                            List<String> a = Arrays.asList(addr.getHostAddress().split("\\."));
-                            Collections.reverse(a);
-                            lookup.append(TextUtils.join(".", a)).append('.');
-                        } else if (addr instanceof Inet6Address) {
-                            StringBuilder sb = new StringBuilder();
-                            byte[] a = addr.getAddress();
-                            for (int i = 0; i < 8; i++)
-                                sb.append(String.format("%02x",
-                                        ((a[i << 1] << 8) & 0xff00) | (a[(i << 1) + 1] & 0xff)));
-                            sb.reverse();
-                            for (char kar : sb.toString().toCharArray())
-                                lookup.append(kar).append('.');
-                        }
-
-                        lookup.append("zen.spamhaus.org");
-
-                        try {
-                            InetAddress.getByName(lookup.toString());
-                            if (message.warning == null)
-                                message.warning = lookup.toString();
-                            else
-                                message.warning += ", " + lookup;
-                        } catch (UnknownHostException ignore) {
-                            // Not blocked
-                        }
-                    } catch (UnknownHostException ex) {
-                        Log.w(ex);
-                    } catch (Throwable ex) {
-                        Log.w(folder.name, ex);
-                    }
-                }
-            }
-
             try {
                 db.beginTransaction();
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 49f58febdf..9f716c13c2 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1203,28 +1203,6 @@ public class MessageHelper {
         return result;
     }
 
-    String getReceivedFromHost() throws MessagingException {
-        ensureHeaders();
-
-        String[] received = imessage.getHeader("Received");
-        if (received == null || received.length == 0)
-            return null;
-
-        String origin = MimeUtility.unfold(received[received.length - 1]);
-
-        String[] h = origin.split("\\s+");
-        if (h.length > 1 && h[0].equalsIgnoreCase("from")) {
-            String host = h[1];
-            int s = origin.indexOf('[');
-            int e = origin.indexOf(']');
-            if (s > 0 && e > s + 1)
-                host = origin.substring(s + 1, e);
-            return host;
-        }
-
-        return null;
-    }
-
     private String fixEncoding(String name, String header) {
         if (header.trim().startsWith("=?"))
             return header;