From: Soren Stoutner Date: Sun, 22 Jul 2018 03:47:18 +0000 (-0700) Subject: Add a Guide → Requests tab. https://redmine.stoutner.com/issues/301 X-Git-Tag: v2.12~12 X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=7bc7a51a468fd1a5e4801b2fd2c6a7b38ac36ba1 Add a Guide → Requests tab. https://redmine.stoutner.com/issues/301 --- diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 91869fde..872ecca6 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -2,6 +2,7 @@ aaaa + adblock adsense adservers adview @@ -134,6 +135,7 @@ subdomain subdomains subfolders + sublists swipetorefresh tablayout techrepublic diff --git a/app/src/main/assets/de/guide_domain_settings_dark.html b/app/src/main/assets/de/guide_domain_settings_dark.html index fad6583e..283811a2 100644 --- a/app/src/main/assets/de/guide_domain_settings_dark.html +++ b/app/src/main/assets/de/guide_domain_settings_dark.html @@ -30,7 +30,7 @@ However, some websites legitimately need these features enabled to function correctly. Domain settings can automatically turn on a specified set of features when visiting a designated domain.

-

+

When visiting a domain that has domain settings specified, the background of the URL text box is green.

diff --git a/app/src/main/assets/de/guide_domain_settings_light.html b/app/src/main/assets/de/guide_domain_settings_light.html index a110bc34..cc28c0fe 100644 --- a/app/src/main/assets/de/guide_domain_settings_light.html +++ b/app/src/main/assets/de/guide_domain_settings_light.html @@ -30,7 +30,7 @@ However, some websites legitimately need these features enabled to function correctly. Domain settings can automatically turn on a specified set of features when visiting a designated domain.

-

+

When visiting a domain that has domain settings specified, the background of the URL text box is green.

diff --git a/app/src/main/assets/de/guide_requests_dark.html b/app/src/main/assets/de/guide_requests_dark.html new file mode 100644 index 00000000..7b4f5cd9 --- /dev/null +++ b/app/src/main/assets/de/guide_requests_dark.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Main Whitelist
    2. +
  2. Final Whitelist
    3. +
  3. Domain Whitelist
    4. +
  4. Domain Initial Whitelist
    5. +
  5. Domain Final Whitelist
    6. +
  6. Third-Party Whitelist
    7. +
  7. Third-Party Domain Whitelist
    8. +
  8. Third-Party Domain Initial Whitelist
    9. +
  9. Main Blacklist
    10. +
  10. Initial Blacklist
    11. +
  11. Final Blacklist
    12. +
  12. Domain Blacklist
    13. +
  13. Domain Initial Blacklist
    14. +
  14. Domain Final Blacklist
    15. +
  15. Domain Regular Expression Blacklist
    16. +
  16. Third-Party Blacklist
    17. +
  17. Third-Party Initial Blacklist
    18. +
  18. Third-Party Domain Blacklist
    19. +
  19. Third-Party Domain Initial Blacklist
    20. +
  20. Third-Party Regular Expression Blacklist
    21. +
  21. Third-Party Domain Regular Expression Blacklist
    22. +
  22. Regular Expression Blacklist
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/de/guide_requests_light.html b/app/src/main/assets/de/guide_requests_light.html new file mode 100644 index 00000000..322e31e5 --- /dev/null +++ b/app/src/main/assets/de/guide_requests_light.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Main Whitelist
    2. +
  2. Final Whitelist
    3. +
  3. Domain Whitelist
    4. +
  4. Domain Initial Whitelist
    5. +
  5. Domain Final Whitelist
    6. +
  6. Third-Party Whitelist
    7. +
  7. Third-Party Domain Whitelist
    8. +
  8. Third-Party Domain Initial Whitelist
    9. +
  9. Main Blacklist
    10. +
  10. Initial Blacklist
    11. +
  11. Final Blacklist
    12. +
  12. Domain Blacklist
    13. +
  13. Domain Initial Blacklist
    14. +
  14. Domain Final Blacklist
    15. +
  15. Domain Regular Expression Blacklist
    16. +
  16. Third-Party Blacklist
    17. +
  17. Third-Party Initial Blacklist
    18. +
  18. Third-Party Domain Blacklist
    19. +
  19. Third-Party Domain Initial Blacklist
    20. +
  20. Third-Party Regular Expression Blacklist
    21. +
  21. Third-Party Domain Regular Expression Blacklist
    22. +
  22. Regular Expression Blacklist
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/de/guide_user_agent_dark.html b/app/src/main/assets/de/guide_user_agent_dark.html index 52c4b80d..9132be93 100644 --- a/app/src/main/assets/de/guide_user_agent_dark.html +++ b/app/src/main/assets/de/guide_user_agent_dark.html @@ -28,35 +28,32 @@

Browser-Identifikation

-

Wenn Internetbrowser sich mit Websites verbinden senden sie einen sog. User Agent, welcher den Browser und die - Rendering-Möglichkeiten an die Website kommuniziert. Die Website kann diese Informationen nutzen, um zu entscheiden, welche Version der Website - an den Browser übermittelt werden soll. Viele Websites haben beispielsweise verschiedene Versionen für Desktopcomputer - mobile Browser.

+

When web browsers connect to websites, they send a user agent, which identifies the browser and the rendering capabilities it possesses. + The web server can use this information to decide which version of the website to send to the browser. + For example, many websites have different versions for desktop and mobile browsers.

-

Privacy Browser nutzt standardmäßig den auf dem Gerät in WebView integrierten User Agent. - Sie können nachsehen, welcher es ist, wenn Sie in die Einstellungen gehen und den User Agent auf WebView-Standard stellen. - Der Screenshot unten zeigt ein Nexus 6P mit Android 7.1.2 und installiertem Android System WebView 60.0.3112.107.

+

By default, Privacy Browser uses its own user agent, which is PrivacyBrowser/1.0. This sends a minimum of information to the web server. + Because web servers do not recognize this to be a mobile user agent, they typically display the desktop version of the site.

- +

By comparison, WebView’s default user agent divulges a large amount of information about the hardware and software of the device. + On the Settings screen, selecting WebView Default as the User agent displays the user agent that will be sent. + The screenshot below shows a Pixel 2 XL running Android 8.1.0 with Android System WebView 67.0.3396.87 installed. + Most web servers will recognize this as a mobile browser and will display the mobile version of the site if they have one.

-

Im User Agent sind genügend Informationen, sodass manchmal nur einige wenige Besucher einer Website denselben haben. Wenn der User Agent - mit einem anderen Teil von nicht-einmaligen Identifizierungsinformationen kombiniert wird, resultiert das oft in einem einmaligen "Fingerabdruck". - Die Electronic Frontier Foundation hat ein Tool namens Panopticlick erstellt, - um zu demonstrieren, wie viele Informationen aus diesen Quellen bezogen werden können. Wenn dieser Test mit aktiviertem Javascript ausgeführt wird - wächst die Anzahl an Sammelband Informationen drastisch.

+ - +

There is enough information in the user agent that sometimes only a few visitors to a website will be the same. + If the user agent is combined with another piece of non-unique identifying information, often it results in a unique fingerprint. + The Electronic Frontier Foundation created a tool called Panopticlick to demonstrate how much information can be gleaned from these sources. + If this test is run with JavaScript enabled the amount of information that is disclosed increases greatly. + Browser Leaks and Am I Unique are also good sources of information on this topic.

-

Privacy Browser erlaubt Ihnen den User Agent zu ändern. Es gibt einige vorgegebenen Optionen, die auf übliche Browser und Betriebssysteme zutreffen. - Privacy Browser hat außerdem seinen eigenen User Agent, welcher ganz einfach PrivacyBrowser/1.0 ist. Beim Tracking gilt: Alles was selten ist, ist einfacher - zu verfolgen. Wenn Privacy Browser bekannter wird und mehr Leute PrivacyBrowser/1.0 als User Agent nutzen wird es eine gute Wahl für Privatsphäre darstellen. - Momentan ermöglicht das Wählen von etwas, das viele Klicks auf dem Server hat, wie Edge 13 auf Windows 10, das Untertauchen in der - Menge der Nutzer. Firefox oder Chrome bieten weniger Privatsphäre, da sie automatisch aktualisiert werden und ihre Versionsnummer so schnell wechselt, sodass - die in Privacy Browser eingepflegte Version wahrscheinlich schnell überholt wird und so oft aus der auf Server Logs auftauchenden Menge heraussticht.

