Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 03:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adguard: support for important

Browse Source
This commit is contained in:
M66B
2023-12-28 23:41:31 +01:00
parent f28a086090
commit dc3dd30017
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/Adguard.java
View File

@@ -52,6 +52,7 @@ public class Adguard {
return null;
List<String> removes = new ArrayList<>();
List<String> importants = new ArrayList<>();
List<String> excepts = new ArrayList<>();
try (BufferedReader br = new BufferedReader(
@@ -92,6 +93,7 @@ public class Adguard {
}
String remove = null;
boolean important = false;
boolean matches = true;
for (String modifier : modifiers) {
int equal = modifier.indexOf('=');
@@ -153,10 +155,12 @@ public class Adguard {
if (and != matches)
break;
}
} else if ("important".equals(name)) {
important = true;
Log.w("Adguard important=" + param);
} else {
if (!"document".equals(name) &&
!"image".equals(name) &&
!"important".equals(name) &&
!"script".equals(name) &&
!(name.startsWith("~") && !name.equals("~document"))) {
if (!ADGUARD_IGNORE.contains(name))
@@ -225,6 +229,8 @@ public class Adguard {
} else {
if (!removes.contains(remove))
removes.add(remove);
if (important && !importants.contains(remove))
importants.add(remove);
}
}
} catch (Throwable ex) {
@@ -242,12 +248,13 @@ public class Adguard {
String value = uri.getQueryParameter(key);
if (omitParam(remove, key, value)) {
omit = true;
for (String except : excepts)
if (omitParam(except, key, value)) {
Log.i("Adguard except=" + except);
omit = false;
break;
}
if (!importants.contains(remove))
for (String except : excepts)
if (omitParam(except, key, value)) {
Log.i("Adguard except=" + except);
omit = false;
break;
}
}
}