Refactoring

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

@@ -365,12 +365,13 @@ public class EmailService implements AutoCloseable {
                 throw ex;
         } catch (MailConnectException ex) {
             if (ConnectionHelper.vpnActive(context)) {
-                MailConnectException mex = new MailConnectException(new SocketConnectException(
+                MailConnectException mex = new MailConnectException(
-                        context.getString(R.string.title_service_vpn),
+                        new SocketConnectException(
-                        new Exception(),
+                                context.getString(R.string.title_service_vpn),
-                        ex.getHost(),
+                                new Exception(),
-                        ex.getPort(),
+                                ex.getHost(),
-                        ex.getConnectionTimeout()));
+                                ex.getPort(),
+                                ex.getConnectionTimeout()));
                 mex.setNextException(ex.getNextException());
                 throw mex;
             } else