+ -

Ein zweiter Grund für das Ändern des User Agents ist das Überzeugen des Servers, dass er die Desktopversion der Website anzeigen soll, welche oftmals - besser auf modernen Smartphones läuft als die mobile Seite. Für diesen Zweck funktioniert PrivacyBrowser/1.0 sehr gut, da Webserver für gewöhnlich - die Desktopversion als Standardversion anzeigen, wenn sie keinen mobilen Browser als User Agent erhalten.

+

There are several preset user agents that match common browsers and operating systems. For browser fingerprinting purposes, anything that is rare is easier to track. + If Privacy Browser becomes common and many people use PrivacyBrowser/1.0 as their user agent, it will be a good choice for privacy. + Firefox or Chrome are the most common user agents, but they auto-update and their version numbers change so quickly that it is likely the user agents included in Privacy Browser + will often be out of step with the majority of user agents in the server logs.

Some websites do not function correctly if they do not recognize the user agent. Using domain settings to set the user agent to WebView Default, or another user agent that is commonly recognized, usually resolves the problem. diff --git a/app/src/main/assets/de/guide_user_agent_light.html b/app/src/main/assets/de/guide_user_agent_light.html index 9b9cfec9..2415a100 100644 --- a/app/src/main/assets/de/guide_user_agent_light.html +++ b/app/src/main/assets/de/guide_user_agent_light.html @@ -28,35 +28,32 @@

Browser-Identifikation

-

Wenn Internetbrowser sich mit Websites verbinden senden sie einen sog. User Agent, welcher den Browser und die - Rendering-Möglichkeiten an die Website kommuniziert. Die Website kann diese Informationen nutzen, um zu entscheiden, welche Version der Website - an den Browser übermittelt werden soll. Viele Websites haben beispielsweise verschiedene Versionen für Desktopcomputer - mobile Browser.

+

When web browsers connect to websites, they send a user agent, which identifies the browser and the rendering capabilities it possesses. + The web server can use this information to decide which version of the website to send to the browser. + For example, many websites have different versions for desktop and mobile browsers.

-

Privacy Browser nutzt standardmäßig den auf dem Gerät in WebView integrierten User Agent. - Sie können nachsehen, welcher es ist, wenn Sie in die Einstellungen gehen und den User Agent auf WebView-Standard stellen. - Der Screenshot unten zeigt ein Nexus 6P mit Android 7.1.2 und installiertem Android System WebView 60.0.3112.107.

+

By default, Privacy Browser uses its own user agent, which is PrivacyBrowser/1.0. This sends a minimum of information to the web server. + Because web servers do not recognize this to be a mobile user agent, they typically display the desktop version of the site.

- +

By comparison, WebView’s default user agent divulges a large amount of information about the hardware and software of the device. + On the Settings screen, selecting WebView Default as the User agent displays the user agent that will be sent. + The screenshot below shows a Pixel 2 XL running Android 8.1.0 with Android System WebView 67.0.3396.87 installed. + Most web servers will recognize this as a mobile browser and will display the mobile version of the site if they have one.

-

Im User Agent sind genügend Informationen, sodass manchmal nur einige wenige Besucher einer Website denselben haben. Wenn der User Agent - mit einem anderen Teil von nicht-einmaligen Identifizierungsinformationen kombiniert wird, resultiert das oft in einem einmaligen "Fingerabdruck". - Die Electronic Frontier Foundation hat ein Tool namens Panopticlick erstellt, - um zu demonstrieren, wie viele Informationen aus diesen Quellen bezogen werden können. Wenn dieser Test mit aktiviertem Javascript ausgeführt wird - wächst die Anzahl an Sammelband Informationen drastisch.

+ - +

There is enough information in the user agent that sometimes only a few visitors to a website will be the same. + If the user agent is combined with another piece of non-unique identifying information, often it results in a unique fingerprint. + The Electronic Frontier Foundation created a tool called Panopticlick to demonstrate how much information can be gleaned from these sources. + If this test is run with JavaScript enabled the amount of information that is disclosed increases greatly. + Browser Leaks and Am I Unique are also good sources of information on this topic.

-

Privacy Browser erlaubt Ihnen den User Agent zu ändern. Es gibt einige vorgegebenen Optionen, die auf übliche Browser und Betriebssysteme zutreffen. - Privacy Browser hat außerdem seinen eigenen User Agent, welcher ganz einfach PrivacyBrowser/1.0 ist. Beim Tracking gilt: Alles was selten ist, ist einfacher - zu verfolgen. Wenn Privacy Browser bekannter wird und mehr Leute PrivacyBrowser/1.0 als User Agent nutzen wird es eine gute Wahl für Privatsphäre darstellen. - Momentan ermöglicht das Wählen von etwas, das viele Klicks auf dem Server hat, wie Edge 13 auf Windows 10, das Untertauchen in der - Menge der Nutzer. Firefox oder Chrome bieten weniger Privatsphäre, da sie automatisch aktualisiert werden und ihre Versionsnummer so schnell wechselt, sodass - die in Privacy Browser eingepflegte Version wahrscheinlich schnell überholt wird und so oft aus der auf Server Logs auftauchenden Menge heraussticht.

+ -

Ein zweiter Grund für das Ändern des User Agents ist das Überzeugen des Servers, dass er die Desktopversion der Website anzeigen soll, welche oftmals - besser auf modernen Smartphones läuft als die mobile Seite. Für diesen Zweck funktioniert PrivacyBrowser/1.0 sehr gut, da Webserver für gewöhnlich - die Desktopversion als Standardversion anzeigen, wenn sie keinen mobilen Browser als User Agent erhalten.

+

There are several preset user agents that match common browsers and operating systems. For browser fingerprinting purposes, anything that is rare is easier to track. + If Privacy Browser becomes common and many people use PrivacyBrowser/1.0 as their user agent, it will be a good choice for privacy. + Firefox or Chrome are the most common user agents, but they auto-update and their version numbers change so quickly that it is likely the user agents included in Privacy Browser + will often be out of step with the majority of user agents in the server logs.

Some websites do not function correctly if they do not recognize the user agent. Using domain settings to set the user agent to WebView Default, or another user agent that is commonly recognized, usually resolves the problem. diff --git a/app/src/main/assets/de/images/domain_settings.png b/app/src/main/assets/de/images/domain_settings.png index c4fe96db..67a4122a 100644 Binary files a/app/src/main/assets/de/images/domain_settings.png and b/app/src/main/assets/de/images/domain_settings.png differ diff --git a/app/src/main/assets/de/images/request_details.png b/app/src/main/assets/de/images/request_details.png new file mode 100644 index 00000000..9d160279 Binary files /dev/null and b/app/src/main/assets/de/images/request_details.png differ diff --git a/app/src/main/assets/de/images/user_agent.png b/app/src/main/assets/de/images/user_agent.png index 96c6c911..121cb3f2 100644 Binary files a/app/src/main/assets/de/images/user_agent.png and b/app/src/main/assets/de/images/user_agent.png differ diff --git a/app/src/main/assets/en/guide_domain_settings_dark.html b/app/src/main/assets/en/guide_domain_settings_dark.html index 57f7d294..574916c4 100644 --- a/app/src/main/assets/en/guide_domain_settings_dark.html +++ b/app/src/main/assets/en/guide_domain_settings_dark.html @@ -30,7 +30,7 @@ However, some websites legitimately need these features enabled to function correctly. Domain settings can automatically turn on a specified set of features when visiting a designated domain.

-

+

When visiting a domain that has domain settings specified, the background of the URL text box is green.

