From b517499d006a566aa8dd4392e750ae050f149f4a Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 26 Feb 2026 12:21:51 -0700 Subject: [PATCH] Refactor filter lists. https://redmine.stoutner.com/issues/1207 --- COPYING | 2 +- app/build.gradle | 26 +- app/src/main/AndroidManifest.xml | 58 +- app/src/main/assets/de/about_licenses.html | 4 +- app/src/main/assets/en/about_licenses.html | 4 +- app/src/main/assets/es/about_licenses.html | 4 +- app/src/main/assets/filterlists/easylist.txt | 73649 ++++++++---- .../main/assets/filterlists/easyprivacy.txt | 4390 +- .../assets/filterlists/fanboy-annoyance.txt | 93258 ++++++++-------- .../main/assets/filterlists/fanboy-social.txt | 13290 --- .../main/assets/filterlists/ultraprivacy.txt | 8 +- app/src/main/assets/fr/about_licenses.html | 4 +- app/src/main/assets/it/about_licenses.html | 4 +- .../main/assets/pt-rBR/about_licenses.html | 4 +- app/src/main/assets/ru/about_licenses.html | 4 +- app/src/main/assets/tr/about_licenses.html | 4 +- .../main/assets/zh-rCN/about_licenses.html | 4 +- .../activities/AboutActivity.kt | 12 +- .../activities/BookmarksActivity.kt | 125 +- .../activities/DomainsActivity.kt | 45 +- .../activities/FilterListsActivity.kt | 300 + .../activities/MainWebViewActivity.kt | 672 +- .../activities/RequestsActivity.kt | 200 +- .../adapters/AboutStateAdapter.kt | 8 +- .../adapters/FilterListArrayAdapter.kt | 58 + .../adapters/RequestsArrayAdapter.kt | 38 +- .../PopulateFilterListsCoroutine.kt | 85 +- .../dataclasses/FilterListDataClass.kt | 46 + .../dataclasses/FilterListEntryDataClass.kt | 51 + .../dataclasses/HistoryDataClass.kt | 26 +- .../dataclasses/PendingDialogDataClass.kt | 26 +- .../dataclasses/RequestDataClass.kt | 88 + .../dialogs/UrlHistoryDialog.kt | 13 +- .../dialogs/ViewFilterListEntryDialog.kt | 335 + .../dialogs/ViewRequestDialog.kt | 360 +- .../fragments/AboutVersionFragment.kt | 131 +- .../fragments/DomainSettingsFragment.kt | 177 +- .../fragments/SettingsFragment.kt | 121 +- .../helpers/CheckFilterListHelper.kt | 745 +- .../helpers/DomainsDatabaseHelper.kt | 76 +- .../helpers/ImportExportDatabaseHelper.kt | 173 +- .../helpers/ParseFilterListHelper.kt | 1832 +- .../views/NestedScrollWebView.kt | 54 +- .../res/layout/about_version_scrollview.xml | 42 +- .../layout/appbar_spinner_dropdown_item.xml | 34 + .../main/res/layout/appbar_spinner_item.xml | 32 + .../res/layout/domain_settings_fragment.xml | 151 +- .../res/layout/filter_lists_bottom_appbar.xml | 72 + .../layout/filter_lists_item_linearlayout.xml | 38 + .../res/layout/filter_lists_top_appbar.xml | 71 + .../requests_appbar_spinner_dropdown_item.xml | 34 - .../layout/requests_appbar_spinner_item.xml | 31 - .../res/layout/requests_bottom_appbar.xml | 6 +- .../res/layout/requests_item_linearlayout.xml | 25 +- .../main/res/layout/requests_top_appbar.xml | 4 +- .../layout/view_filter_list_entry_dialog.xml | 221 + .../main/res/layout/view_request_dialog.xml | 302 +- .../main/res/menu/bookmarks_options_menu.xml | 25 +- .../main/res/menu/requests_options_menu.xml | 31 + .../main/res/menu/webview_options_menu.xml | 54 +- app/src/main/res/values-de/strings.xml | 83 +- app/src/main/res/values-es/strings.xml | 83 +- app/src/main/res/values-fr/strings.xml | 83 +- app/src/main/res/values-it/strings.xml | 83 +- app/src/main/res/values-night/colors.xml | 3 +- app/src/main/res/values-pt-rBR/strings.xml | 24 +- app/src/main/res/values-ru/strings.xml | 83 +- app/src/main/res/values-tr/strings.xml | 24 +- app/src/main/res/values-zh-rCN/strings.xml | 24 +- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/strings.xml | 108 +- app/src/main/res/xml/preferences.xml | 38 +- build.gradle | 6 +- gradle.properties | 5 +- gradle/wrapper/gradle-wrapper.properties | 4 +- settings.gradle | 22 + 76 files changed, 105571 insertions(+), 86791 deletions(-) delete mode 100644 app/src/main/assets/filterlists/fanboy-social.txt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/activities/FilterListsActivity.kt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/adapters/FilterListArrayAdapter.kt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dataclasses/FilterListDataClass.kt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dataclasses/FilterListEntryDataClass.kt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dataclasses/RequestDataClass.kt create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewFilterListEntryDialog.kt create mode 100644 app/src/main/res/layout/appbar_spinner_dropdown_item.xml create mode 100644 app/src/main/res/layout/appbar_spinner_item.xml create mode 100644 app/src/main/res/layout/filter_lists_bottom_appbar.xml create mode 100644 app/src/main/res/layout/filter_lists_item_linearlayout.xml create mode 100644 app/src/main/res/layout/filter_lists_top_appbar.xml delete mode 100644 app/src/main/res/layout/requests_appbar_spinner_dropdown_item.xml delete mode 100644 app/src/main/res/layout/requests_appbar_spinner_item.xml create mode 100644 app/src/main/res/layout/view_filter_list_entry_dialog.xml create mode 100644 app/src/main/res/menu/requests_options_menu.xml diff --git a/COPYING b/COPYING index 0ff468bf..1cf723a8 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ SPDX-License-Identifier: GPL-3.0-or-later -SPDX-FileCopyrightText: 2016-2025 Soren Stoutner +SPDX-FileCopyrightText: 2016-2026 Soren Stoutner This file is part of Privacy Browser Android . diff --git a/app/build.gradle b/app/build.gradle index f950a209..ec1f607a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2016-2025 Soren Stoutner + * SPDX-FileCopyrightText: 2016-2026 Soren Stoutner * * This file is part of Privacy Browser Android . * @@ -19,11 +19,13 @@ plugins { id 'com.android.application' - id 'kotlin-android' + + // kotlin-parcelize is used to parcelize data classes so they can be added to bundles. + id 'kotlin-parcelize' } android { - compileSdk 36 + compileSdk = 36 defaultConfig { minSdk 26 @@ -40,8 +42,8 @@ android { } // Specify the Kotlin JVM target. This must match the compile Java version. For some reason the system was not setting this correctly. These can probably be removed in the future. - kotlinOptions { - jvmTarget = 17 + kotlin { + jvmToolchain(17) } buildTypes { @@ -82,23 +84,23 @@ android { dependencies { // Include the following AndroidX libraries. - implementation "androidx.activity:activity-ktx:1.10.1" + implementation "androidx.activity:activity-ktx:1.12.4" implementation 'androidx.arch.core:core-common:2.2.0' implementation 'androidx.arch.core:core-runtime:2.2.0' implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.3.0' - implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.core:core-ktx:1.17.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0' implementation 'androidx.viewpager:viewpager:1.1.0' - implementation 'androidx.webkit:webkit:1.14.0' + implementation 'androidx.webkit:webkit:1.15.0' // Include the Kotlin standard library. This should be the same version number listed in project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.20' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.10' // Include the Google material library. - implementation 'com.google.android.material:material:1.13.0-alpha14' + implementation 'com.google.android.material:material:1.13.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cad3fa53..82ea7e29 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - - - - + + + - - + SPDX-FileCopyrightText: 2016-2026 Soren Stoutner Translation 2016 Aaron Gerlach . Copyright assigned to Soren Stoutner . Translation 2020 Bernhard G. Keller. Copyright assigned to Soren Stoutner . @@ -34,7 +34,7 @@

