From 2db90c3c31ba80bb0816df043281e6ec8ac34841 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 23 Dec 2021 12:10:19 +0100 Subject: [PATCH] Recognize infra not client --- .../main/java/eu/faircode/email/MessageHelper.java | 14 +++++++------- app/src/main/res/layout/fragment_options_misc.xml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 6a0ee9d1b8..3ad0b77444 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2002,9 +2002,9 @@ public class MessageHelper { if (!TextUtils.isEmpty(icloud)) return "icloud"; - String zoho = imessage.getHeader("X-ZohoMailClient", null); - if (!TextUtils.isEmpty(zoho)) - return "zoho"; + //String zoho = imessage.getHeader("X-ZohoMailClient", null); + //if (!TextUtils.isEmpty(zoho)) + // return "zoho"; String icontact = imessage.getHeader("X-SFMC-Stack", null); if (!TextUtils.isEmpty(icontact)) @@ -2016,12 +2016,12 @@ public class MessageHelper { String xmailer = imessage.getHeader("X-Mailer", null); if (!TextUtils.isEmpty(xmailer)) { - if (xmailer.contains("iPhone Mail")) - return "icloud"; + //if (xmailer.contains("iPhone Mail")) + // return "icloud"; if (xmailer.contains("PHPMailer")) return "phpmailer"; - if (xmailer.contains("Zoho Mail")) - return "zoho"; + //if (xmailer.contains("Zoho Mail")) + // return "zoho"; } String return_path = imessage.getHeader("Return-Path", null); diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index 1b7d2d68f1..79f5611413 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -1129,6 +1129,7 @@ android:layout_height="24dp" android:contentDescription="@string/infra_zoho" android:tooltipText="@string/infra_zoho" + android:visibility="gone" app:srcCompat="@drawable/infra_zoho" tools:ignore="MissingConstraints" />