diff --git a/app/src/main/assets/en/guide_domain_settings_light.html b/app/src/main/assets/en/guide_domain_settings_light.html index 3edf86ff..c9e36a10 100644 --- a/app/src/main/assets/en/guide_domain_settings_light.html +++ b/app/src/main/assets/en/guide_domain_settings_light.html @@ -30,7 +30,7 @@ However, some websites legitimately need these features enabled to function correctly. Domain settings can automatically turn on a specified set of features when visiting a designated domain.

-

+

When visiting a domain that has domain settings specified, the background of the URL text box is green.

diff --git a/app/src/main/assets/en/guide_requests_dark.html b/app/src/main/assets/en/guide_requests_dark.html new file mode 100644 index 00000000..7b4f5cd9 --- /dev/null +++ b/app/src/main/assets/en/guide_requests_dark.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Main Whitelist
    2. +
  2. Final Whitelist
    3. +
  3. Domain Whitelist
    4. +
  4. Domain Initial Whitelist
    5. +
  5. Domain Final Whitelist
    6. +
  6. Third-Party Whitelist
    7. +
  7. Third-Party Domain Whitelist
    8. +
  8. Third-Party Domain Initial Whitelist
    9. +
  9. Main Blacklist
    10. +
  10. Initial Blacklist
    11. +
  11. Final Blacklist
    12. +
  12. Domain Blacklist
    13. +
  13. Domain Initial Blacklist
    14. +
  14. Domain Final Blacklist
    15. +
  15. Domain Regular Expression Blacklist
    16. +
  16. Third-Party Blacklist
    17. +
  17. Third-Party Initial Blacklist
    18. +
  18. Third-Party Domain Blacklist
    19. +
  19. Third-Party Domain Initial Blacklist
    20. +
  20. Third-Party Regular Expression Blacklist
    21. +
  21. Third-Party Domain Regular Expression Blacklist
    22. +
  22. Regular Expression Blacklist
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/en/guide_requests_light.html b/app/src/main/assets/en/guide_requests_light.html new file mode 100644 index 00000000..322e31e5 --- /dev/null +++ b/app/src/main/assets/en/guide_requests_light.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Main Whitelist
    2. +
  2. Final Whitelist
    3. +
  3. Domain Whitelist
    4. +
  4. Domain Initial Whitelist
    5. +
  5. Domain Final Whitelist
    6. +
  6. Third-Party Whitelist
    7. +
  7. Third-Party Domain Whitelist
    8. +
  8. Third-Party Domain Initial Whitelist
    9. +
  9. Main Blacklist
    10. +
  10. Initial Blacklist
    11. +
  11. Final Blacklist
    12. +
  12. Domain Blacklist
    13. +
  13. Domain Initial Blacklist
    14. +
  14. Domain Final Blacklist
    15. +
  15. Domain Regular Expression Blacklist
    16. +
  16. Third-Party Blacklist
    17. +
  17. Third-Party Initial Blacklist
    18. +
  18. Third-Party Domain Blacklist
    19. +
  19. Third-Party Domain Initial Blacklist
    20. +
  20. Third-Party Regular Expression Blacklist
    21. +
  21. Third-Party Domain Regular Expression Blacklist
    22. +
  22. Regular Expression Blacklist
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/en/guide_user_agent_dark.html b/app/src/main/assets/en/guide_user_agent_dark.html index b8a8e9e7..9a15c9df 100644 --- a/app/src/main/assets/en/guide_user_agent_dark.html +++ b/app/src/main/assets/en/guide_user_agent_dark.html @@ -35,10 +35,10 @@

By comparison, WebView’s default user agent divulges a large amount of information about the hardware and software of the device. On the Settings screen, selecting WebView Default as the User agent displays the user agent that will be sent. - The screenshot below shows a Nexus 6P running Android 7.1.2 with Android System WebView 60.0.3112.107 installed. + The screenshot below shows a Pixel 2 XL running Android 8.1.0 with Android System WebView 67.0.3396.87 installed. Most web servers will recognize this as a mobile browser and will display the mobile version of the site if they have one.

- +

There is enough information in the user agent that sometimes only a few visitors to a website will be the same. If the user agent is combined with another piece of non-unique identifying information, often it results in a unique fingerprint. diff --git a/app/src/main/assets/en/guide_user_agent_light.html b/app/src/main/assets/en/guide_user_agent_light.html index 3a40c54f..3616b7e7 100644 --- a/app/src/main/assets/en/guide_user_agent_light.html +++ b/app/src/main/assets/en/guide_user_agent_light.html @@ -35,10 +35,10 @@

By comparison, WebView’s default user agent divulges a large amount of information about the hardware and software of the device. On the Settings screen, selecting WebView Default as the User agent displays the user agent that will be sent. - The screenshot below shows a Nexus 6P running Android 7.1.2 with Android System WebView 60.0.3112.107 installed. + The screenshot below shows a Pixel 2 XL running Android 8.1.0 with Android System WebView 67.0.3396.87 installed. Most web servers will recognize this as a mobile browser and will display the mobile version of the site if they have one.

- +

There is enough information in the user agent that sometimes only a few visitors to a website will be the same. If the user agent is combined with another piece of non-unique identifying information, often it results in a unique fingerprint. diff --git a/app/src/main/assets/en/images/domain_settings.png b/app/src/main/assets/en/images/domain_settings.png index b768699b..416873e8 100644 Binary files a/app/src/main/assets/en/images/domain_settings.png and b/app/src/main/assets/en/images/domain_settings.png differ diff --git a/app/src/main/assets/en/images/request_details.png b/app/src/main/assets/en/images/request_details.png new file mode 100644 index 00000000..e777e7f8 Binary files /dev/null and b/app/src/main/assets/en/images/request_details.png differ diff --git a/app/src/main/assets/en/images/user_agent.png b/app/src/main/assets/en/images/user_agent.png index 3e5fb3c3..31c921c7 100644 Binary files a/app/src/main/assets/en/images/user_agent.png and b/app/src/main/assets/en/images/user_agent.png differ diff --git a/app/src/main/assets/es/guide_domain_settings_dark.html b/app/src/main/assets/es/guide_domain_settings_dark.html index 248f1f4f..f52207bb 100644 --- a/app/src/main/assets/es/guide_domain_settings_dark.html +++ b/app/src/main/assets/es/guide_domain_settings_dark.html @@ -32,7 +32,7 @@ Sin embargo, algunas páginas web necesitan legítimamente estas características para funcionar correctamente. La configuración de dominio puede activar automáticamente un conjunto específico de características al visitar un dominio designado.

-

+

Al visitar un dominio que tiene la configuración de dominio especificada, el fondo de la casilla de texto de la URL es verde.

diff --git a/app/src/main/assets/es/guide_domain_settings_light.html b/app/src/main/assets/es/guide_domain_settings_light.html index 30620516..e7b64f23 100644 --- a/app/src/main/assets/es/guide_domain_settings_light.html +++ b/app/src/main/assets/es/guide_domain_settings_light.html @@ -32,7 +32,7 @@ Sin embargo, algunas páginas web necesitan legítimamente estas características para funcionar correctamente. La configuración de dominio puede activar automáticamente un conjunto específico de características al visitar un dominio designado.

-

+

Al visitar un dominio que tiene la configuración de dominio especificada, el fondo de la casilla de texto de la URL es verde.

