From c5ba89979d8b28477d28153ca2b6c26426b26734 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 30 Jul 2018 10:52:40 -0700 Subject: [PATCH] =?utf8?q?Update=20the=20Guide=20=E2=86=92=20Requests=20ta?= =?utf8?q?b=20for=20UltraPrivacy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/de/guide_requests_dark.html | 7 +++++-- app/src/main/assets/de/guide_requests_light.html | 7 +++++-- app/src/main/assets/en/guide_requests_dark.html | 7 +++++-- app/src/main/assets/en/guide_requests_light.html | 7 +++++-- .../activities/MainWebViewActivity.java | 14 +++++++++++++- app/src/main/res/values-es/strings.xml | 3 +++ app/src/main/res/values-it/strings.xml | 7 +++++-- app/src/main/res/values-ru/strings.xml | 3 +++ 8 files changed, 44 insertions(+), 11 deletions(-) diff --git a/app/src/main/assets/de/guide_requests_dark.html b/app/src/main/assets/de/guide_requests_dark.html index 7b4f5cd9..3d19c542 100644 --- a/app/src/main/assets/de/guide_requests_dark.html +++ b/app/src/main/assets/de/guide_requests_dark.html @@ -31,7 +31,7 @@

-

Privacy Browser includes four blocklists based on the Adblock syntax: +

Privacy Browser includes four common blocklists based on the Adblock syntax: EasyList, EasyPrivacy, Fanboy’s Annoyance List, and Fanboy’s Social Blocking List. These blocklists are processed by Privacy Browser into the following 22 sublists, which check resource requests in the order listed.

@@ -69,7 +69,10 @@ This can sometimes lead to false positives, where resources are allowed or blocked in ways that weren’t intended by the original entry. A more detailed description of how the blocklist entries are processed is available at stoutner.com.

-

Privacy Browser has a fifth blocklist that blocks all third-party requests. A request is only considered third-party if the base domain of the request is different than the base domain of the URL. +

Privacy Browser has two additional blocklists, + one called UltraPrivacy that blocks trackers that EasyPrivacy allows, + and the other that blocks all third-party requests. + A request is only considered third-party if the base domain of the request is different than the base domain of the URL. For example, if www.website.com loads a picture from images.website.com, this is not blocked as a third-party request because they both share the same base domain of website.com. Blocking all third-party requests increases privacy, but this blocklist is disabled by default because it breaks a large number of websites.

diff --git a/app/src/main/assets/de/guide_requests_light.html b/app/src/main/assets/de/guide_requests_light.html index 322e31e5..b7511a46 100644 --- a/app/src/main/assets/de/guide_requests_light.html +++ b/app/src/main/assets/de/guide_requests_light.html @@ -31,7 +31,7 @@

-

Privacy Browser includes four blocklists based on the Adblock syntax: +

Privacy Browser includes four common blocklists based on the Adblock syntax: EasyList, EasyPrivacy, Fanboy’s Annoyance List, and Fanboy’s Social Blocking List. These blocklists are processed by Privacy Browser into the following 22 sublists, which check resource requests in the order listed.

@@ -69,7 +69,10 @@ This can sometimes lead to false positives, where resources are allowed or blocked in ways that weren’t intended by the original entry. A more detailed description of how the blocklist entries are processed is available at stoutner.com.

-

Privacy Browser has a fifth blocklist that blocks all third-party requests. A request is only considered third-party if the base domain of the request is different than the base domain of the URL. +

Privacy Browser has two additional blocklists, + one called UltraPrivacy that blocks trackers that EasyPrivacy allows, + and the other that blocks all third-party requests. + A request is only considered third-party if the base domain of the request is different than the base domain of the URL. For example, if www.website.com loads a picture from images.website.com, this is not blocked as a third-party request because they both share the same base domain of website.com. Blocking all third-party requests increases privacy, but this blocklist is disabled by default because it breaks a large number of websites.

diff --git a/app/src/main/assets/en/guide_requests_dark.html b/app/src/main/assets/en/guide_requests_dark.html index 7b4f5cd9..3d19c542 100644 --- a/app/src/main/assets/en/guide_requests_dark.html +++ b/app/src/main/assets/en/guide_requests_dark.html @@ -31,7 +31,7 @@

-

Privacy Browser includes four blocklists based on the Adblock syntax: +

Privacy Browser includes four common blocklists based on the Adblock syntax: EasyList, EasyPrivacy, Fanboy’s Annoyance List, and Fanboy’s Social Blocking List. These blocklists are processed by Privacy Browser into the following 22 sublists, which check resource requests in the order listed.

@@ -69,7 +69,10 @@ This can sometimes lead to false positives, where resources are allowed or blocked in ways that weren’t intended by the original entry. A more detailed description of how the blocklist entries are processed is available at stoutner.com.

-

Privacy Browser has a fifth blocklist that blocks all third-party requests. A request is only considered third-party if the base domain of the request is different than the base domain of the URL. +

Privacy Browser has two additional blocklists, + one called UltraPrivacy that blocks trackers that EasyPrivacy allows, + and the other that blocks all third-party requests. + A request is only considered third-party if the base domain of the request is different than the base domain of the URL. For example, if www.website.com loads a picture from images.website.com, this is not blocked as a third-party request because they both share the same base domain of website.com. Blocking all third-party requests increases privacy, but this blocklist is disabled by default because it breaks a large number of websites.

diff --git a/app/src/main/assets/en/guide_requests_light.html b/app/src/main/assets/en/guide_requests_light.html index 322e31e5..b7511a46 100644 --- a/app/src/main/assets/en/guide_requests_light.html +++ b/app/src/main/assets/en/guide_requests_light.html @@ -31,7 +31,7 @@

