From 672796cd6ef3d02c320df2189360b200cb7c8290 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 12 Nov 2021 08:21:35 +0100
Subject: [PATCH] Added iCloud recognition

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++++
 app/src/main/res/drawable/infra_icloud.xml             | 9 +++++++++
 app/src/main/res/values/strings.xml                    | 1 +
 3 files changed, 14 insertions(+)
 create mode 100644 app/src/main/res/drawable/infra_icloud.xml

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 4cd4d5cc11..570cd592b5 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1732,6 +1732,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(yahoo))
             return "yahoo";
 
+        String icloud = imessage.getHeader("X-Proofpoint-Spam-Details", null);
+        if (!TextUtils.isEmpty(icloud)) // X-Mailer: iPhone Mail ...
+            return "icloud";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_icloud.xml b/app/src/main/res/drawable/infra_icloud.xml
new file mode 100644
index 0000000000..bf37dd8770
--- /dev/null
+++ b/app/src/main/res/drawable/infra_icloud.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="511.938dp"
+    android:height="511.938dp"
+    android:viewportWidth="511.938"
+    android:viewportHeight="511.938">
+  <path
+      android:pathData="M404.848,192.411c-5.442,-64.36 -62.028,-112.122 -126.387,-106.68c-34.642,2.929 -66.184,21.119 -86.071,49.634c-37.144,-17.913 -81.776,-2.323 -99.688,34.821c-3.961,8.214 -6.384,17.084 -7.149,26.171c-62.374,17.569 -98.696,82.376 -81.127,144.75c14.241,50.558 60.346,85.492 112.871,85.522h277.333c64.801,-0.014 117.322,-52.557 117.309,-117.358C511.925,248.449 465.437,197.721 404.848,192.411z"
+      android:fillColor="#2196F3"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80cbde42bd..482668402b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1812,6 +1812,7 @@
     <string name="infra_awsses" translatable="false">Amazon SES</string>
     <string name="infra_elastic" translatable="false">Elastic Email</string>
     <string name="infra_gmail" translatable="false">Gmail/Gsuite</string>
+    <string name="infra_icloud" translatable="false">Apple/iCloud</string>
     <string name="infra_mailchimp" translatable="false">Mailchimp</string>
     <string name="infra_mailgun" translatable="false">Mailgun</string>
     <string name="infra_mailjet" translatable="false">Mailjet</string>