From d768ea3db9e06947c37f4b437c4ff5494ed590d4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Jul 2019 21:06:48 +0200
Subject: [PATCH] Rebuild link only when query parameters haven been removed

---
 .../java/eu/faircode/email/AdapterMessage.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4c5bfc5c01..f0ef8465f4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3426,16 +3426,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 // https://en.wikipedia.org/wiki/UTM_parameters
                 Uri.Builder builder = uri.buildUpon();
 
+                boolean changed = false;
                 builder.clearQuery();
                 for (String key : uri.getQueryParameterNames())
-                    if (!PARANOID_QUERY.contains(key.toLowerCase()))
-                        for (String value : uri.getQueryParameters(key))
-                            if (!TextUtils.isEmpty(key)) {
-                                Log.i("Query " + key + "=" + value);
-                                builder.appendQueryParameter(key, value);
-                            }
+                    if (PARANOID_QUERY.contains(key.toLowerCase()))
+                        changed = true;
+                    else if (!TextUtils.isEmpty(key))
+                        for (String value : uri.getQueryParameters(key)) {
+                            Log.i("Query " + key + "=" + value);
+                            builder.appendQueryParameter(key, value);
+                        }
 
-                sanitized = builder.build();
+                sanitized = (changed ? builder.build() : uri);
             }
 
             View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_open_link, null);