|
|
@ -750,7 +750,12 @@ public class IMAPStore extends Store
|
|
|
|
if (p.hasCapability("STARTTLS")) {
|
|
|
|
if (p.hasCapability("STARTTLS")) {
|
|
|
|
p.startTLS();
|
|
|
|
p.startTLS();
|
|
|
|
// if startTLS succeeds, refresh capabilities
|
|
|
|
// if startTLS succeeds, refresh capabilities
|
|
|
|
|
|
|
|
boolean logindisabled = p.hasCapability("LOGINDISABLED");
|
|
|
|
p.capability();
|
|
|
|
p.capability();
|
|
|
|
|
|
|
|
if (logindisabled && !p.hasCapability("LOGINDISABLED")) {
|
|
|
|
|
|
|
|
eu.faircode.email.Log.e("Preserving LOGINDISABLED");
|
|
|
|
|
|
|
|
p.setCapability("LOGINDISABLED");
|
|
|
|
|
|
|
|
}
|
|
|
|
} else if (requireStartTLS) {
|
|
|
|
} else if (requireStartTLS) {
|
|
|
|
logger.fine("STARTTLS required but not supported by server");
|
|
|
|
logger.fine("STARTTLS required but not supported by server");
|
|
|
|
throw new ProtocolException(
|
|
|
|
throw new ProtocolException(
|
|
|
|