From 4dfbda4393c704b85bac7b13b533b64e486949e9 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 29 Jan 2020 10:06:45 +0100 Subject: [PATCH] Small behavior improvement --- .../eu/faircode/email/FragmentAccount.java | 21 ++----- .../eu/faircode/email/FragmentIdentity.java | 56 ++++++------------- 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index a925c3f61f..6da7c83946 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -848,23 +848,14 @@ public class FragmentAccount extends FragmentBase { host = h.getHost(); } - if (TextUtils.isEmpty(host)) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_host)); + 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 - throw new IllegalArgumentException(context.getString(R.string.title_no_user)); - if (synchronize && TextUtils.isEmpty(password) && !insecure) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_password)); + if (TextUtils.isEmpty(user) && !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)); if (TextUtils.isEmpty(interval)) interval = Integer.toString(EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index b552077167..0714184a97 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -643,59 +643,35 @@ public class FragmentIdentity extends FragmentBase { host = h.getHost(); } - if (TextUtils.isEmpty(name)) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_name)); - if (TextUtils.isEmpty(email)) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_email)); - if (!Patterns.EMAIL_ADDRESS.matcher(email).matches()) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, email)); - if (TextUtils.isEmpty(host)) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_host)); + if (TextUtils.isEmpty(name) && !should) + throw new IllegalArgumentException(context.getString(R.string.title_no_name)); + if (TextUtils.isEmpty(email) && !should) + throw new IllegalArgumentException(context.getString(R.string.title_no_email)); + if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() && !should) + throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, email)); + 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 - throw new IllegalArgumentException(context.getString(R.string.title_no_user)); - if (synchronize && TextUtils.isEmpty(password) && !insecure) - if (should) - return true; - else - throw new IllegalArgumentException(context.getString(R.string.title_no_password)); + if (TextUtils.isEmpty(user) && !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)); - 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)); + 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)); + throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, bcc)); } if (TextUtils.isEmpty(display))