mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-09-15 08:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Use 'Tracking' instead of 'UTM' in code and translations' (#1278) from uRDAlaqjNb/Fedilab:rename-utm-elements into develop

Browse source 
Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/1278
This commit is contained in:
0xd9a 2025-08-12 22:39:22 +02:00
commit 26b46299ee
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -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);

6
app/src/main/res/values/strings.xml
View file

@ -651,8 +651,8 @@
<string name="check_redirect">Check redirect</string>
<string name="no_redirect">This URL does not redirect</string>
<string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
<string name="set_utm_parameters">Remove UTM parameters</string>
<string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
<string name="set_tracking_parameters">Remove tracking parameters</string>
<string name="set_tracking_parameters_indication">The app will automatically remove tracking parameters from URLs before visiting a link.</string>
<string name="talking_about">%d people talking</string>
<string name="twitter_accounts">Twitter accounts (via Nitter)</string>
<string name="twitter_tags">Twitter tags (via Nitter)</string>
@ -1307,7 +1307,7 @@
<string name="DEFAULT_THREAD_VALUE" translatable="false">ASK</string>
<string name="SET_INVIDIOUS_HOST" translatable="false">SET_INVIDIOUS_HOST</string>
<string name="DEFAULT_INVIDIOUS_HOST" translatable="false">invidious.snopyta.org</string>
<string name="SET_FILTER_UTM" translatable="false">SET_FILTER_UTM</string>
<string name="SET_FILTER_TRACKING" translatable="false">SET_FILTER_TRACKING</string>
<string name="SET_NITTER" translatable="false">SET_NITTER</string>
<string name="SET_NITTER_HOST" translatable="false">SET_NITTER_HOST</string>
<string name="DEFAULT_NITTER_HOST" translatable="false">nitter.net</string>

6
app/src/main/res/xml/pref_privacy.xml
View file

@ -91,10 +91,10 @@
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
app:key="@string/SET_FILTER_UTM"
app:key="@string/SET_FILTER_TRACKING"
app:singleLineTitle="false"
app:summary="@string/set_utm_parameters_indication"
app:title="@string/set_utm_parameters" />
app:summary="@string/set_tracking_parameters_indication"
app:title="@string/set_tracking_parameters" />
</PreferenceCategory>