From a11f45b2f009a3b454b20728416b2490efa96343 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 14 Mar 2021 19:51:45 +0100 Subject: [PATCH] Revert "Preserving LOGINDISABLED" This reverts commit e71cf9ee4dd28ea8cc016b162a9b1099aa41ee59. --- app/src/main/java/com/sun/mail/imap/IMAPStore.java | 5 ----- .../main/java/com/sun/mail/imap/protocol/IMAPProtocol.java | 4 ---- 2 files changed, 9 deletions(-) diff --git a/app/src/main/java/com/sun/mail/imap/IMAPStore.java b/app/src/main/java/com/sun/mail/imap/IMAPStore.java index 9b4f5d4d86..3527ce1598 100644 --- a/app/src/main/java/com/sun/mail/imap/IMAPStore.java +++ b/app/src/main/java/com/sun/mail/imap/IMAPStore.java @@ -750,12 +750,7 @@ public class IMAPStore extends Store if (p.hasCapability("STARTTLS")) { p.startTLS(); // if startTLS succeeds, refresh capabilities - boolean logindisabled = p.hasCapability("LOGINDISABLED"); p.capability(); - if (logindisabled && !p.hasCapability("LOGINDISABLED")) { - eu.faircode.email.Log.e("Preserving LOGINDISABLED"); - p.setCapability("LOGINDISABLED"); - } } else if (requireStartTLS) { logger.fine("STARTTLS required but not supported by server"); throw new ProtocolException( diff --git a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java index a32101d0f0..85727902ad 100644 --- a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java +++ b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java @@ -412,10 +412,6 @@ public class IMAPProtocol extends Protocol { return capabilities.containsKey(c.toUpperCase(Locale.ENGLISH)); } - public void setCapability(String c) { - capabilities.put(c.toUpperCase(Locale.ENGLISH), c); - } - /** * Return the map of capabilities returned by the server. *