From 6e54723521643ccde6a5934f2d07ee74c26b01a0 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Jun 2022 08:46:01 +0200 Subject: [PATCH] Refactoring --- .../email/FragmentDialogOpenLink.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java index 670c46789a..a1bb48380b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java @@ -137,6 +137,26 @@ public class FragmentDialogOpenLink extends FragmentDialogBase { } else uriTitle = null; + MailTo mailto = null; + if ("mailto".equals(uri.getScheme())) + try { + mailto = MailTo.parse(uri); + } catch (Throwable ex) { + Log.w(ex); + } + + String host = uri.getHost(); + String thost = (uriTitle == null ? null : uriTitle.getHost()); + + String puny = null; + try { + if (host != null) + puny = IDN.toASCII(host, IDN.ALLOW_UNASSIGNED); + } catch (Throwable ex) { + Log.i(ex); + puny = host; + } + // Get views final View dview = LayoutInflater.from(context).inflate(R.layout.dialog_open_link, null); scroll = dview.findViewById(R.id.scroll); @@ -420,29 +440,10 @@ public class FragmentDialogOpenLink extends FragmentDialogBase { tvTitle.setText(title); tvTitle.setVisibility(TextUtils.isEmpty(title) ? View.GONE : View.VISIBLE); - MailTo mailto = null; - if ("mailto".equals(uri.getScheme())) - try { - mailto = MailTo.parse(uri); - } catch (Throwable ex) { - Log.w(ex); - } ibSearch.setVisibility( mailto != null && !TextUtils.isEmpty(mailto.getTo()) ? View.VISIBLE : View.GONE); - String host = uri.getHost(); - String thost = (uriTitle == null ? null : uriTitle.getHost()); - - String puny = null; - try { - if (host != null) - puny = IDN.toASCII(host, IDN.ALLOW_UNASSIGNED); - } catch (Throwable ex) { - Log.i(ex); - puny = host; - } - if (host != null && !host.equals(puny)) { etLink.setText(format(uri.buildUpon().encodedAuthority(puny).build(), context)); tvLink.setText(uri.toString());