mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow empty username

This commit is contained in:
M66B 2021-03-11 10:18:04 +01:00
parent f912c9346f
commit c3e6d15bb6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/EmailService.java
View File

@ -593,6 +593,9 @@ public class EmailService implements AutoCloseable {
//System.setProperty("mail.socket.debug", Boolean.toString(debug));
isession.addProvider(new GmailSSLProvider());
if (TextUtils.isEmpty(user))
user = null;
if ("pop3".equals(protocol) || "pop3s".equals(protocol)) {
iservice = isession.getStore(protocol);
iservice.connect(address.getHostAddress(), port, user, null);

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -649,7 +649,7 @@ public class FragmentAccount extends FragmentBase {
throw new IllegalArgumentException(context.getString(R.string.title_no_host));
if (TextUtils.isEmpty(port))
port = (encryption == EmailService.ENCRYPTION_SSL ? "993" : "143");
if (TextUtils.isEmpty(user))
if (TextUtils.isEmpty(user) && !insecure)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (TextUtils.isEmpty(password) && !insecure && certificate == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
@ -899,7 +899,7 @@ public class FragmentAccount extends FragmentBase {
throw new IllegalArgumentException(context.getString(R.string.title_no_host));
if (TextUtils.isEmpty(port))
port = (encryption == EmailService.ENCRYPTION_SSL ? "993" : "143");
if (TextUtils.isEmpty(user) && !should)
if (TextUtils.isEmpty(user) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (synchronize && TextUtils.isEmpty(password) && !insecure && certificate == null && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));

2
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@ -721,7 +721,7 @@ public class FragmentIdentity extends FragmentBase {
port = "25";
else
port = "465";
if (TextUtils.isEmpty(user) && !should)
if (TextUtils.isEmpty(user) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (synchronize && TextUtils.isEmpty(password) && !insecure && certificate == null && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));

2
app/src/main/java/eu/faircode/email/FragmentPop.java
View File

@ -365,7 +365,7 @@ public class FragmentPop extends FragmentBase {
throw new IllegalArgumentException(context.getString(R.string.title_no_host));
if (TextUtils.isEmpty(port))
port = (encryption == EmailService.ENCRYPTION_SSL ? "995" : "110");
if (TextUtils.isEmpty(user) && !should)
if (TextUtils.isEmpty(user) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (synchronize && TextUtils.isEmpty(password) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));