diff --git a/app/src/main/assets/es/guide_requests_dark.html b/app/src/main/assets/es/guide_requests_dark.html new file mode 100644 index 00000000..098f511e --- /dev/null +++ b/app/src/main/assets/es/guide_requests_dark.html @@ -0,0 +1,79 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Lista blanca principal
    2. +
  2. Lista blanca final
    3. +
  3. Lista blanca de dominios
    4. +
  4. Lista blanca inicial de dominios
    5. +
  5. Lista blanca final de dominios
    6. +
  6. Lista blanca de terceros
    7. +
  7. Lista blanca de dominios de terceros
    8. +
  8. Lista blanca inicial de dominios de terceros
    9. +
  9. Lista negra principal
    10. +
  10. Lista negra inicial
    11. +
  11. Lista negra final
    12. +
  12. Lista negra de dominios
    13. +
  13. Lista negra inicial de dominios
    14. +
  14. Lista negra final de dominios
    15. +
  15. Lista negra de expresiones regulares de dominios
    16. +
  16. Lista negra de terceros
    17. +
  17. Lista negra inicial de terceros
    18. +
  18. Lista negra de dominios de terceros
    19. +
  19. Lista negra inicial de dominios de terceros
    20. +
  20. Lista negra de expresiones regulares de terceros
    21. +
  21. Lista negra de expresiones regulares de dominios de terceros
    22. +
  22. Lista negra de expresiones regulares
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/es/guide_requests_light.html b/app/src/main/assets/es/guide_requests_light.html new file mode 100644 index 00000000..2c6cee85 --- /dev/null +++ b/app/src/main/assets/es/guide_requests_light.html @@ -0,0 +1,79 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Lista blanca principal
    2. +
  2. Lista blanca final
    3. +
  3. Lista blanca de dominios
    4. +
  4. Lista blanca inicial de dominios
    5. +
  5. Lista blanca final de dominios
    6. +
  6. Lista blanca de terceros
    7. +
  7. Lista blanca de dominios de terceros
    8. +
  8. Lista blanca inicial de dominios de terceros
    9. +
  9. Lista negra principal
    10. +
  10. Lista negra inicial
    11. +
  11. Lista negra final
    12. +
  12. Lista negra de dominios
    13. +
  13. Lista negra inicial de dominios
    14. +
  14. Lista negra final de dominios
    15. +
  15. Lista negra de expresiones regulares de dominios
    16. +
  16. Lista negra de terceros
    17. +
  17. Lista negra inicial de terceros
    18. +
  18. Lista negra de dominios de terceros
    19. +
  19. Lista negra inicial de dominios de terceros
    20. +
  20. Lista negra de expresiones regulares de terceros
    21. +
  21. Lista negra de expresiones regulares de dominios de terceros
    22. +
  22. Lista negra de expresiones regulares
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/es/guide_user_agent_dark.html b/app/src/main/assets/es/guide_user_agent_dark.html index b222a0e5..857c2951 100644 --- a/app/src/main/assets/es/guide_user_agent_dark.html +++ b/app/src/main/assets/es/guide_user_agent_dark.html @@ -37,10 +37,10 @@

En comparación, el agente de usuario por defecto de WebView divulga una gran cantidad de información sobre el hardware y el software del dispositivo. En la ventana Configuración, seleccionando WebView por defecto como el Agente de usuario muestra el agente de usuario que se enviará. - La captura de pantalla de abajo muestra un Nexus 6P corriendo Android 7.1.2 con el sistema de android WebView 60.0.3112.107 instalado. + La captura de pantalla de abajo muestra un Pixel 2 XL corriendo Android 8.1.0 con el sistema de android WebView 67.0.3396.87 instalado. La mayoría de servidores web reconocerán esto como un navegador móvil y mostrará la versión móvil del sitio si dispone de ella.

- +

Existe tanta información en el agente de usuario que algunas veces será el mismo con sólo unos pocos visitantes a una página web. Si el agente de usuario es combinado con otra pieza de información identificativa que no es única, esto da lugar a menudo a una huella única. @@ -49,7 +49,7 @@ Si esta prueba se realiza con javascript habilitado, la cantidad de información que es revelada aumenta grandemente. Browser Leaks (Fugas del navegador) y Am I Unique (¿Soy único?) son también buenas fuentes de información.

- +

Existen varios agentes de usuario preestablecidos que coinciden con los más comunes navegadores y sistemas operativos. A los efectos de huellas del navegador, todo lo que sea extraño es más fácil de rastrear. @@ -57,7 +57,7 @@ Firefox o Chrome son los usuarios de agente más comunes, pero se actualizan automáticamente y sus números de versión cambian tan rápidamente que es probable que los usuarios de agente incluídos en Privacy Browser no estén ya en sintonía con la mayoría de agentes de usuario en los registros del servidor.

-

Algunas páginas webno funcionan correctamente si no reconocen el agente de usuario. +

Algunas páginas web no funcionan correctamente si no reconocen el agente de usuario. Usando la configuración de dominios para establecer el agente de usuario a WebView por defecto, o a otro agente de usuario que sea normalmente reconocido, suele resolver el problema. El WebView de android no permite que el agente de usuario esté en blanco. Si lo está, WebView simplemente envía el agente de usuario por defecto al servidor.

diff --git a/app/src/main/assets/es/guide_user_agent_light.html b/app/src/main/assets/es/guide_user_agent_light.html index c4145405..5c2bc320 100644 --- a/app/src/main/assets/es/guide_user_agent_light.html +++ b/app/src/main/assets/es/guide_user_agent_light.html @@ -37,10 +37,10 @@

En comparación, el agente de usuario por defecto de WebView divulga una gran cantidad de información sobre el hardware y el software del dispositivo. En la ventana Configuración, seleccionando WebView por defecto como el Agente de usuario muestra el agente de usuario que se enviará. - La captura de pantalla de abajo muestra un Nexus 6P corriendo Android 7.1.2 con el sistema de android WebView 60.0.3112.107 instalado. + La captura de pantalla de abajo muestra un Pixel 2 XL corriendo Android 8.1.0 con el sistema de android WebView 67.0.3396.87 instalado. La mayoría de servidores web reconocerán esto como un navegador móvil y mostrará la versión móvil del sitio si dispone de ella.

- +

Existe tanta información en el agente de usuario que algunas veces será el mismo con sólo unos pocos visitantes a una página web. Si el agente de usuario es combinado con otra pieza de información identificativa que no es única, esto da lugar a menudo a una huella única. @@ -57,7 +57,7 @@ Firefox o Chrome son los usuarios de agente más comunes, pero se actualizan automáticamente y sus números de versión cambian tan rápidamente que es probable que los usuarios de agente incluídos en Privacy Browser no estén ya en sintonía con la mayoría de agentes de usuario en los registros del servidor.

-

Algunas páginas webno funcionan correctamente si no reconocen el agente de usuario. +

Algunas páginas web no funcionan correctamente si no reconocen el agente de usuario. Usando la configuración de dominios para establecer el agente de usuario a WebView por defecto, o a otro agente de usuario que sea normalmente reconocido, suele resolver el problema. El WebView de android no permite que el agente de usuario esté en blanco. Si lo está, WebView simplemente envía el agente de usuario por defecto al servidor.

diff --git a/app/src/main/assets/es/images/domain_settings.png b/app/src/main/assets/es/images/domain_settings.png index 949a2cc3..4ae90544 100644 Binary files a/app/src/main/assets/es/images/domain_settings.png and b/app/src/main/assets/es/images/domain_settings.png differ diff --git a/app/src/main/assets/es/images/request_details.png b/app/src/main/assets/es/images/request_details.png new file mode 100644 index 00000000..310fe82e Binary files /dev/null and b/app/src/main/assets/es/images/request_details.png differ diff --git a/app/src/main/assets/es/images/user_agent.png b/app/src/main/assets/es/images/user_agent.png index 1164e0bc..95cc3b58 100644 Binary files a/app/src/main/assets/es/images/user_agent.png and b/app/src/main/assets/es/images/user_agent.png differ diff --git a/app/src/main/assets/it/guide_domain_settings_dark.html b/app/src/main/assets/it/guide_domain_settings_dark.html index 5c4390b6..d031c1fe 100644 --- a/app/src/main/assets/it/guide_domain_settings_dark.html +++ b/app/src/main/assets/it/guide_domain_settings_dark.html @@ -26,13 +26,13 @@ -

Navigazione sicura

+

Navigazione sicura

Privacy Browser dovrebbe essere utilizzato di default per navigare con JavaScript, cookies, e DOM storage disabiltati. In ogni caso alcuni siti web necessitano legittimamente di queste funzionalità per essere visualizzati correttamente. Le impostazioni dei Domini permettono di abilitare automaticamente specifici set di funzionalità per i domini che sono stati definiti.