Copyright:

-

Privacy Browser ist copyright 2015-2025 von Soren Stoutner.

+

Privacy Browser ist copyright 2015-2026 von Soren Stoutner.

Lizenz:

Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 58a10028..67834750 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -1,6 +1,6 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> - - - diff --git a/app/src/main/res/layout/appbar_spinner_dropdown_item.xml b/app/src/main/res/layout/appbar_spinner_dropdown_item.xml new file mode 100644 index 00000000..1ba2eded --- /dev/null +++ b/app/src/main/res/layout/appbar_spinner_dropdown_item.xml @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/appbar_spinner_item.xml b/app/src/main/res/layout/appbar_spinner_item.xml new file mode 100644 index 00000000..8107256c --- /dev/null +++ b/app/src/main/res/layout/appbar_spinner_item.xml @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml index 34cf2c3e..7641da5e 100644 --- a/app/src/main/res/layout/domain_settings_fragment.xml +++ b/app/src/main/res/layout/domain_settings_fragment.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> - - - - - - - - - - - - - - - - + + android:text="@string/ultraprivacy" /> + android:contentDescription="@string/ultraprivacy" /> - + + android:text="@string/ultralist" /> + android:contentDescription="@string/ultralist" /> - + + android:text="@string/easyprivacy" /> + android:contentDescription="@string/easyprivacy" /> - + + android:text="@string/easylist" /> + android:contentDescription="@string/easylist" /> - + + android:text="@string/fanboys_annoyance_list" /> + android:contentDescription="@string/fanboys_annoyance_list" /> + android:layout_width="match_parent" /> + android:contentDescription="@string/swipe_to_refresh" + tools:ignore="TooManyViews" /> + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/filter_lists_item_linearlayout.xml b/app/src/main/res/layout/filter_lists_item_linearlayout.xml new file mode 100644 index 00000000..c1711dbc --- /dev/null +++ b/app/src/main/res/layout/filter_lists_item_linearlayout.xml @@ -0,0 +1,38 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/filter_lists_top_appbar.xml b/app/src/main/res/layout/filter_lists_top_appbar.xml new file mode 100644 index 00000000..a67562e5 --- /dev/null +++ b/app/src/main/res/layout/filter_lists_top_appbar.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/requests_appbar_spinner_dropdown_item.xml b/app/src/main/res/layout/requests_appbar_spinner_dropdown_item.xml deleted file mode 100644 index bb3421fa..00000000 --- a/app/src/main/res/layout/requests_appbar_spinner_dropdown_item.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/requests_appbar_spinner_item.xml b/app/src/main/res/layout/requests_appbar_spinner_item.xml deleted file mode 100644 index e741019f..00000000 --- a/app/src/main/res/layout/requests_appbar_spinner_item.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/requests_bottom_appbar.xml b/app/src/main/res/layout/requests_bottom_appbar.xml index 02bc0e40..0d79a86e 100644 --- a/app/src/main/res/layout/requests_bottom_appbar.xml +++ b/app/src/main/res/layout/requests_bottom_appbar.xml @@ -2,7 +2,7 @@ + + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + SPDX-FileCopyrightText: 2018-2022, 2024-2025 Soren Stoutner This file is part of Privacy Browser Android . @@ -47,7 +47,7 @@ android:layout_width="match_parent" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_request_dialog.xml b/app/src/main/res/layout/view_request_dialog.xml index 4291d04a..98c5a9a9 100644 --- a/app/src/main/res/layout/view_request_dialog.xml +++ b/app/src/main/res/layout/view_request_dialog.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + You should have received a copy of the GNU General Public License along with + this program. If not, see . -->

+ + + + + + + diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml index 49ac11ae..24a298e7 100644 --- a/app/src/main/res/menu/webview_options_menu.xml +++ b/app/src/main/res/menu/webview_options_menu.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b9719ca4..cf234c55 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2,7 +2,7 @@ - Lade EasyList + Lade UltraPrivacy + Lade UltraList Lade EasyPrivacy + Lade EasyList Lade Fanboy’s Annoyance Filterliste - Fanboy’s Social Blocking Filterliste - Lade UltraList - Lade UltraPrivacy Website-Icon @@ -139,7 +138,6 @@ Cookies löschen DOM-Speicher löschen Fanboy’s Annoyance Sperrliste - Fanboy’s Social Blocking Sperrliste Alle Zugriffe auf Dritt-Anbieter-Inhalte blockieren Seite User Agent @@ -322,29 +320,8 @@ Filter-Liste Unterliste Haupt-Positiv-Liste - Finale Positiv-Liste - Domain-Positiv-Liste - Domain-Beginn-Positiv-Liste - Domain-Ende-Positiv-Liste - Drittanbieter-Positiv-Liste - Drittanbieter-Domain-Positiv-Liste - Drittanbieter-Domain-Beginn-Positiv-Liste Haupt-Negativ-Liste - Beginn-Negativ-Liste - Finale Negativ-Liste - Domain-Negativ-Liste - Domain-Beginn-Negativ-Liste - Domain-Ende-Negativ-Liste - Negativ-Liste für reguläre Ausdrücke in Domains - Drittanbieter-Negativ-Liste - Drittanbieter-Beginn-Negativ-Liste - Drittanbieter-Domain-Negativ-Liste - Drittanbieter-Domain-Beginn-Negativ-Liste - Negativ-Liste für reguläre Ausdrücke in Drittanbietern - Negativ-Liste für reguläre Ausdrücke in Drittanbieter-Domains Negativ-Liste für reguläre Ausdrücke - Filter-Listen-Einträge - Filter-Listen-Original-Eintrag Domains @@ -373,36 +350,31 @@ DOM-Speicher aktiviert DOM-Speicher deaktiviert - + Systemeinstellung - EasyList aktiviert - EasyList deaktiviert + UltraPrivacy aktiviert + UltraPrivacy deaktiviert + + + Systemeinstellung + UltraList aktiviert + UltraList deaktiviert Systemeinstellung EasyPrivacy aktiviert EasyPrivacy deaktiviert + + Systemeinstellung + EasyList aktiviert + EasyList deaktiviert + Systemeinstellung Fanboy’s Annoyance Sperrliste aktiviert Fanboy’s Annoyance Sperrliste deaktiviert - - Systemeinstellung - Fanboy’s Social Blocking Sperrliste aktiviert - Fanboy’s Social Blocking Sperrliste deaktiviert - - - Systemeinstellung - UltraList aktiviert - UltraList deaktiviert - - - Systemeinstellung - UltraPrivacy aktiviert - UltraPrivacy deaktiviert - Systemeinstellung Alle Drittanbieter-Anfragen blockieren @@ -525,12 +497,11 @@ für das System verfügbarer Speicher: \u0020 gesamter System-Speicher: \u0020 MiB - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance Sperrliste: \u0020 - Fanboy’s Social Blocking Sperrliste: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 Paket-Signatur Aussteller-DN: \u0020 Subject DN: \u0020 @@ -591,18 +562,16 @@ Screenshots zulassen Screenshots, Bildschirmvideos und Anzeige auf unsicheren Bildschirmen zulassen. Eine Änderung dieser Einstellung startet Privacy Browser neu. Filter-Listen - EasyList - Haupt-Filter-Liste für Werbung. + UltraPrivacy + UltraPrivacy filtert Tracker, die von EasyPrivacy nicht gefiltert werden, da dies Internet-Seiten beeinträchtigen könnte. + UltraList + UltraList filtert Werbung, die von EasyList nicht gefiltert wird, da dies Internet-Seiten beeinträchtigen könnte. EasyPrivacy Haupt-Filter-Liste für Tracker. + EasyList + Haupt-Filter-Liste für Werbung. Fanboy’s Annoyance Sperrliste Filtert störende Popups und Links. Beinhaltet Fanboy’s Social Blocking Lists. - Fanboy’s Social Blocking Sperrliste - Filtert Social-Media-Inhalte von Drittanbietern. - UltraList - UltraList filtert Werbung, die von EasyList nicht gefiltert wird, da dies Internet-Seiten beeinträchtigen könnte. - UltraPrivacy - UltraPrivacy filtert Tracker, die von EasyPrivacy nicht gefiltert werden, da dies Internet-Seiten beeinträchtigen könnte. Alle Zugriffe auf Dritt-Anbieter-Inhalte blockieren Alle Zugriffe auf Dritt-Anbieter-Inhalte zu blockieren verbessert die Privatsphäre, kann jedoch Webseiten verunstalten. URL-Bereinigung diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cb7fc805..f94ed59f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2,7 +2,7 @@ - Cargando EasyList + Cargando Ultra Privacidad + Cargando UltraList Cargando EasyPrivacy + Cargando EasyList Cargando la lista molesta de Fanboy - Cargando la lista de bloqueo social de Fanboy - Cargando UltraList - Cargando Ultra Privacidad Icono favorito @@ -137,7 +136,6 @@ Borrar cookies Borrar almacenamiento DOM Lista molesta de Fanboy - Lista de bloqueo social de Fanboy Bloquear todas las solicitudes de terceros Página Agente de usuario @@ -321,29 +319,8 @@ Lista de filtros Sublista Lista principal de permitidos - Lista final de permitidos - Lista de dominios permitidos - Lista inicial de dominios permitidos - Lista final de dominios permitidos - Lista permitida de terceros - Lista de dominios permitidos de terceros - Lista inicial de dominios permitidos de terceros Lista principal de bloqueos - Lista inicial de bloqueos - Lista final de bloqueos - Lista de bloqueo de dominios - Lista inicial de bloqueo de dominios - Lista final de bloqueo de dominios - Lista de bloqueo de expresiones regulares de dominios - Lista de bloqueo de terceros - Lista inicial de bloqueo de terceros - Lista de bloqueo de dominios de terceros - Lista inicial de bloqueo de dominios de terceros - Lista de bloqueo de expresiones regulares de terceros - Lista de bloqueo de expresiones regulares de dominios de terceros Lista de bloqueo de expresiones regulares - Entradas de la Lista de filtros - Entrada original de la Lista de filtros Dominios @@ -372,36 +349,31 @@ Almacenamiento DOM habilitado Almacenamiento DOM deshabilitado - + Por defecto del sistema - EasyList habilitada - EasyList deshabilitada + Ultra Privacidad habilitada + Ultra Privacidad deshabilitada + + + Por defecto del sistema + UltraList habilitada + UltraList deshabilitada Por defecto del sistema EasyPrivacy habilitada EasyPrivacy deshabilitada + + Por defecto del sistema + EasyList habilitada + EasyList deshabilitada + Por defecto del sistema Lista molesta de Fanboy habilitada Lista molesta de Fanboy deshabilitada - - Por defecto del sistema - Lista de bloqueo social de Fanboy habilitada - Lista de bloqueo social de Fanboy deshabilitada - - - Por defecto del sistema - UltraList habilitada - UltraList deshabilitada - - - Por defecto del sistema - Ultra Privacidad habilitada - Ultra Privacidad deshabilitada - Por defecto del sistema Bloquear todas las solicitudes de terceras partes habilitada @@ -524,12 +496,11 @@ Memoria disponible del sistema: \u0020 Memoria total del sistema: \u0020 MiB - EasyList: \u0020 + Ultra Privacidad: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Lista molesta de Fanboy: \u0020 - Lista de bloqueo social de Fanboy: \u0020 - UltraList: \u0020 - Ultra Privacidad: \u0020 Firma del paquete DN del emisor: \u0020 DN del sujeto: \u0020 @@ -590,18 +561,16 @@ Permitir capturas de pantalla Permitir capturas de pantalla, grabación de vídeo y visualización en pantallas inseguras. Cambiar esta configuración reiniciará Navegador Privado. Listas de filtros - EasyList - Lista de filtro del Anuncio principal. + Ultra Privacidad + UltraPrivacy filtra los rastreadores que EasyPrivacy no filtra porque puede romper sitios web. + UltraList + UltraList filtra anuncios que EasyList no filtra porque al hacerlo puede romper sitios web. EasyPrivacy Lista de filtro del Rastreador principal. + EasyList + Lista de filtro del Anuncio principal. Lista molesta de Fanboy Filtra las molestas ventanas emergentes y enlaces. Incluye las listas de bloqueo social de Fanboy. - Lista de bloqueo social de Fanboy - Filtra contenidos de terceros en las redes sociales. - UltraList - UltraList filtra anuncios que EasyList no filtra porque al hacerlo puede romper sitios web. - Ultra Privacidad - UltraPrivacy filtra los rastreadores que EasyPrivacy no filtra porque puede romper sitios web. Bloquear todas las solicitudes de terceras partes Bloquear todas las solicitudes de terceras partes aumenta la privacidad, pero rompe muchas páginas web. Modificación de URL diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1333c9d5..cfd7c7a3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2,7 +2,7 @@ - Chargement EasyList + Chargement UltraPrivacy + Chargement UltraList Chargement EasyPrivacy + Chargement EasyList Chargement Fanboy’s Annoyance List - Chargement Fanboy’s Social Blocking List - Chargement UltraList - Chargement UltraPrivacy Icône de Favoris @@ -137,7 +136,6 @@ Effacer les cookies Effacer le stockage du DOM Fanboy’s Annoyance List - Fanboy’s Social Blocking List Bloquer toutes les requêtes tierces parties Page User Agent @@ -320,29 +318,8 @@ Liste de filtre Sous-listes Liste principale d\'autorisation - Liste finale d\'autorisation - Liste d\'autorisation de domaine - Liste initiale d\'autorisation de domaine - Liste finale d\'autorisation de domaine - Liste d\'autorisation de tiers - Liste d\'autorisation de domaine tiers - Liste initiale d\'autorisation de domaine tiers Liste principale de blocage - Liste initiale de blocage - Liste finale de blocage - Liste de blocage de domaine - Liste initiale de blocage de domaine - Liste finale de blocage de domaine - Expression régulière de blocage de domaine - Liste de blocage de tiers - Liste initiale de blocage de domaine tiers - Liste de blocage de domaine tiers - Liste initiale de blocage de domaine tiers - Expression régulière de blocage de tiers - Expression régulière de blocage de domaine tiers Expression régulière de liste de blocage - Liste de filtrage des données - Liste originale de filtrage des données Domaines @@ -371,36 +348,31 @@ Stockage du DOM activé Stockage du DOM désactivé - + Valeur système - EasyList activé - EasyList désactivé + UltraPrivacy activé + UltraPrivacy désactivé + + + Valeur système + UltraList activé + UltraList désactivé Valeur système EasyPrivacy activé EasyPrivacy désactivé + + Valeur système + EasyList activé + EasyList désactivé + Valeur système Fanboy’s Annoyance List activé Fanboy’s Annoyance List désactivé - - Valeur système - Fanboy’s Social Blocking List activé - Fanboy’s Social Blocking List désactivé - - - Valeur système - UltraList activé - UltraList désactivé - - - Valeur système - UltraPrivacy activé - UltraPrivacy désactivé - Valeur système Blocage toutes les requêtes de tiers activé @@ -521,12 +493,11 @@ Mémoire système disponible :\u0020 Mémoire totale du système :\u0020 Mio - EasyList :\u0020 + UltraPrivacy :\u0020 + UltraList :\u0020 EasyPrivacy :\u0020 + EasyList :\u0020 Fanboy’s Annoyance List :\u0020 - Fanboy’s Social Blocking List :\u0020 - UltraList :\u0020 - UltraPrivacy :\u0020 Signature de paquets DN émetteur :\u0020 Dn sujet :\u0020 @@ -587,18 +558,16 @@ Autoriser captures d\'écrans Autoriser les captures d\'écrans, enregistrements vidéo et affichage sur des écrans non-sécurisés. Changer ce paramètre redémarrera Privacy Browser. Listes de filtrage - EasyList - Liste de filtre publicitaire principale. + UltraPrivacy + UltraPrivacy filtre les pisteurs qu\'EasyPrivacy ne fait pas car cela peut casser certains sites Web. + UltraList + UltraList filtre les publicités qu\'EasyList ne fait pas car cela peut casser certains sites Web. EasyPrivacy Liste de filtre de suivi principale. + EasyList + Liste de filtre publicitaire principale. Fanboy’s annoyance list Filtre les popups et liens gênants. Inclu les listes de blocage de réseaux sociaux Fanboy. - Fanboy’s social blocking list - Filtre les contenus tiers de réseaux sociaux. - UltraList - UltraList filtre les publicités qu\'EasyList ne fait pas car cela peut casser certains sites Web. - UltraPrivacy - UltraPrivacy filtre les pisteurs qu\'EasyPrivacy ne fait pas car cela peut casser certains sites Web. Bloquer toutes les requêtes tierces Le blocage de toutes les requêtes tierces augmente la vie privée, mais détruit de nombreux sites Web. Modifications d\'URL diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f4eef5ab..f75783b7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2,7 +2,7 @@ - Caricamento EasyList + Caricamento UltraPrivacy + Caricamento UltraList Caricamento EasyPrivacy + Caricamento EasyList Caricamento Fanboy’s Annoyance List - Caricamento Fanboy’s Social Blocking List - Caricamento UltraList - Caricamento UltraPrivacy FavIcon @@ -137,7 +136,6 @@ Elimina cookies Elimina DOM storage Fanboy’s annoyance list - Fanboy’s social blocking list Blocca tutte le richieste di Terze Parti Pagina User agent @@ -320,29 +318,8 @@ Lista dei Filtri Sublist Lista principale dei permessi - Lista finale dei permessi - Lista domini permessi - Lista iniziale domini permessi - Lista finale domini permessi - Lista di terze parti permesse - Lista domini di terze parti permessi - Lista iniziale domini di terze parti permessi Lista principale bloccati - Lista iniziale bloccati - Lista finale bloccati - Lista domini bloccati - Lista iniziale domini bloccati - Lista finale domini bloccati - Lista di blocco espressioni regolari nei domini - Lista di terze parti bloccate - Lista iniziale di terze parti bloccate - Lista domini di terze parti bloccati - Lista iniziale domini di terze parti bloccati - Lista di blocco espressioni regolari di terze parti - Lista di blocco espressioni regolari domini di terze parti Lista di blocco espressioni regolari - Elementi della lista dei filtri - Elemento originale della lista dei filtri Domini @@ -371,36 +348,31 @@ DOM storage abilitato DOM storage disabilitato - + Default di Sistema - EasyList abilitata - EasyList disabilitata + UltraPrivacy abilitata + UltraPrivacy disabilitata + + + Default di Sistema + UltraList abilitata + UltraList disabilitata Default di Sistema EasyPrivacy abilitata EasyPrivacy disabilitata + + Default di Sistema + EasyList abilitata + EasyList disabilitata + Default di Sistema Fanboy’s Annoyance List abilitata Fanboy’s Annoyance List disabilitata - - Default di Sistema - Fanboy’s Social Blocking List abilitata - Fanboy’s Social Blocking List disabilitata - - - Default di Sistema - UltraList abilitata - UltraList disabilitata - - - Default di Sistema - UltraPrivacy abilitata - UltraPrivacy disabilitata - Default di Sistema Bloccco di tutte le richieste di terze parti abilitato @@ -523,12 +495,11 @@ Memoria di sistema disponibile: \u0020 Memoria totale del sistema: \u0020 MiB - EasyList: \u0020 - EasyPrivacy: \u0020 - Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 UltraList: \u0020 UltraPrivacy: \u0020 + EasyPrivacy: \u0020 + EasyList: \u0020 + Fanboy’s Annoyance List: \u0020 Firma del Pacchetto Emittente: \u0020 Soggetto: \u0020 @@ -590,18 +561,16 @@ Permette gli screenshot, la registrazione di video, e la possibilità di visualizzare su schermi non sicuri. La modifica di questa impostazione provoca il riavvio di Privacy Browser. Lista dei filtri - EasyList - Lista principale dei filtri degli annunci. + UltraPrivacy + UltraPrivacy filtra i trackers che EasyList non è in grado di bloccare per non rendere inaccessibili i siti web. + UltraList + UltraList filtra gli annunci che EasyList non è in grado di bloccare per non rendere inaccessibili i siti web. EasyPrivacy Lista principale dei filtri per i tracker. + EasyList + Lista principale dei filtri degli annunci. Fanboy’s annoyance list Filtra collegamenti e popups fastidiosi. Include le liste Fanboy’s social blocking. - Fanboy’s social blocking list - Filtra i contenuti dei social media di terze parti. - UltraList - UltraList filtra gli annunci che EasyList non è in grado di bloccare per non rendere inaccessibili i siti web. - UltraPrivacy - UltraPrivacy filtra i trackers che EasyList non è in grado di bloccare per non rendere inaccessibili i siti web. Blocca tutte le richieste di Terze Parti Il blocco di tutte le richieste di Terze Parti aumenta privacy, ma impedisce la visualizzazione di molti siti web. Modifica delle URL diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 9056ce1e..0dae99d9 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -33,10 +33,11 @@ @color/dark_blue_40 @color/gray_875 @color/gray_700 + @color/gray_750 @color/white @color/violet_700 @color/gray_300 - @color/red_700_40 + @color/red_night_1150 @color/red_night @color/red_night @color/violet_a900 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 95b4e4fe..f6f12e0f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2,7 +2,7 @@ - Carregando EasyList + Carregando UltraPrivacy + Carregando UltraList Carregando EasyPrivacy + Carregando EasyList Carregando Fanboy’s Annoyance List - Carregando Fanboy’s Social Blocking List - Carregando UltraList - Carregando UltraPrivacy Ícone dos Favoritos @@ -131,7 +130,6 @@ Limpar Cookies Limpar Armazenamento DOM Lista de Aborrecimento Fanboy’s - Lista de bloqueio social Fanboy’s Bloquear todas as solicitações de terceiros Página User Agent @@ -402,12 +400,11 @@ Memória Disponível do Sistema: \u0020 Memória Total do Sistema: \u0020 MiB - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 Assinatura do Pacote DN do emissor: \u0020 Assunto DN: \u0020 @@ -467,12 +464,11 @@ volta para fechar a guia (ou o aplicativo, se houver apenas uma guia). Permitir capturas de tela Permitir capturas de tela, gravação de vídeo e visualização em monitores não seguros. Alterar esta configuração irá reiniciar o Privacy Browser. - EasyList + UltraPrivacy + UltraList EasyPrivacy + EasyList Lista de importunação Fanboy - Lista de bloqueio social do Fanboy - UltraList - UltraPrivacy Bloquear todas as solicitações de terceiros Bloquear todas as solicitações de terceiros aumenta a privacidade, mas quebra muitos sites. Modificação de URL diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b8dff28f..80541288 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2,7 +2,7 @@ - Загрузка EasyList + Загрузка UltraPrivacy + Загрузка UltraList Загрузка EasyPrivacy + Загрузка EasyList Загрузка Fanboy’s Annoyance List - Загрузка Fanboy’s Social Blocking List - Загрузка UltraList - Загрузка UltraPrivacy Значок сайта @@ -134,7 +133,6 @@ Очистить cookie Очистить DOM-хранилище Fanboy’s annoyance list - Fanboy’s social blocking list Блокировать все сторонние запросы Страница User agent @@ -317,29 +315,8 @@ Список фильтров Подсписок Основной список разрешенных - Окончательный список разрешенных - Список разрешенных доменов - Начальный список разрешенных доменов - Окончательный список разрешенных доменов - Сторонний список разрешенных - Сторонний список разрешенных доменов - Начальный список разрешенных сторонних доменов Основной список блокировки - Начальный список блокировки - Окончательный список блокировки - Список блокировки доменов - Начальный список блокировки доменов - Окончательный список блокировки доменов - Список блокировки доменов по регулярным выражениям - Сторонний список блокировки - Сторонний начальный список блокировки - Сторонний список блокировки доменов - Сторонний начальный список блокировки доменов - Сторонний список блокировки по регулярным выражениям - Сторонний список блокировки доменов по регулярным выражениям Список блокировки регулярными выражениями - Записи списка фильтрации - Исходная запись списка фильтрации Домены @@ -368,36 +345,31 @@ DOM-хранилище включено DOM-хранилище отключено - + По умолчанию - EasyList включен - EasyList отключен + UltraPrivacy включен + UltraPrivacy отключен + + + По умолчанию + UltraList включен + UltraList отключен По умолчанию EasyPrivacy включен EasyPrivacy отключен + + По умолчанию + EasyList включен + EasyList отключен + По умолчанию Fanboy’s Annoyance List включен Fanboy’s Annoyance List отключен - - По умолчанию - Fanboy’s Social Blocking List включен - Fanboy’s Social Blocking List отключен - - - По умолчанию - UltraList включен - UltraList отключен - - - По умолчанию - UltraPrivacy включен - UltraPrivacy отключен - По умолчанию Блокировка всех сторонних запросов включена @@ -520,12 +492,11 @@ Доступная системе память: \u0020 Общая память системы: \u0020 МиБ - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 Подпись пакета DN эмитента: \u0020 DN субъекта: \u0020 @@ -586,18 +557,16 @@ Разрешить скриншоты Разрешить скриншоты, запись видео и просмотр на незащищенных дисплеях. При изменении этого параметра Privacy Browser будет перезапущен. Списки фильтрации - EasyList - Основной список фильтрации рекламы. + UltraPrivacy + UltraPrivacy фильтрует трекеры, которые не фильтрует EasyPrivacy, поскольку это может нарушить работу сайтов. + UltraList + UltraList фильтрует рекламу, которую не фильтрует EasyList, поскольку это может нарушить работу сайтов. EasyPrivacy Основной список фильтрации трекеров. + EasyList + Основной список фильтрации рекламы. Fanboy’s annoyance list Фильтруйте назойливые всплывающие окна и ссылки. Включает списки блокировки Fanboy Social. - Fanboy’s social blocking list - Фильтрует сторонний контент социальных сетей. - UltraList - UltraList фильтрует рекламу, которую не фильтрует EasyList, поскольку это может нарушить работу сайтов. - UltraPrivacy - UltraPrivacy фильтрует трекеры, которые не фильтрует EasyPrivacy, поскольку это может нарушить работу сайтов. Блокировать все сторонние запросы Блокировка всех сторонних запросов повышает конфиденциальность, но ломает многие веб-сайты. Модификация URL diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7a86538e..28af454b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2,7 +2,7 @@ - EasyList yükleniyor + UltraPrivacy yükleniyor + UltraList yükleniyor EasyPrivacy yükleniyor + EasyList yükleniyor Fanboy’s Annoyance List yükleniyor - Fanboy’s Social Blocking List yükleniyor - UltraList yükleniyor - UltraPrivacy yükleniyor Site Simgesi @@ -122,7 +121,6 @@ Çerezleri temizle DOM Depolamayı temizle Fanboy’s Annoyance List - Fanboy’s Social Blocking List Tüm Üçüncü Taraf İstekleri engelle Sayfa Kullanıcı aracısı @@ -342,12 +340,11 @@ WebView Versiyonu: \u0020 Orbot: OpenKeychain: \u0020 - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 Paket İmzası Yayınlayan DN: \u0020 Özne DN: \u0020 @@ -401,12 +398,11 @@ Ekran görüntülerine izin ver Ekran görüntülerine, video kaydına ve güvenli olmayan ekranlarda görüntülenmeye izin verir. Bu ayarı değiştirmek Privacy Browser uygulamasını yeniden başlatır. - EasyList + UltraPrivacy + UltraList EasyPrivacy + EasyList Fanboy’s Annoyance List - Fanboy’s Social Blocking List - UltraList - UltraPrivacy Tüm üçüncü taraf istekleri engelle Tüm üçüncü taraf istekleri engellemek gizliliği arttırır, fakat çoğu web sitesinin çökmesine sebep olur. URL Modifikasyonu diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3ae2ffc1..02f4d05f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2,7 +2,7 @@ - 加载 EasyList + 加载 UltraPrivacy + 加载 UltraList 加载 EasyPrivacy + 加载 EasyList 加载 Fanboy’s Annoyance List - 加载 Fanboy’s Social Blocking List - 加载 UltraList - 加载 UltraPrivacy 喜爱的图标 @@ -136,7 +135,6 @@ 清空 Cookies 清空 DOM 储存 Fanboy’s Annoyance List - Fanboy’s Social Blocking List 阻止所有第三方请求 页面 用户代理 @@ -407,12 +405,11 @@ 系统可用内存: \u0020 系统所有内存: \u0020 兆 - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 包名 发行人 DN: 主题 DN: @@ -470,12 +467,11 @@ 在无痕模式中，关闭当前标签页，会清除所有的记录和网页上的痕迹. 允许截图 允许截图，录视频，在不安全的显示中查看，更改这个设置会重启本浏览器. - EasyList + UltraPrivacy + UltraList EasyPrivacy + EasyList Fanboy’s annoyance list - Fanboy’s social 黑名单 - UltraList - UltraPrivacy 屏蔽第三方请求 屏蔽所有第三方包括隐私在内的请求，这会使许多网页崩溃。 修改网址 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 19bc3810..d35e7085 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -33,6 +33,7 @@ @color/green_200 @color/white @color/gray_425 + @color/gray_100 @color/gray_925 @color/blue_200 @color/gray_700 @@ -122,6 +123,7 @@ #FF930606 #FFD50000 #FFE24B4C + #FF875151 #00000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 19f5614b..81301a95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ - Loading EasyList + Loading UltraPrivacy + Loading UltraList Loading EasyPrivacy + Loading EasyList Loading Fanboy’s Annoyance List - Loading Fanboy’s Social Blocking List - Loading UltraList - Loading UltraPrivacy Favorite Icon @@ -142,7 +141,6 @@ Clear Cookies Clear DOM Storage Fanboy’s Annoyance List - Fanboy’s Social Blocking List Block All Third-Party Requests Page User Agent @@ -313,6 +311,7 @@ Requests Request details + Request Disposition All Default @@ -325,32 +324,34 @@ Blocked %1$d. Blocked Blocked + Web Page URL + Request URL + Request URL With Separators + Truncated Request URL + Truncated Request URL With Separators + Filter List Entry Filter list Sublist Main allow list - Final allow list - Domain allow list - Domain initial allow list - Domain final allow list - Third-party allow list - Third-party domain allow list - Third-party domain initial allow list + Initial domain allow list + Regular expression allow list Main block list - Initial block list - Final block list - Domain block list - Domain initial block list - Domain final block list - Domain regular expression block list - Third-party block list - Third-party initial block list - Third-party domain block list - Third-party domain initial block list - Third-party regular expression block list - Third-party domain regular expression block list + Initial domain block list Regular expression block list - Filter list entries - Filter list original entry + Filter list original entry + + + %1$d. %2$s + Filter list entry - %1$d + Applied entry list + Third party + Override + Initial match + Final match + Yes + Domain list + Applied filter options + Original filter options Domains @@ -379,36 +380,31 @@ DOM storage enabled DOM storage disabled - + System default - EasyList enabled - EasyList disabled + UltraPrivacy enabled + UltraPrivacy disabled + + + System default + UltraList enabled + UltraList disabled System default EasyPrivacy enabled EasyPrivacy disabled + + System default + EasyList enabled + EasyList disabled + System default Fanboy’s Annoyance List enabled Fanboy’s Annoyance List disabled - - System default - Fanboy’s Social Blocking List enabled - Fanboy’s Social Blocking List disabled - - - System default - UltraList enabled - UltraList disabled - - - System default - UltraPrivacy enabled - UltraPrivacy disabled - System default Block all third-party requests enabled @@ -533,12 +529,11 @@ System Available Memory: \u0020 System Total Memory: \u0020 MiB - EasyList: \u0020 + UltraPrivacy: \u0020 + UltraList: \u0020 EasyPrivacy: \u0020 + EasyList: \u0020 Fanboy’s Annoyance List: \u0020 - Fanboy’s Social Blocking List: \u0020 - UltraList: \u0020 - UltraPrivacy: \u0020 Package Signature Issuer DN: \u0020 Subject DN: \u0020 @@ -629,18 +624,16 @@ Allow screenshots Allow screenshots, video recording, and viewing on non-secure displays. Changing this setting will restart Privacy Browser. Filter Lists - EasyList - Main ad filter list. + UltraPrivacy + UltraPrivacy filters trackers that EasyPrivacy doesn’t because doing so can break websites. + UltraList + UltraList filters ads that EasyList doesn’t because doing so can break websites. EasyPrivacy Main tracker filter list. + EasyList + Main ad filter list. Fanboy’s annoyance list Filter annoying popups and links. Includes Fanboy’s social blocking lists. - Fanboy’s social blocking list - Filters third-party social media content. - UltraList - UltraList filters ads that EasyList doesn’t because doing so can break websites. - UltraPrivacy - UltraPrivacy filters trackers that EasyPrivacy doesn’t because doing so can break websites. Block all third-party requests Blocking all third-party requests increases privacy, but it breaks many websites. URL Modification @@ -791,7 +784,6 @@ easylist easyprivacy fanboys_annoyance_list - fanboys_social_blocking_list font_size full_screen_browsing_mode full_screen diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index fa9737a7..02e89507 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -2,7 +2,7 @@