diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
index 25eee6ab..a97035af 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
@@ -401,7 +401,7 @@ public class Helper {
* - Firefox: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/query-stripping/records
* - Brave: https://github.com/brave/brave-core/blob/master/components/query_filter/utils.cc
*/
- private static final String[] UTM_PARAMS = {
+ private static final String[] TRACKING_PARAMS = {
"utm_\\w+",
"ref_\\w+",
"__hsfp",
@@ -882,8 +882,8 @@ public class Helper {
return "https://" + wikipediaReplaceHost + "/" + path + lang;
}
}
- boolean filterUTM = Helper.getSharedValue(context, context.getString(R.string.SET_FILTER_UTM));
- if (filterUTM) {
+ boolean filterTracking = Helper.getSharedValue(context, context.getString(R.string.SET_FILTER_TRACKING));
+ if (filterTracking) {
return remove_tracking_param(context, url);
}
return url;
@@ -900,10 +900,10 @@ public class Helper {
if (original_content == null)
return original_content;
String cleaned_content = original_content;
- for (String utm : UTM_PARAMS) {
- cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");
- cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");
- cleaned_content = cleaned_content.replaceAll("\\?" + utm + "=[0-9a-zA-Z._-]*", "?");
+ for (String param : TRACKING_PARAMS) {
+ cleaned_content = cleaned_content.replaceAll("&" + param + "=[0-9a-zA-Z._-]*", "");
+ cleaned_content = cleaned_content.replaceAll("&" + param + "=[0-9a-zA-Z._-]*", "");
+ cleaned_content = cleaned_content.replaceAll("\\?" + param + "=[0-9a-zA-Z._-]*", "?");
}
if (cleaned_content.endsWith("?")) {
cleaned_content = cleaned_content.substring(0, cleaned_content.length() - 1);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9f4c818..e181f0d6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -651,8 +651,8 @@
Check redirect
This URL does not redirect
%1$s \n\nredirects to\n\n %2$s
- Remove UTM parameters
- The app will automatically remove UTM parameters from URLs before visiting a link.
+ Remove tracking parameters
+ The app will automatically remove tracking parameters from URLs before visiting a link.
%d people talking
Twitter accounts (via Nitter)
Twitter tags (via Nitter)
@@ -1307,7 +1307,7 @@
ASK
SET_INVIDIOUS_HOST
invidious.snopyta.org
- SET_FILTER_UTM
+ SET_FILTER_TRACKING
SET_NITTER
SET_NITTER_HOST
nitter.net
diff --git a/app/src/main/res/xml/pref_privacy.xml b/app/src/main/res/xml/pref_privacy.xml
index cb673ab8..b0403a91 100644
--- a/app/src/main/res/xml/pref_privacy.xml
+++ b/app/src/main/res/xml/pref_privacy.xml
@@ -91,10 +91,10 @@
+ app:summary="@string/set_tracking_parameters_indication"
+ app:title="@string/set_tracking_parameters" />