-

+

Quando si accede a un dominio per cui sono state specificate impostazioni personalizzate la casella di testo dell'indirizzo URL si colora di verde.

diff --git a/app/src/main/assets/it/guide_domain_settings_light.html b/app/src/main/assets/it/guide_domain_settings_light.html index 6ad6e27c..045094e6 100644 --- a/app/src/main/assets/it/guide_domain_settings_light.html +++ b/app/src/main/assets/it/guide_domain_settings_light.html @@ -26,13 +26,13 @@ -

Navigazione sicura

+

Navigazione sicura

Privacy Browser dovrebbe essere utilizzato di default per navigare con JavaScript, cookies, e DOM storage disabiltati. In ogni caso alcuni siti web necessitano legittimamente di queste funzionalità per essere visualizzati correttamente. Le impostazioni dei Domini permettono di abilitare automaticamente specifici set di funzionalità per i domini che sono stati definiti.

-

+

Quando si accede a un dominio per cui sono state specificate impostazioni personalizzate la casella di testo dell'indirizzo URL si colora di verde.

diff --git a/app/src/main/assets/it/guide_local_storage_dark.html b/app/src/main/assets/it/guide_local_storage_dark.html index 524622c2..cf7213f7 100644 --- a/app/src/main/assets/it/guide_local_storage_dark.html +++ b/app/src/main/assets/it/guide_local_storage_dark.html @@ -78,14 +78,14 @@ tra cookie proprietari e cookie di terze parti. Per questo motivo l'abilitazione dei primi permette anche la creazione dei secondi.

-

DOM Storage

+

DOM Storage

Il Document Object Model storage, conosciuto anche come web storage, è come l'utilizzo di cookie potenziati. Mentre per tutti i cookie di una singola URL il massimo spazio di memoria occupata è di circa 4 kilobyte, il DOM storage può occupare alcuni megabyte per sito. Siccome il DOM storage utilizza JavaScript per leggere e scrivere dati, la sua abilitazione è inutile se non è stato abilitato anche JavaScript.

-

Dati dei moduli

+

Dati dei moduli

I dati dei moduli contengono le informazioni che vengono digitate nei web form, come user name, indirizzi, numeri di telefono, ecc. per poterli elencare in menù a tendina in caso di visite successive. A differenza delle altre modalità di memorizzazione locale delle informazioni, i dati dei moduli non vengono inviati ai web server senza una interazione con l'utente.

diff --git a/app/src/main/assets/it/guide_local_storage_light.html b/app/src/main/assets/it/guide_local_storage_light.html index 06acac18..17c9150a 100644 --- a/app/src/main/assets/it/guide_local_storage_light.html +++ b/app/src/main/assets/it/guide_local_storage_light.html @@ -78,14 +78,14 @@ tra cookie proprietari e cookie di terze parti. Per questo motivo l'abilitazione dei primi permette anche la creazione dei secondi.

-

DOM Storage

+

DOM Storage

Il Document Object Model storage, conosciuto anche come web storage, è come l'utilizzo di cookie potenziati. Mentre per tutti i cookie di una singola URL il massimo spazio di memoria occupata è di circa 4 kilobyte, il DOM storage può occupare alcuni megabyte per sito. Siccome il DOM storage utilizza JavaScript per leggere e scrivere dati, la sua abilitazione è inutile se non è stato abilitato anche JavaScript.

-

Dati dei moduli

+

Dati dei moduli

I dati dei moduli contengono le informazioni che vengono digitate nei web form, come user name, indirizzi, numeri di telefono, ecc. per poterli elencare in menù a tendina in caso di visite successive. A differenza delle altre modalità di memorizzazione locale delle informazioni, i dati dei moduli non vengono inviati ai web server senza una interazione con l'utente.

diff --git a/app/src/main/assets/it/guide_overview_light.html b/app/src/main/assets/it/guide_overview_light.html index 495df669..89c996ce 100644 --- a/app/src/main/assets/it/guide_overview_light.html +++ b/app/src/main/assets/it/guide_overview_light.html @@ -1,5 +1,5 @@ + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Whitelist principale
    2. +
  2. Whitelist finale
    3. +
  3. Whitelist per i domini
    4. +
  4. Whitelist iniziale
    5. +
  5. Whitelist finale
    6. +
  6. Whitelist di terze parti
    7. +
  7. Whitelist di terze parti per i domini
    8. +
  8. Whitelist di terze parti iniziale per i domini
    9. +
  9. Blacklist principale
    10. +
  10. Blacklist iniziale
    11. +
  11. Blacklist finale
    12. +
  12. Blacklist per i domini
    13. +
  13. Blacklist iniziale
    14. +
  14. Blacklist finale
    15. +
  15. Blacklist per le espressioni regolari
    16. +
  16. Blacklist di terze parti
    17. +
  17. Blacklist di terze parti iniziale
    18. +
  18. Blacklist di terze parti per i domini
    19. +
  19. Blacklist di terze parti iniziale per i domini
    20. +
  20. Blacklist di terze parti per le espressioni regolari
    21. +
  21. Blacklist di terze parti per le espressioni regolari per i domini
    22. +
  22. Blacklist per le espressioni regolari
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/it/guide_requests_light.html b/app/src/main/assets/it/guide_requests_light.html new file mode 100644 index 00000000..73cef4bc --- /dev/null +++ b/app/src/main/assets/it/guide_requests_light.html @@ -0,0 +1,79 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Whitelist principale
    2. +
  2. Whitelist finale
    3. +
  3. Whitelist per i domini
    4. +
  4. Whitelist iniziale
    5. +
  5. Whitelist finale
    6. +
  6. Whitelist di terze parti
    7. +
  7. Whitelist di terze parti per i domini
    8. +
  8. Whitelist di terze parti iniziale per i domini
    9. +
  9. Blacklist principale
    10. +
  10. Blacklist iniziale
    11. +
  11. Blacklist finale
    12. +
  12. Blacklist per i domini
    13. +
  13. Blacklist iniziale
    14. +
  14. Blacklist finale
    15. +
  15. Blacklist per le espressioni regolari
    16. +
  16. Blacklist di terze parti
    17. +
  17. Blacklist di terze parti iniziale
    18. +
  18. Blacklist di terze parti per i domini
    19. +
  19. Blacklist di terze parti iniziale per i domini
    20. +
  20. Blacklist di terze parti per le espressioni regolari
    21. +
  21. Blacklist di terze parti per le espressioni regolari per i domini
    22. +
  22. Blacklist per le espressioni regolari
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/it/guide_ssl_certificates_dark.html b/app/src/main/assets/it/guide_ssl_certificates_dark.html index 1a8c0fd8..7057ef73 100644 --- a/app/src/main/assets/it/guide_ssl_certificates_dark.html +++ b/app/src/main/assets/it/guide_ssl_certificates_dark.html @@ -26,7 +26,7 @@ -

Connettiti in sicurezza

+

Connettiti in sicurezza

Quando si accede ad una URL criptata (quelle che iniziano con HTTPS), il server web utilizza un certificato SSL con lo scopo di criptare le informazioni inviate al browser e di identificare il server stesso. Lo scopo di questa identificazione è quello di impedire che una macchina situata tra il browser e il server web tenti di decriptare le informazioni in transito. diff --git a/app/src/main/assets/it/guide_ssl_certificates_light.html b/app/src/main/assets/it/guide_ssl_certificates_light.html index 9c476e7c..a4a91d2c 100644 --- a/app/src/main/assets/it/guide_ssl_certificates_light.html +++ b/app/src/main/assets/it/guide_ssl_certificates_light.html @@ -26,7 +26,7 @@ -

Connettiti in sicurezza

+

Connettiti in sicurezza