-

Privacy Browser includes four blocklists based on the Adblock syntax: +

Privacy Browser includes four common blocklists based on the Adblock syntax: EasyList, EasyPrivacy, Fanboy’s Annoyance List, and Fanboy’s Social Blocking List. These blocklists are processed by Privacy Browser into the following 22 sublists, which check resource requests in the order listed.

@@ -69,7 +69,10 @@ This can sometimes lead to false positives, where resources are allowed or blocked in ways that weren’t intended by the original entry. A more detailed description of how the blocklist entries are processed is available at stoutner.com.

-

Privacy Browser has a fifth blocklist that blocks all third-party requests. A request is only considered third-party if the base domain of the request is different than the base domain of the URL. +

Privacy Browser has two additional blocklists, + one called UltraPrivacy that blocks trackers that EasyPrivacy allows, + and the other that blocks all third-party requests. + A request is only considered third-party if the base domain of the request is different than the base domain of the URL. For example, if www.website.com loads a picture from images.website.com, this is not blocked as a third-party request because they both share the same base domain of website.com. Blocking all third-party requests increases privacy, but this blocklist is disabled by default because it breaks a large number of websites.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index 7c8c5432..d8481199 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -1323,7 +1323,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Create an empty web resource response to be used if the resource request is blocked. WebResourceResponse emptyWebResourceResponse = new WebResourceResponse("text/plain", "utf8", new ByteArrayInputStream("".getBytes())); - // Reset `whiteListResultStringArray`. + // Reset the whitelist results tracker. whiteListResultStringArray = null; // Initialize the third party request tracker. @@ -1393,6 +1393,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Check EasyList if it is enabled. if (easyListEnabled) { if (blockListHelper.isBlocked(currentDomain, url, isThirdPartyRequest, easyList)) { + // Reset the whitelist results tracker (because otherwise it will sometimes add results to the list due to a race condition). + whiteListResultStringArray = null; + // The resource request was blocked. Return an empty web resource response. return emptyWebResourceResponse; } @@ -1401,6 +1404,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Check EasyPrivacy if it is enabled. if (easyPrivacyEnabled) { if (blockListHelper.isBlocked(currentDomain, url, isThirdPartyRequest, easyPrivacy)) { + // Reset the whitelist results tracker (because otherwise it will sometimes add results to the list due to a race condition). + whiteListResultStringArray = null; + // The resource request was blocked. Return an empty web resource response. return emptyWebResourceResponse; } @@ -1409,11 +1415,17 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Check Fanboy’s Annoyance List if it is enabled. if (fanboysAnnoyanceListEnabled) { if (blockListHelper.isBlocked(currentDomain, url, isThirdPartyRequest, fanboysAnnoyanceList)) { + // Reset the whitelist results tracker (because otherwise it will sometimes add results to the list due to a race condition). + whiteListResultStringArray = null; + // The resource request was blocked. Return an empty web resource response. return emptyWebResourceResponse; } } else if (fanboysSocialBlockingListEnabled){ // Only check Fanboy’s Social Blocking List if Fanboy’s Annoyance List is disabled. if (blockListHelper.isBlocked(currentDomain, url, isThirdPartyRequest, fanboysSocialList)) { + // Reset the whitelist results tracker (because otherwise it will sometimes add results to the list due to a race condition). + whiteListResultStringArray = null; + // The resource request was blocked. Return an empty web resource response. return emptyWebResourceResponse; } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cf117bde..6acb8b38 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -361,6 +361,8 @@ Bloquear popups y enlaces molestos. Incluye la lista de bloqueo social de Fanboy. Lista de bloqueo social de Fanboy Bloquear contenidos de medios sociales de terceros. + Ultra Privacidad + Ultra Privacidad bloquea los rastreadores que no bloquea EasyPrivacy, porque al hacerlo puede romper páginas web. Bloquear todas las solicitudes de terceras partes Bloquear todas las solicitudes de terceras partes aumenta la privacidad, pero rompe muchas páginas web. Tor @@ -477,6 +479,7 @@ EasyPrivacy: Lista molesta de Fanboy: Lista de bloqueo social de Fanboy: + Ultra Privacidad: Firma del paquete DN del emisor: DN del sujeto: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 42734996..1b7f3b75 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -360,8 +360,10 @@ Blocca fastidiosi pop-up e collegamenti. Include le liste Fanboy’s social blocking. Fanboy’s social blocking list Blocca contenuti di terze parti sui social media . - 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. + UltraPrivacy + L\'UltraPrivacy blocca i tracciamenti che EasyPrivacy ignora perché potrebbero impedire la visualizzazione dei 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. Tor Utilizza Proxy con Orbot Utilizza Proxy attraverso Orbot su localhost:8118. @@ -476,6 +478,7 @@ EasyPrivacy: Fanboy’s Annoyance List: Fanboy’s Social Blocking List: + UltraPrivacy: Firma del Pacchetto Emittente: Soggetto: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c711836e..f92f45a3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -360,6 +360,8 @@ Блокирует раздражающие всплывающие окна и ссылки. Включает в себя Fanboy’s social blocking lists. Fanboy’s social blocking list Блокирует содержимое социальных сетей. + UltraPrivacy + UltraPrivacy блокирует трекеры, которые пропускает EasyPrivacy, чтобы не ломать веб-сайты. Блокировать все сторонние запросы Блокировка всех сторонних запросов повышает конфиденциальность, но ломает многие веб-сайты. Tor @@ -474,6 +476,7 @@ EasyPrivacy: Fanboy’s Annoyance List: Fanboy’s Social Blocking List: + UltraPrivacy: Подпись пакета DN эмитента: DN субъекта: -- 2.45.2