Refactoring

app/src/main/java/eu/faircode/email/EmailService.java

@@ -593,9 +593,6 @@ public class EmailService implements AutoCloseable {
             if (ex.getMessage() != null && ex.getMessage().contains("Command Error. 10"))
                 throw new AuthenticationFailedException(context.getString(R.string.title_service_error10), ex);
 
-            if (ConnectionHelper.isAborted(ex))
-                throw new MessagingException(context.getString(R.string.title_service_abort), ex);
-
             if (purpose == PURPOSE_CHECK) {
                 if (port == 995 && !("pop3".equals(protocol) || "pop3s".equals(protocol)))
                     throw new MessagingException(context.getString(R.string.title_service_port), ex);

app/src/main/java/eu/faircode/email/Log.java

@@ -1758,6 +1758,9 @@ public class Log {
                 ex.getCause() instanceof UnknownHostException)
             ex = new Throwable("Email server address lookup failed", ex);
 
+        if (ConnectionHelper.isAborted(ex))
+            ex = new Throwable("The server or network actively disconnected the connection", ex);
+
         StringBuilder sb = new StringBuilder();
         if (BuildConfig.DEBUG)
             sb.append(new ThrowableWrapper(ex).toSafeString());

app/src/main/res/values/strings.xml

@@ -1304,7 +1304,6 @@
     <string name="title_service_port">Please double check the port number</string>
     <string name="title_service_protocol">Please double check the protocol (SSL/TLS or STARTTLS)</string>
     <string name="title_service_error10">This account needs to be authenticated again, which can be done via the quick setup wizard</string>
-    <string name="title_service_abort">The server or network actively disconnected the connection</string>
     <string name="title_certificate_error">
         Due to Google\'s Play Store policies, it is no longer possible to support insecure connections to email servers with certificate issues for the version of FairEmail distributed in the Play Store.
         Therefore, this issue can only be resolved by your email provider - the above error information may help them resolve this issue.