Quando si accede ad una URL criptata (quelle che iniziano con HTTPS), il server web utilizza un certificato SSL con lo scopo di criptare le informazioni inviate al browser e di identificare il server stesso. Lo scopo di questa identificazione è quello di impedire che una macchina situata tra il browser e il server web tenti di decriptare le informazioni in transito. diff --git a/app/src/main/assets/it/guide_tracking_ids_dark.html b/app/src/main/assets/it/guide_tracking_ids_dark.html index 391d47a3..10cc1f00 100644 --- a/app/src/main/assets/it/guide_tracking_ids_dark.html +++ b/app/src/main/assets/it/guide_tracking_ids_dark.html @@ -26,7 +26,7 @@ -

Do Not Track

+

Do Not Track

Alcuni anni fa il W3C (World Wide Web Consortium) ha creato per i browser un meccanismo per informare i web server che preferiscono non essere tracciati. Questo è ottenuto attraverso l'inclusione nella richiesta al server di un header denominato: DNT (Do Not Track).

diff --git a/app/src/main/assets/it/guide_tracking_ids_light.html b/app/src/main/assets/it/guide_tracking_ids_light.html index 3734e654..92ffaeb7 100644 --- a/app/src/main/assets/it/guide_tracking_ids_light.html +++ b/app/src/main/assets/it/guide_tracking_ids_light.html @@ -26,7 +26,7 @@ -

Do Not Track

+

Do Not Track

Alcuni anni fa il W3C (World Wide Web Consortium) ha creato per i browser un meccanismo per informare i web server che preferiscono non essere tracciati. Questo è ottenuto attraverso l'inclusione nella richiesta al server di un header denominato: DNT (Do Not Track).

diff --git a/app/src/main/assets/it/guide_user_agent_dark.html b/app/src/main/assets/it/guide_user_agent_dark.html index d4ca6589..61bd29bc 100644 --- a/app/src/main/assets/it/guide_user_agent_dark.html +++ b/app/src/main/assets/it/guide_user_agent_dark.html @@ -26,7 +26,7 @@ -

Identificazione del Browser

+

Identificazione del Browser

Nel momento in cui un browser si connette ai siti web, invia uno user agent che identifica il browser e le sue caratteristiche di rendering. Il web server può utilizzare tali informazioni per decidere quale versione del sito inviare al browser. @@ -37,10 +37,10 @@

In confronto, lo user agent di default di WebView invia una grande quantità di informazioni sull'hardware e sul software del dispositivo. Sulla schermata Settings, selezionando WebView Default come User agent viene mostrato lo user agent che sarà inviato al web server. - Lo screenshot sottostante mostra un Nexus 6P con Android 7.1.2 con installato Android System WebView 60.0.3112.107. + Lo screenshot sottostante mostra un Pixel 2 XL con Android 8.1.0 con installato Android System WebView 67.0.3396.87. La maggior parte dei web server lo riconoscerà come browser mobile e invierà la versione mobile del sito, se disponibile.

- +

Nello user agent sono presenti informazioni sufficienti a far sì che solo di tanto in tanto a un sito web risulteranno visitatori identici. Se allo user agent viene aggiunto qualche altro pezzetto di informazione anche non univoca, spesso il risultato sarà quello di avere una impronta digitale unica. diff --git a/app/src/main/assets/it/guide_user_agent_light.html b/app/src/main/assets/it/guide_user_agent_light.html index fb05885b..2dcd370e 100644 --- a/app/src/main/assets/it/guide_user_agent_light.html +++ b/app/src/main/assets/it/guide_user_agent_light.html @@ -26,7 +26,7 @@ -

Identificazione del Browser

+

Identificazione del Browser

Nel momento in cui un browser si connette ai siti web, invia uno user agent che identifica il browser e le sue caratteristiche di rendering. Il web server può utilizzare tali informazioni per decidere quale versione del sito inviare al browser. @@ -37,10 +37,10 @@

In confronto, lo user agent di default di WebView invia una grande quantità di informazioni sull'hardware e sul software del dispositivo. Sulla schermata Settings, selezionando WebView Default come User agent viene mostrato lo user agent che sarà inviato al web server. - Lo screenshot sottostante mostra un Nexus 6P con Android 7.1.2 con installato Android System WebView 60.0.3112.107. + Lo screenshot sottostante mostra un Pixel 2 XL con Android 8.1.0 con installato Android System WebView 67.0.3396.87. La maggior parte dei web server lo riconoscerà come browser mobile e invierà la versione mobile del sito, se disponibile.

- +

Nello user agent sono presenti informazioni sufficienti a far sì che solo di tanto in tanto a un sito web risulteranno visitatori identici. Se allo user agent viene aggiunto qualche altro pezzetto di informazione anche non univoca, spesso il risultato sarà quello di avere una impronta digitale unica. diff --git a/app/src/main/assets/it/images/domain_settings.png b/app/src/main/assets/it/images/domain_settings.png index 42dda2a6..27a6211c 100644 Binary files a/app/src/main/assets/it/images/domain_settings.png and b/app/src/main/assets/it/images/domain_settings.png differ diff --git a/app/src/main/assets/it/images/request_details.png b/app/src/main/assets/it/images/request_details.png new file mode 100644 index 00000000..0f181112 Binary files /dev/null and b/app/src/main/assets/it/images/request_details.png differ diff --git a/app/src/main/assets/it/images/user_agent.png b/app/src/main/assets/it/images/user_agent.png index a382d8f8..79680c13 100644 Binary files a/app/src/main/assets/it/images/user_agent.png and b/app/src/main/assets/it/images/user_agent.png differ diff --git a/app/src/main/assets/ru/guide_domain_settings_dark.html b/app/src/main/assets/ru/guide_domain_settings_dark.html index 2dd3d129..43088ad0 100644 --- a/app/src/main/assets/ru/guide_domain_settings_dark.html +++ b/app/src/main/assets/ru/guide_domain_settings_dark.html @@ -29,7 +29,7 @@

По умолчанию в Privacy Browser отключены JavaScript, файлы cookie и хранилище DOM. Однако, для правильной работы, некоторым веб-сайтам эти опции необходимы. Настройки домена могут автоматически включать нужный набор опций при посещении определенного домена.

-

+

При посещении домена, для которого определены настройки, фон поля URL становится зеленым.

diff --git a/app/src/main/assets/ru/guide_domain_settings_light.html b/app/src/main/assets/ru/guide_domain_settings_light.html index 15e9ff57..028f76d7 100644 --- a/app/src/main/assets/ru/guide_domain_settings_light.html +++ b/app/src/main/assets/ru/guide_domain_settings_light.html @@ -24,12 +24,12 @@ -

Безопасный просмотр веб-страниц

+

Безопасный просмотр веб-страниц

По умолчанию в Privacy Browser отключены JavaScript, файлы cookie и хранилище DOM. Однако, для правильной работы, некоторым веб-сайтам эти опции необходимы. Настройки домена могут автоматически включать нужный набор опций при посещении определенного домена.

-

+

При посещении домена, для которого определены настройки, фон поля URL становится зеленым.

diff --git a/app/src/main/assets/ru/guide_local_storage_light.html b/app/src/main/assets/ru/guide_local_storage_light.html index 43733933..5ecbbf20 100644 --- a/app/src/main/assets/ru/guide_local_storage_light.html +++ b/app/src/main/assets/ru/guide_local_storage_light.html @@ -24,7 +24,7 @@ -

Первичные файлы cookie

+

Первичные файлы cookie

Первичные файлы cookie устанавливаются тем веб-сайтом, который указан в строке URL.

@@ -45,7 +45,7 @@

Если первичные файлы cookie включены, но JavaScript отключен, значок конфиденциальности будет желтым как предупреждение.

-

Сторонние файлы cookie

+

Сторонние файлы cookie

Сторонние файлы cookie устанавливаются частями веб-сайта, которые загружаются с серверов, отличных от указанного в строке URL. Например, большинство веб-сайтов, на которых есть реклама, загружают их со стороннего рекламного брокера, например, @@ -75,7 +75,7 @@ Таким образом, включение первичных файлов cookie также разрешит и сторонние.

-

