From 75d7c4ee2cf65b6d5d445276174c69208e5a8e14 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 8 Jan 2022 12:42:30 +0100 Subject: [PATCH] Specific TLS phrases --- FAQ.md | 2 +- app/src/main/java/eu/faircode/email/MessageHelper.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FAQ.md b/FAQ.md index c320f22930..0842ccb1c7 100644 --- a/FAQ.md +++ b/FAQ.md @@ -4473,7 +4473,7 @@ To show shields, the option *Show authentication status indicator* in the displa A message will be consired safely transported if every [Received](https://datatracker.ietf.org/doc/html/rfc2821#section-4.4) header: -* contains the word 'TLS' +* contains the phrase 'using TLS' or 'version=TLS' * contains the phrase 'qmail invoked by uid ' * has a *by* with a local address (site local or localhost) * has a *from* with a local address diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 5ceb43546a..460000cd8a 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2061,7 +2061,8 @@ public class MessageHelper { if (semi > 0) header = header.substring(0, semi); - if (header.contains("TLS")) { + if (header.contains("using TLS") || + header.contains("version=TLS")) { Log.i("--- found TLS"); continue; }