From c3399062b155acf816b498e223c188cb6e1a605a Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 26 Dec 2023 19:43:30 +0100 Subject: [PATCH] Simplification --- .../java/eu/faircode/email/UriHelper.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java index 9a8fc50f38..30dd10b9fb 100644 --- a/app/src/main/java/eu/faircode/email/UriHelper.java +++ b/app/src/main/java/eu/faircode/email/UriHelper.java @@ -401,7 +401,6 @@ public class UriHelper { if (url.isOpaque() || !isHyperLink(url)) return uri; - Uri.Builder builder = url.buildUpon(); builder.clearQuery(); @@ -427,21 +426,18 @@ public class UriHelper { FACEBOOK_WHITELIST_PATH.contains(path) && !FACEBOOK_WHITELIST_QUERY.contains(lkey)) || ("store.steampowered.com".equals(host) && - "snr".equals(lkey))) + "snr".equals(lkey)) || + (clean != null && clean.contains(key))) changed = true; else if (!TextUtils.isEmpty(key)) for (String value : url.getQueryParameters(key)) { Log.i("Query " + key + "=" + value); - - if (clean == null || !clean.contains(key)) { - Uri suri = Uri.parse(value); - if (suri != null && isHyperLink(suri)) { - Uri s = sanitize(context, suri); - return (s == null ? suri : s); - } - builder.appendQueryParameter(key, value); - } else - changed = true; + Uri suri = Uri.parse(value); + if (suri != null && isHyperLink(suri)) { + Uri s = sanitize(context, suri); + return (s == null ? suri : s); + } + builder.appendQueryParameter(key, value); } first = false; }