Хранилище DOM

+

Хранилище DOM

Хранилище объектной модели документа (Document Object Model), также известное как веб-хранилище, называют cookie (печенье) на стероидах. В то время как максимальный объем хранения для всех файлов cookie с одного URL-адреса составляет 4 килобайта, @@ -83,7 +83,7 @@ Поскольку хранилище DOM использует JavaScript для чтения и записи данных, включение его ни на что не влияет при отключенном JavaScript.

-

Данные формы

+

Данные формы

Данные формы содержат информацию, вводимую в веб-формы, такие как имена пользователей, адреса, телефонные номера и т. д., и перечисляются в раскрывающемся списке при будущих посещениях. В отличие от других форм локального хранилища данные формы не отправляются на веб-сервер без специального взаимодействия с пользователем.

diff --git a/app/src/main/assets/ru/guide_requests_dark.html b/app/src/main/assets/ru/guide_requests_dark.html new file mode 100644 index 00000000..ce24d0d5 --- /dev/null +++ b/app/src/main/assets/ru/guide_requests_dark.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Основной белый список
    2. +
  2. Конец белого списка
    3. +
  3. Белый список доменов
    4. +
  4. Начало белого списка доменов
    5. +
  5. Конец белого списка доменов
    6. +
  6. Сторонний белый список
    7. +
  7. Сторонний белый список доменов
    8. +
  8. Начало стороннего белого списка доменов
    9. +
  9. Основной черный список
    10. +
  10. Начало черного списка
    11. +
  11. Конец черного списка
    12. +
  12. Черный список доменов
    13. +
  13. Начало черного списка доменов
    14. +
  14. Конец черного списка доменов
    15. +
  15. Регулярные выражения черного списка доменов
    16. +
  16. Сторонний черный список
    17. +
  17. Начало стороннего черного списка доменов
    18. +
  18. Сторонний черный список доменов
    19. +
  19. Начало стороннего черного списка доменов
    20. +
  20. Регулярные выражения стороннего черного списка
    21. +
  21. Регулярные выражения стороннего черного списка доменов
    22. +
  22. Регулярные выражения черного списка
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/ru/guide_requests_light.html b/app/src/main/assets/ru/guide_requests_light.html new file mode 100644 index 00000000..b8aaec3f --- /dev/null +++ b/app/src/main/assets/ru/guide_requests_light.html @@ -0,0 +1,77 @@ + + + + + + + + + + +

Resource Requests

+ +

When a URL is loaded, it typically makes a number of resource requests for CCS, JavaScript, image, and other files. Details about these requests can be viewed in the Requests activity. + The navigation drawer has a link to the Requests activity and also shows how many requests were blocked. Tapping on a request displays details about why it was allowed or blocked.

+ +

+ +

Privacy Browser includes four 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.

+ +
    +
  1. Основной белый список
    2. +
  2. Конец белого списка
    3. +
  3. Белый список доменов
    4. +
  4. Начало белого списка доменов
    5. +
  5. Конец белого списка доменов
    6. +
  6. Сторонний белый список
    7. +
  7. Сторонний белый список доменов
    8. +
  8. Начало стороннего белого списка доменов
    9. +
  9. Основной черный список
    10. +
  10. Начало черного списка
    11. +
  11. Конец черного списка
    12. +
  12. Черный список доменов
    13. +
  13. Начало черного списка доменов
    14. +
  14. Конец черного списка доменов
    15. +
  15. Регулярные выражения черного списка доменов
    16. +
  16. Сторонний черный список
    17. +
  17. Начало стороннего черного списка доменов
    18. +
  18. Сторонний черный список доменов
    19. +
  19. Начало стороннего черного списка доменов
    20. +
  20. Регулярные выражения стороннего черного списка
    21. +
  21. Регулярные выражения стороннего черного списка доменов
    22. +
  22. Регулярные выражения черного списка
    23. +
+ +

Initial lists check against the beginning of the URL. Final lists check against the end of the URL. Domain lists only check against certain domains. + Third-party lists only apply if the root domain of the request is different than the root domain of the main URL. + Regular expression lists follow the regular expression syntax. Each sublist item has one or more entry. + In the case of domain sublists, the resource request is only checked against the item if the first entry matches the domain of the main URL.

+ +

Because of limitations in Android’s WebView, and to speed up processing of requests, Privacy Browser implements a simplified interpretation of the Adblock syntax. + 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. + 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.

+ + \ No newline at end of file diff --git a/app/src/main/assets/ru/guide_ssl_certificates_light.html b/app/src/main/assets/ru/guide_ssl_certificates_light.html index 8c67ae15..13be9806 100644 --- a/app/src/main/assets/ru/guide_ssl_certificates_light.html +++ b/app/src/main/assets/ru/guide_ssl_certificates_light.html @@ -24,7 +24,7 @@ -

Подключение с уверенностью

+

Подключение с уверенностью

При посещении зашифрованного URL (тот, который начинается с HTTPS) веб-сервер использует сертификат SSL для шифрования информации, отправленной в браузер, и для идентификации сервера. Цель идентификации сервера состоит в том, чтобы запретить машине, расположенной между браузером и веб-сервером, притворяться сервером и дешифровать информацию во время ее транзита. diff --git a/app/src/main/assets/ru/guide_tor_light.html b/app/src/main/assets/ru/guide_tor_light.html index 485c795a..75f7cab0 100644 --- a/app/src/main/assets/ru/guide_tor_light.html +++ b/app/src/main/assets/ru/guide_tor_light.html @@ -24,7 +24,7 @@ -

Tor и его ограничения

+

Tor и его ограничения

Существуют две основные отрицательные категории субъектов, которые нарушают конфиденциальность в интернете: злонамеренные правительства, имеющие доступ к интернет-провайдерам и крупные корпорации, которые управляют социальными и рекламными сетями. diff --git a/app/src/main/assets/ru/guide_user_agent_dark.html b/app/src/main/assets/ru/guide_user_agent_dark.html index 376aeca8..6db7aa96 100644 --- a/app/src/main/assets/ru/guide_user_agent_dark.html +++ b/app/src/main/assets/ru/guide_user_agent_dark.html @@ -35,7 +35,7 @@

Для сравнения, пользовательский агент WebView по умолчанию раскрывает большой объем информации об аппаратном и программном обеспечении устройства. В меню Настройки выберите WebView по умолчанию, поскольку User agent отображает пользовательский агент, который будет отправлен. - На скриншоте ниже показан Pixel 2 XL под управлением Android 8.1.0 с установленным Android WebView 66.0.3359.126. + На скриншоте ниже показан Pixel 2 XL под управлением Android 8.1.0 с установленным Android WebView 67.0.3396.87. Большинство веб-серверов признают это как мобильный браузер и будут отображать мобильную версию сайта, если таковая имеется.

diff --git a/app/src/main/assets/ru/guide_user_agent_light.html b/app/src/main/assets/ru/guide_user_agent_light.html index 8428944b..a18589ba 100644 --- a/app/src/main/assets/ru/guide_user_agent_light.html +++ b/app/src/main/assets/ru/guide_user_agent_light.html @@ -35,7 +35,7 @@

Для сравнения, пользовательский агент WebView по умолчанию раскрывает большой объем информации об аппаратном и программном обеспечении устройства. В меню Настройки выберите WebView по умолчанию, поскольку User agent отображает пользовательский агент, который будет отправлен. - На скриншоте ниже показан Pixel 2 XL под управлением Android 8.1.0 с установленным Android WebView 66.0.3359.126. + На скриншоте ниже показан Pixel 2 XL под управлением Android 8.1.0 с установленным Android WebView 67.0.3396.87. Большинство веб-серверов признают это как мобильный браузер и будут отображать мобильную версию сайта, если таковая имеется.

