From 052ea3964ba186beed609c6e888f4a2f4a98b1a5 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 15 Jul 2019 12:41:51 +0200 Subject: [PATCH] Fix host name URIs --- .../main/java/eu/faircode/email/FragmentAccount.java | 10 ++++++++++ .../main/java/eu/faircode/email/FragmentIdentity.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index da7d0eead1..ed4b58308d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -506,6 +506,11 @@ public class FragmentAccount extends FragmentBase { String password = args.getString("password"); String realm = args.getString("realm"); + if (host.contains(":")) { + Uri h = Uri.parse(host); + host = h.getHost(); + } + if (TextUtils.isEmpty(host)) throw new IllegalArgumentException(context.getString(R.string.title_no_host)); if (TextUtils.isEmpty(port)) @@ -763,6 +768,11 @@ public class FragmentAccount extends FragmentBase { boolean pro = Helper.isPro(context); boolean should = args.getBoolean("should"); + if (host.contains(":")) { + Uri h = Uri.parse(host); + host = h.getHost(); + } + if (!should && TextUtils.isEmpty(host)) throw new IllegalArgumentException(context.getString(R.string.title_no_host)); if (TextUtils.isEmpty(port)) diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 3db2aec986..dde8623099 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -567,6 +567,11 @@ public class FragmentIdentity extends FragmentBase { boolean should = args.getBoolean("should"); + if (host.contains(":")) { + Uri h = Uri.parse(host); + host = h.getHost(); + } + if (!should && TextUtils.isEmpty(name)) throw new IllegalArgumentException(context.getString(R.string.title_no_name)); if (!should && TextUtils.isEmpty(email))