Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 11:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small behavior improvement

Browse Source
This commit is contained in:
M66B
2020-01-29 10:06:45 +01:00
parent d8384dfbba
commit 4dfbda4393
2 changed files with 22 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -848,22 +848,13 @@ public class FragmentAccount extends FragmentBase {
host = h.getHost();
}
if (TextUtils.isEmpty(host))
if (should)
return true;
else
if (TextUtils.isEmpty(host) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_host));
if (TextUtils.isEmpty(port))
port = (starttls ? "143" : "993");
if (TextUtils.isEmpty(user))
if (should)
return true;
else
if (TextUtils.isEmpty(user) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (synchronize && TextUtils.isEmpty(password) && !insecure)
if (should)
return true;
else
if (synchronize && TextUtils.isEmpty(password) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
if (TextUtils.isEmpty(interval))
interval = Integer.toString(EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL);

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

@@ -643,58 +643,34 @@ public class FragmentIdentity extends FragmentBase {
host = h.getHost();
}
if (TextUtils.isEmpty(name))
if (should)
return true;
else
if (TextUtils.isEmpty(name) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_name));
if (TextUtils.isEmpty(email))
if (should)
return true;
else
if (TextUtils.isEmpty(email) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_email));
if (!Patterns.EMAIL_ADDRESS.matcher(email).matches())
if (should)
return true;
else
if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() && !should)
throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, email));
if (TextUtils.isEmpty(host))
if (should)
return true;
else
if (TextUtils.isEmpty(host) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_host));
if (TextUtils.isEmpty(port))
port = (starttls ? "587" : "465");
if (TextUtils.isEmpty(user))
if (should)
return true;
else
if (TextUtils.isEmpty(user) && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_user));
if (synchronize && TextUtils.isEmpty(password) && !insecure)
if (should)
return true;
else
if (synchronize && TextUtils.isEmpty(password) && !insecure && !should)
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
if (!TextUtils.isEmpty(replyto)) {
if (!TextUtils.isEmpty(replyto) && !should) {
try {
InternetAddress[] addresses = InternetAddress.parse(replyto);
if (addresses.length != 1)
throw new AddressException();
} catch (AddressException ex) {
if (should)
return true;
else
throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, replyto));
}
}
if (!TextUtils.isEmpty(bcc))
if (!TextUtils.isEmpty(bcc) && !should)
try {
InternetAddress.parse(bcc);
} catch (AddressException ex) {
if (should)
return true;
else
throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, bcc));
}