From 0b59e388cd5a09008c7776c6f64ac342b891b646 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 30 Jul 2020 18:01:20 +0200
Subject: [PATCH] Handle "501 HELO requires valid address"

---
 app/src/main/java/eu/faircode/email/ConnectionHelper.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index c0cafca692..b471506738 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -354,7 +354,11 @@ public class ConnectionHelper {
     static Boolean isSyntacticallyInvalid(Throwable ex) {
         if (ex.getMessage() == null)
             return false;
-        return ex.getMessage().toLowerCase(Locale.ROOT).contains("syntactically invalid");
+        // 501 HELO requires valid address
+        // 501 Syntactically invalid HELO argument(s)
+        String message = ex.getMessage().toLowerCase(Locale.ROOT);
+        return message.contains("syntactically invalid") ||
+                message.contains("requires valid address");
     }
 
     static boolean vpnActive(Context context) {