diff --git a/app/src/main/assets/ru/images/domain_settings.png b/app/src/main/assets/ru/images/domain_settings.png index d8fb3b9a..44847066 100644 Binary files a/app/src/main/assets/ru/images/domain_settings.png and b/app/src/main/assets/ru/images/domain_settings.png differ diff --git a/app/src/main/assets/ru/images/request_details.png b/app/src/main/assets/ru/images/request_details.png new file mode 100644 index 00000000..1a134ff7 Binary files /dev/null and b/app/src/main/assets/ru/images/request_details.png differ diff --git a/app/src/main/assets/ru/images/user_agent.png b/app/src/main/assets/ru/images/user_agent.png index 5706f1dc..27e60ad5 100644 Binary files a/app/src/main/assets/ru/images/user_agent.png and b/app/src/main/assets/ru/images/user_agent.png differ diff --git a/app/src/main/assets/shared_images/local_activity_blue_dark.png b/app/src/main/assets/shared_images/local_activity_blue_dark.png new file mode 100644 index 00000000..2ac47bed Binary files /dev/null and b/app/src/main/assets/shared_images/local_activity_blue_dark.png differ diff --git a/app/src/main/assets/shared_images/local_activity_blue_light.png b/app/src/main/assets/shared_images/local_activity_blue_light.png new file mode 100644 index 00000000..8f27af93 Binary files /dev/null and b/app/src/main/assets/shared_images/local_activity_blue_light.png differ diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java index 856aa5d5..5cbf0c50 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -82,7 +82,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 9; + return 10; } @Override @@ -102,18 +102,21 @@ public class GuideActivity extends AppCompatActivity { return getString(R.string.user_agent); case 4: - return getString(R.string.domain_settings); + return getString(R.string.requests); case 5: - return getString(R.string.ssl_certificates); + return getString(R.string.domain_settings); case 6: - return getString(R.string.tor); + return getString(R.string.ssl_certificates); case 7: - return getString(R.string.tracking_ids); + return getString(R.string.tor); case 8: + return getString(R.string.tracking_ids); + + case 9: return getString(R.string.bookmarks); default: 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 49176378..950a59f1 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -1384,6 +1384,10 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Apply any custom domain settings if the URL was loaded by navigating history. if (navigatingHistory) { + // Reset `navigatingHistory`. + navigatingHistory = false; + + // Apply the domain settings. applyDomainSettings(url, true, false); } @@ -2350,6 +2354,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook case R.id.back: if (mainWebView.canGoBack()) { + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Set `navigatingHistory` so that the domain settings are applied when the new URL is loaded. navigatingHistory = true; @@ -2360,6 +2367,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook case R.id.forward: if (mainWebView.canGoForward()) { + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Set `navigatingHistory` so that the domain settings are applied when the new URL is loaded. navigatingHistory = true; @@ -3193,6 +3203,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook @Override public void onSslMismatchBack() { if (mainWebView.canGoBack()) { // There is a back page in the history. + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Set `navigatingHistory` so that the domain settings are applied when the new URL is loaded. navigatingHistory = true; @@ -3212,6 +3225,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook @Override public void onUrlHistoryEntrySelected(int moveBackOrForwardSteps) { + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Set `navigatingHistory` so that the domain settings are applied when the new URL is loaded. navigatingHistory = true; @@ -3244,6 +3260,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } } else if (mainWebView.canGoBack()) { // There is at least one item in the `WebView` history. + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Set `navigatingHistory` so that the domain settings are applied when the new URL is loaded. navigatingHistory = true; @@ -3511,9 +3530,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // The deprecated `.getDrawable()` must be used until the minimum API >= 21. @SuppressWarnings("deprecation") private void applyDomainSettings(String url, boolean resetFavoriteIcon, boolean reloadWebsite) { - // Reset `navigatingHistory`. - navigatingHistory = false; - // Parse the URL into a URI. Uri uri = Uri.parse(url); diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java index 96cdb3b7..d22006cd 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java @@ -74,7 +74,7 @@ public class GuideTabFragment extends Fragment { // Load the tabs according to the theme. if (MainWebViewActivity.darkTheme) { // The dark theme is applied. - // Set the background color. We have to use the deprecated `.getColor()` until API >= 23. + // Set the background color. The deprecated `.getColor()` must be used until API >= 23. //noinspection deprecation tabWebView.setBackgroundColor(getResources().getColor(R.color.gray_850)); @@ -97,22 +97,26 @@ public class GuideTabFragment extends Fragment { break; case 4: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_domain_settings_dark.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_requests_dark.html"); break; case 5: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificates_dark.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_domain_settings_dark.html"); break; case 6: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tor_dark.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificates_dark.html"); break; case 7: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_dark.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tor_dark.html"); break; case 8: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_dark.html"); + break; + + case 9: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_bookmarks_dark.html"); break; } @@ -136,22 +140,26 @@ public class GuideTabFragment extends Fragment { break; case 4: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_domain_settings_light.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_requests_light.html"); break; case 5: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificates_light.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_domain_settings_light.html"); break; case 6: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tor_light.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificates_light.html"); break; case 7: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_light.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tor_light.html"); break; case 8: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_light.html"); + break; + + case 9: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_bookmarks_light.html"); } } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 18aedaa0..cf117bde 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -132,6 +132,7 @@ Borrar datos de formulario Lista molesta de Fanboy Lista de bloqueo social de Fanboy + Bloquear todas las solicitudes de terceros Diseño Tamaño de fuente 25% @@ -232,6 +233,8 @@ Por defecto - Permitida Permitida Permitidas + Terceras partes + Tercera parte - Bloqueada Bloqueada Bloqueadas Lista de bloqueo @@ -354,10 +357,12 @@ Lista principal de bloqueo de anuncios. EasyPrivacy Lista principal de bloqueo de rastreadores. - Lista molesta de Fanboy - 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. + Lista molesta de Fanboy + 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. + Bloquear todas las solicitudes de terceras partes + Bloquear todas las solicitudes de terceras partes aumenta la privacidad, pero rompe muchas páginas web. Tor Enviar a través de Orbot Enviar todo el tráfico web a través de Orbot en localhost:8118. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9b48b839..42734996 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -132,6 +132,7 @@ Elimina dati dei moduli Fanboy’s annoyance list Fanboy’s social blocking list + Blocca tutte le richieste di Terze Parti Layout Dimensione font 25% @@ -231,6 +232,8 @@ Default - Permessa Permessa Permesse + Terze parti + Terze parti - Bloccate Bloccata Bloccate Blocklist @@ -240,7 +243,7 @@ Whitelist per i domini Whitelist iniziale Whitelist finale - Whitelist di terze parti + Whitelist di terze parti Whitelist di terze parti per i domini Whitelist di terze parti iniziale per i domini Blacklist principale @@ -353,10 +356,12 @@ Blocking list principale. EasyPrivacy Tracker blocking list principale. - Fanboy’s annoyance list - 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 . + Fanboy’s annoyance list + 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. Tor Utilizza Proxy con Orbot Utilizza Proxy attraverso Orbot su localhost:8118. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7441c0f7..c711836e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -133,6 +133,7 @@ Очистить данные формы Fanboy’s annoyance list Fanboy’s social blocking list + Блокировать все сторонние запросы Внешний вид Размер шрифта 25% @@ -232,6 +233,8 @@ По умолчанию - Разрешен Разрешен Разрешено + Сторонние + Сторонние - Блокировано Блокирован Блокировано Список блокировки @@ -353,10 +356,12 @@ Основной список блокировки рекламы. EasyPrivacy Основной список блокировки отслеживания. - Fanboy’s annoyance list - Блокирует раздражающие всплывающие окна и ссылки. Включает в себя Fanboy’s social blocking lists. - Fanboy’s social blocking list - Блокирует содержимое социальных сетей. + Fanboy’s annoyance list + Блокирует раздражающие всплывающие окна и ссылки. Включает в себя Fanboy’s social blocking lists. + Fanboy’s social blocking list + Блокирует содержимое социальных сетей. + Блокировать все сторонние запросы + Блокировка всех сторонних запросов повышает конфиденциальность, но ломает многие веб-сайты. Tor Прокси через Orbot Проксировать весь веб-трафик через Orbot на localhost:8118.