From 81179d84ced6b43360d42a4b44eb8fb329532ff4 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 19 Dec 2019 16:30:09 -0700 Subject: [PATCH] Add support for I2P and custom proxies. https://redmine.stoutner.com/issues/355 --- .idea/assetWizardSettings.xml | 4 +- .idea/dictionaries/soren.xml | 2 + app/build.gradle | 2 +- .../main/assets/de/about_licenses_dark.html | 44 +- .../main/assets/de/about_licenses_light.html | 44 +- ..._tor_dark.html => guide_proxies_dark.html} | 41 +- ...or_light.html => guide_proxies_light.html} | 41 +- .../main/assets/en/about_licenses_dark.html | 44 +- .../main/assets/en/about_licenses_light.html | 44 +- ..._tor_dark.html => guide_proxies_dark.html} | 41 +- ...or_light.html => guide_proxies_light.html} | 41 +- .../main/assets/es/about_licenses_dark.html | 43 +- .../main/assets/es/about_licenses_light.html | 43 +- ..._tor_dark.html => guide_proxies_dark.html} | 43 +- ...or_light.html => guide_proxies_light.html} | 43 +- .../main/assets/fr/about_licenses_dark.html | 44 +- .../main/assets/fr/about_licenses_light.html | 44 +- ..._tor_dark.html => guide_proxies_dark.html} | 48 +- ...or_light.html => guide_proxies_light.html} | 48 +- .../main/assets/it/about_licenses_dark.html | 45 +- .../main/assets/it/about_licenses_light.html | 45 +- ..._tor_dark.html => guide_proxies_dark.html} | 42 +- ...or_light.html => guide_proxies_light.html} | 42 +- .../main/assets/ru/about_licenses_dark.html | 45 +- .../main/assets/ru/about_licenses_light.html | 45 +- ..._tor_dark.html => guide_proxies_dark.html} | 40 +- ...or_light.html => guide_proxies_light.html} | 40 +- .../open_in_browser_blue_dark.png | Bin 0 -> 1304 bytes .../open_in_browser_blue_light.png | Bin 0 -> 1289 bytes .../shared_images/open_in_browser_dark.png | Bin 0 -> 1118 bytes .../shared_images/open_in_browser_light.png | Bin 0 -> 1031 bytes .../assets/shared_images/orbot_blue_dark.png | Bin 3115 -> 0 bytes .../assets/shared_images/orbot_blue_light.png | Bin 3126 -> 0 bytes .../main/assets/shared_images/orbot_dark.png | Bin 2345 -> 0 bytes .../main/assets/shared_images/orbot_light.png | Bin 1995 -> 0 bytes .../main/assets/tr/about_licenses_dark.html | 44 +- .../main/assets/tr/about_licenses_light.html | 44 +- ..._tor_dark.html => guide_proxies_dark.html} | 39 +- ...or_light.html => guide_proxies_light.html} | 41 +- .../activities/GuideActivity.java | 67 +- .../activities/MainWebViewActivity.java | 720 +++++++++++------- .../activities/ViewSourceActivity.java | 5 +- .../adapters/AboutPagerAdapter.java | 18 +- .../adapters/GuidePagerAdapter.java | 95 +++ .../dialogs/AboutViewSourceDialog.java | 11 +- .../CreateHomeScreenShortcutDialog.java | 5 +- .../dialogs/ProxyNotInstalledDialog.java | 144 ++++ .../dialogs/ViewSslCertificateDialog.java | 14 +- .../dialogs/WaitingForProxyDialog.java | 93 +++ .../fragments/AboutTabFragment.java | 20 + .../fragments/GuideTabFragment.java | 6 +- .../fragments/SettingsFragment.java | 329 ++++---- .../helpers/ImportExportDatabaseHelper.java | 51 +- .../helpers/OrbotProxyHelper.java | 180 ----- .../privacybrowser/helpers/ProxyHelper.java | 163 ++++ .../views/NestedScrollWebView.java | 19 + .../res/drawable/.idea/codeStyles/Project.xml | 113 +++ app/src/main/res/drawable/.idea/misc.xml | 8 + app/src/main/res/drawable/.idea/modules.xml | 8 + app/src/main/res/drawable/.idea/vcs.xml | 6 + app/src/main/res/drawable/.idea/workspace.xml | 186 +++++ .../res/drawable/app_bar_disabled_dark.xml | 2 +- .../res/drawable/app_bar_disabled_light.xml | 2 +- .../res/drawable/app_bar_enabled_dark.xml | 2 +- .../res/drawable/app_bar_enabled_light.xml | 2 +- .../res/drawable/app_bar_ghosted_dark.xml | 8 +- .../res/drawable/app_bar_ghosted_light.xml | 8 +- .../main/res/drawable/orbot_disabled_dark.xml | 19 - .../res/drawable/orbot_disabled_light.xml | 19 - .../main/res/drawable/orbot_enabled_dark.xml | 19 - .../main/res/drawable/orbot_enabled_light.xml | 19 - .../main/res/drawable/proxy_disabled_dark.xml | 13 + .../res/drawable/proxy_disabled_light.xml | 13 + .../main/res/drawable/proxy_enabled_dark.xml | 13 + .../main/res/drawable/proxy_enabled_light.xml | 13 + .../main/res/drawable/proxy_ghosted_dark.xml | 13 + .../main/res/drawable/proxy_ghosted_light.xml | 13 + app/src/main/res/layout/about_tab_version.xml | 6 + ...ite.xml => unencrypted_website_dialog.xml} | 0 ...te.xml => view_ssl_certificate_dialog.xml} | 0 .../res/layout/waiting_for_proxy_dialog.xml | 46 ++ .../main/res/menu/webview_options_menu.xml | 102 ++- app/src/main/res/values-de/strings.xml | 18 +- app/src/main/res/values-es/strings.xml | 18 +- app/src/main/res/values-fr/strings.xml | 18 +- app/src/main/res/values-it/strings.xml | 18 +- app/src/main/res/values-ru/strings.xml | 18 +- app/src/main/res/values-tr/strings.xml | 15 +- app/src/main/res/values/strings.xml | 62 +- app/src/main/res/xml/preferences.xml | 56 +- build.gradle | 2 +- .../android/fr-FR/full_description.txt | 19 + .../android/fr-FR/short_description.txt | 1 + fastlane/metadata/android/fr-FR/title.txt | 1 + 94 files changed, 2132 insertions(+), 1923 deletions(-) rename app/src/main/assets/de/{guide_tor_dark.html => guide_proxies_dark.html} (57%) rename app/src/main/assets/de/{guide_tor_light.html => guide_proxies_light.html} (57%) rename app/src/main/assets/en/{guide_tor_dark.html => guide_proxies_dark.html} (64%) rename app/src/main/assets/en/{guide_tor_light.html => guide_proxies_light.html} (64%) rename app/src/main/assets/es/{guide_tor_dark.html => guide_proxies_dark.html} (56%) rename app/src/main/assets/es/{guide_tor_light.html => guide_proxies_light.html} (56%) rename app/src/main/assets/fr/{guide_tor_dark.html => guide_proxies_dark.html} (53%) rename app/src/main/assets/fr/{guide_tor_light.html => guide_proxies_light.html} (53%) rename app/src/main/assets/it/{guide_tor_dark.html => guide_proxies_dark.html} (54%) rename app/src/main/assets/it/{guide_tor_light.html => guide_proxies_light.html} (54%) rename app/src/main/assets/ru/{guide_tor_dark.html => guide_proxies_dark.html} (54%) rename app/src/main/assets/ru/{guide_tor_light.html => guide_proxies_light.html} (54%) create mode 100644 app/src/main/assets/shared_images/open_in_browser_blue_dark.png create mode 100644 app/src/main/assets/shared_images/open_in_browser_blue_light.png create mode 100644 app/src/main/assets/shared_images/open_in_browser_dark.png create mode 100644 app/src/main/assets/shared_images/open_in_browser_light.png delete mode 100644 app/src/main/assets/shared_images/orbot_blue_dark.png delete mode 100644 app/src/main/assets/shared_images/orbot_blue_light.png delete mode 100644 app/src/main/assets/shared_images/orbot_dark.png delete mode 100644 app/src/main/assets/shared_images/orbot_light.png rename app/src/main/assets/tr/{guide_tor_dark.html => guide_proxies_dark.html} (57%) rename app/src/main/assets/tr/{guide_tor_light.html => guide_proxies_light.html} (57%) create mode 100644 app/src/main/java/com/stoutner/privacybrowser/adapters/GuidePagerAdapter.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dialogs/ProxyNotInstalledDialog.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/dialogs/WaitingForProxyDialog.java delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/ProxyHelper.java create mode 100644 app/src/main/res/drawable/.idea/codeStyles/Project.xml create mode 100644 app/src/main/res/drawable/.idea/misc.xml create mode 100644 app/src/main/res/drawable/.idea/modules.xml create mode 100644 app/src/main/res/drawable/.idea/vcs.xml create mode 100644 app/src/main/res/drawable/.idea/workspace.xml delete mode 100644 app/src/main/res/drawable/orbot_disabled_dark.xml delete mode 100644 app/src/main/res/drawable/orbot_disabled_light.xml delete mode 100644 app/src/main/res/drawable/orbot_enabled_dark.xml delete mode 100644 app/src/main/res/drawable/orbot_enabled_light.xml create mode 100644 app/src/main/res/drawable/proxy_disabled_dark.xml create mode 100644 app/src/main/res/drawable/proxy_disabled_light.xml create mode 100644 app/src/main/res/drawable/proxy_enabled_dark.xml create mode 100644 app/src/main/res/drawable/proxy_enabled_light.xml create mode 100644 app/src/main/res/drawable/proxy_ghosted_dark.xml create mode 100644 app/src/main/res/drawable/proxy_ghosted_light.xml rename app/src/main/res/layout/{unencrypted_website.xml => unencrypted_website_dialog.xml} (100%) rename app/src/main/res/layout/{view_ssl_certificate.xml => view_ssl_certificate_dialog.xml} (100%) create mode 100644 app/src/main/res/layout/waiting_for_proxy_dialog.xml create mode 100644 fastlane/metadata/android/fr-FR/full_description.txt create mode 100644 fastlane/metadata/android/fr-FR/short_description.txt create mode 100644 fastlane/metadata/android/fr-FR/title.txt diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 69358445..12947148 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -68,7 +68,7 @@ @@ -78,7 +78,7 @@ diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 05389849..c71e3926 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -130,6 +130,7 @@ radiobutton radiogroup rbga + redisplays redmine referer refreshlayout @@ -157,6 +158,7 @@ sslissuedtoorganization sslissuedtoorganizationalunit sslstartdate + startpage stoutner subdocument subdomain diff --git a/app/build.gradle b/app/build.gradle index a7d278bb..d9b91dae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation 'androidx.arch.core:core-runtime:2.1.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.coordinatorlayout:coordinatorlayout:1.0.0' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation 'androidx.drawerlayout:drawerlayout:1.0.0' implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html index a85852b2..374ae106 100644 --- a/app/src/main/assets/de/about_licenses_dark.html +++ b/app/src/main/assets/de/about_licenses_dark.html @@ -86,11 +86,6 @@

is derived from sort, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright © 2019 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

orbot is a modified version of - the status icon from the Orbot project, - which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. - The resulting image is released under the GPLv3+ license.

cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.

@@ -132,6 +127,7 @@

map.

more.

new releases.

+

open_in_browser.

payment.

question_answer.

refresh.

@@ -1065,40 +1061,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -
- -

3-Clause BSD License

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met:

- - - -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - \ No newline at end of file +limitations under the License. \ No newline at end of file diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html index dc90edea..503d12a3 100644 --- a/app/src/main/assets/de/about_licenses_light.html +++ b/app/src/main/assets/de/about_licenses_light.html @@ -86,11 +86,6 @@

is derived from sort, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright © 2019 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

orbot is a modified version of - the status icon from the Orbot project, - which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. - The resulting image is released under the GPLv3+ license.

cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.

@@ -132,6 +127,7 @@

map.

more.

new releases.

+

open_in_browser.

payment.

question_answer.

refresh.

@@ -1065,40 +1061,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -
- -

3-Clause BSD License

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met:

- - - -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - \ No newline at end of file +limitations under the License. \ No newline at end of file diff --git a/app/src/main/assets/de/guide_tor_dark.html b/app/src/main/assets/de/guide_proxies_dark.html similarity index 57% rename from app/src/main/assets/de/guide_tor_dark.html rename to app/src/main/assets/de/guide_proxies_dark.html index af88032e..ca09549f 100644 --- a/app/src/main/assets/de/guide_tor_dark.html +++ b/app/src/main/assets/de/guide_proxies_dark.html @@ -28,32 +28,31 @@ -

Tor und seine Grenzen

+

Proxies and Their Limits

Faktoren, die die Privatsphäre im Web einschränken wollen, lassen sich hauptsächlich in zwei verschiedene Kategorien unterteilen: Neugierige Behörden mit Zugriff auf Internetprovider und grosse Konzerne, die "soziale" und Werbe-Netzwerke betreiben. - TOR (The Onion Router) ist nützlich, wenn es auf den Schutz der Privatsphäre vor neugierigen Behörden ankommt, nicht jedoch bei Konzernen bzw. Megafirmen.

+ Proxies like TOR (The Onion Router) and I2P (the Invisible Internet Project) are useful in protecting privacy from malicious governments (which spy on traffic in transit) + but not from mega corporations (which embed malicious code on web servers).

Neugierige Behörden

Oft spähen neugierige Behörden Bürger aus, um Fehlverhalten und Menschenrechtsaktivitäten zu bestrafen. Üblicherweise betreiben sie entweder die Internetprovider selbst oder sie können Provider dazu zwingen, Informationen über jede besuchte IP-Adresse und die zugehörigen Benutzer herauszugeben. - TOR wurde entwickelt, um diese Eingriffe in die Privatsphäre zu bekämpfen, indem es die Daten verschlüsselt, die ein Nutzer sendet und sie durch viele verschiedene Server schleust, - bevor sie die Zieladresse erreichen. - Das bedeutet, dass kein individueller Internetprovider, Server oder Website sowohl die IP-Adresse des Nutzers - als auch die IP-Adresse des letztendlich besuchten Webservers erfährt. - Neugierige Behörden und die von ihnen kontrollierten Internetprovider können nur vermuten, welche Webserver ein Benutzer besucht, da sie letztendlich nur sehen, dass er TOR benutzt. - In einigen Teilen der Welt könnte das Benutzen von TOR als illegale Aktivität ausgelegt werden ("wenn Du nichts zu verstecken hättest, - würdest Du nicht Deinen Traffic vor uns verstecken") und Benutzer könnten bestraft werden, da die Regierung vermutet, sie würden etwas Untersagtes tun. - Also kann TOR hilfreich sein, ein Allheilmittel ist es jedoch nicht.

+ Layered proxies are designed to defeat this infringement of privacy by encrypting the traffic from a user’s device and routing it through multiple servers on the internet + before sending it on to the final destination. + This means that no individual ISP, server, or website, can know both the IP address of the user’s device and the IP address of the final web server. + Malicious governments and the ISPs they control cannot tell which web servers a user is accessing, although they can tell that the user is using a layered proxy service. + In some parts of the world, using proxies could be construed as an evidence of illegal behavior (“If you didn’t have anything to hide you wouldn’t be encrypting your traffic”) + and users could be punished because governments assume they are doing something that is prohibited. Thus, proxies can be helpful, but they aren’t a panacea.

Megafirmen

Wenn ein Benutzer sich mit einem Webserver verbindet, kann der Webserver seine IP-Adresse sehen. Obwohl es keine ausgereifte Methode ist, können IP-Adressen in physische Adressen umgewandelt werden - mit erstaunlicher Genauigkeit. - Kleine Webserver nutzen normalerweise die IP-Adresse, um festzulegen, woher der Benutzer die Seite besucht. TOR ist eine gute Lösung, wenn man seinen Standort vor diesen Servern verstecken möchte. + Small web servers typically rely on IP addresses to identify the location of the users visiting their site. Proxies are a good solution to mask the user’s location from these servers. Große Megafirmen, die "soziale" und Werbe-Netzwerke betreiben, nutzen jedoch Profile an Informationen, um Benutzer über ihre Geräte und IP-Adressen hinweg zu tracken. Diese Profile nutzen verschiedene Techniken um Benutzer ausfindig zu machen, inklusive JavaScript, Cookies, Tracking-IDs und den sogenannten "Browser-Fingerabdruck" (fingerprinting). @@ -65,29 +64,27 @@ Sie fertigen Profile an, die Alter, Geschlecht, Beziehungsstatus, Adresse, politische und religiöse Ansichten, familiäre Umstände, Anzahl der Haustiere und alles Andere, was sie über einen Nutzer herausfinden können, beinhalten. Sie kaufen sogar ganze Datenbanken mit Informationen über Kreditkartennutzungen in Geschäften auf, damit sie Offline-Einkaufsverhalten von Nutzern in ihren Profilen nachverfolgen können. - Weil sie bereits weitaus genauere Adressinformationen über einen Nutzer haben, als eine IP-Adresse aussagt, bietet TOR keinen echten Schutz der Privatsphäre gegen derartige Megafirmen.

+ Because they already have much more accurate address information about a user than an IP address discloses, proxies provides no real privacy protection against mega corporations.

Der einzige und beste Schutz der Privatsphäre gegen Megafirmen ist es, mit deaktivieren JavaScript durchs Web zu surfen, gefolgt von geblockten Werbenetzwerken, deaktivierten Cookies und DOM-Speicher und das Benutzen eines Browsers, der schwierig zu "fingerprinten" ist.

-

Benutzen von TOR

+

Using Proxies

-

Neben den vorhin genannten Einschränkungen kann TOR in bestimmten Situationen hilfreich sein. - Das TOR Project bietet eine App für Android namens Orbot an, die auf F-Droid - verfügbar ist und überall sonst, wo Privacy Browser angeboten wird. Privacy Browser hat eine Option, um Orbot als Proxy zu benutzen. - Wenn diese aktiviert wird, hat Privacy Browser einen hellblauen Hintergrund für die Adresszeile statt dem standardmäßigen Hellgrau. - Wenn Privacy Browsers Orbot-Proxy-Einstellung aktiviert ist, wird das Internet ausschließlich funktionieren, solange Orbot ausgeführt und mit dem TOR-Netzwerk verbunden ist. - Weil die Daten durch verschiedene Anlaufstellen geleitet werden, ist das Nutzen von TOR oft weitaus langsamer als bei einer direkten Verbindung mit dem Internet.

+

Despite their limitations, proxies can be useful in some circumstances. + Tor and I2p + have Android apps that make it easy to use their proxy networks. When proxying is turned on in Privacy Browser, the app bar will have a light blue background instead of the default light grey. + Because traffic is being routed through several proxy nodes, using a layered proxy is often much slower than connecting directly to the internet.

Herunterladen von Dateien mittels TOR

-

Wenn Orbot im Proxy-Modus genutzt wird, werden zwar beim Surfen mit dem Privacy Browser die Daten über das TOR-Netzwerk geroutet, nicht jedoch heruntergeladene Dateien. - Die Ursache dafür ist, dass Privacy Browser den in Android eingebauten Download-Manager verwendet, der keine Proxy-Optionen hat. - Benutzer, die auch Dateien über Orbot herunterladen möchten, müssen daher dessen VPN-Modus aktivieren.

+

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the proxy, but file downloads will not. + This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. + Users who want to download files via Orbot need to enable its VPN mode. There is currently no way to download files through I2P.

diff --git a/app/src/main/assets/de/guide_tor_light.html b/app/src/main/assets/de/guide_proxies_light.html similarity index 57% rename from app/src/main/assets/de/guide_tor_light.html rename to app/src/main/assets/de/guide_proxies_light.html index 8eca5334..34d72117 100644 --- a/app/src/main/assets/de/guide_tor_light.html +++ b/app/src/main/assets/de/guide_proxies_light.html @@ -28,32 +28,31 @@ -

Tor und seine Grenzen

+

Proxies and Their Limits

Faktoren, die die Privatsphäre im Web einschränken wollen, lassen sich hauptsächlich in zwei verschiedene Kategorien unterteilen: Neugierige Behörden mit Zugriff auf Internetprovider und grosse Konzerne, die "soziale" und Werbe-Netzwerke betreiben. - TOR (The Onion Router) ist nützlich, wenn es auf den Schutz der Privatsphäre vor neugierigen Behörden ankommt, nicht jedoch bei Konzernen bzw. Megafirmen.

+ Proxies like TOR (The Onion Router) and I2P (the Invisible Internet Project) are useful in protecting privacy from malicious governments (which spy on traffic in transit) + but not from mega corporations (which embed malicious code on web servers).

Neugierige Behörden

Oft spähen neugierige Behörden Bürger aus, um Fehlverhalten und Menschenrechtsaktivitäten zu bestrafen. Üblicherweise betreiben sie entweder die Internetprovider selbst oder sie können Provider dazu zwingen, Informationen über jede besuchte IP-Adresse und die zugehörigen Benutzer herauszugeben. - TOR wurde entwickelt, um diese Eingriffe in die Privatsphäre zu bekämpfen, indem es die Daten verschlüsselt, die ein Nutzer sendet und sie durch viele verschiedene Server schleust, - bevor sie die Zieladresse erreichen. - Das bedeutet, dass kein individueller Internetprovider, Server oder Website sowohl die IP-Adresse des Nutzers - als auch die IP-Adresse des letztendlich besuchten Webservers erfährt. - Neugierige Behörden und die von ihnen kontrollierten Internetprovider können nur vermuten, welche Webserver ein Benutzer besucht, da sie letztendlich nur sehen, dass er TOR benutzt. - In einigen Teilen der Welt könnte das Benutzen von TOR als illegale Aktivität ausgelegt werden ("wenn Du nichts zu verstecken hättest, - würdest Du nicht Deinen Traffic vor uns verstecken") und Benutzer könnten bestraft werden, da die Regierung vermutet, sie würden etwas Untersagtes tun. - Also kann TOR hilfreich sein, ein Allheilmittel ist es jedoch nicht.

+ Layered proxies are designed to defeat this infringement of privacy by encrypting the traffic from a user’s device and routing it through multiple servers on the internet + before sending it on to the final destination. + This means that no individual ISP, server, or website, can know both the IP address of the user’s device and the IP address of the final web server. + Malicious governments and the ISPs they control cannot tell which web servers a user is accessing, although they can tell that the user is using a layered proxy service. + In some parts of the world, using proxies could be construed as an evidence of illegal behavior (“If you didn’t have anything to hide you wouldn’t be encrypting your traffic”) + and users could be punished because governments assume they are doing something that is prohibited. Thus, proxies can be helpful, but they aren’t a panacea.

Megafirmen

Wenn ein Benutzer sich mit einem Webserver verbindet, kann der Webserver seine IP-Adresse sehen. Obwohl es keine ausgereifte Methode ist, können IP-Adressen in physische Adressen umgewandelt werden - mit erstaunlicher Genauigkeit. - Kleine Webserver nutzen normalerweise die IP-Adresse, um festzulegen, woher der Benutzer die Seite besucht. TOR ist eine gute Lösung, wenn man seinen Standort vor diesen Servern verstecken möchte. + Small web servers typically rely on IP addresses to identify the location of the users visiting their site. Proxies are a good solution to mask the user’s location from these servers. Große Megafirmen, die "soziale" und Werbe-Netzwerke betreiben, nutzen jedoch Profile an Informationen, um Benutzer über ihre Geräte und IP-Adressen hinweg zu tracken. Diese Profile nutzen verschiedene Techniken um Benutzer ausfindig zu machen, inklusive JavaScript, Cookies, Tracking-IDs und den sogenannten "Browser-Fingerabdruck" (fingerprinting). @@ -65,29 +64,27 @@ Sie fertigen Profile an, die Alter, Geschlecht, Beziehungsstatus, Adresse, politische und religiöse Ansichten, familiäre Umstände, Anzahl der Haustiere und alles Andere, was sie über einen Nutzer herausfinden können, beinhalten. Sie kaufen sogar ganze Datenbanken mit Informationen über Kreditkartennutzungen in Geschäften auf, damit sie Offline-Einkaufsverhalten von Nutzern in ihren Profilen nachverfolgen können. - Weil sie bereits weitaus genauere Adressinformationen über einen Nutzer haben, als eine IP-Adresse aussagt, bietet TOR keinen echten Schutz der Privatsphäre gegen derartige Megafirmen.

+ Because they already have much more accurate address information about a user than an IP address discloses, proxies provides no real privacy protection against mega corporations.

Der einzige und beste Schutz der Privatsphäre gegen Megafirmen ist es, mit deaktivieren JavaScript durchs Web zu surfen, gefolgt von geblockten Werbenetzwerken, deaktivierten Cookies und DOM-Speicher und das Benutzen eines Browsers, der schwierig zu "fingerprinten" ist.

-

Benutzen von TOR

+

Using Proxies

-

Neben den vorhin genannten Einschränkungen kann TOR in bestimmten Situationen hilfreich sein. - Das TOR Project bietet eine App für Android namens Orbot an, die auf F-Droid - verfügbar ist und überall sonst, wo Privacy Browser angeboten wird. Privacy Browser hat eine Option, um Orbot als Proxy zu benutzen. - Wenn diese aktiviert wird, hat Privacy Browser einen hellblauen Hintergrund für die Adresszeile statt dem standardmäßigen Hellgrau. - Wenn Privacy Browsers Orbot-Proxy-Einstellung aktiviert ist, wird das Internet ausschließlich funktionieren, solange Orbot ausgeführt und mit dem TOR-Netzwerk verbunden ist. - Weil die Daten durch verschiedene Anlaufstellen geleitet werden, ist das Nutzen von TOR oft weitaus langsamer als bei einer direkten Verbindung mit dem Internet.

+

Despite their limitations, proxies can be useful in some circumstances. + Tor and I2p + have Android apps that make it easy to use their proxy networks. When proxying is turned on in Privacy Browser, the app bar will have a light blue background instead of the default light grey. + Because traffic is being routed through several proxy nodes, using a layered proxy is often much slower than connecting directly to the internet.

Herunterladen von Dateien mittels TOR

-

Wenn Orbot im Proxy-Modus genutzt wird, werden zwar beim Surfen mit dem Privacy Browser die Daten über das TOR-Netzwerk geroutet, nicht jedoch heruntergeladene Dateien. - Die Ursache dafür ist, dass Privacy Browser den in Android eingebauten Download-Manager verwendet, der keine Proxy-Optionen hat. - Benutzer, die auch Dateien über Orbot herunterladen möchten, müssen daher dessen VPN-Modus aktivieren.

+

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the proxy, but file downloads will not. + This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. + Users who want to download files via Orbot need to enable its VPN mode. There is currently no way to download files through I2P.

diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html index a336be22..3bf34f6f 100644 --- a/app/src/main/assets/en/about_licenses_dark.html +++ b/app/src/main/assets/en/about_licenses_dark.html @@ -84,11 +84,6 @@

is derived from sort, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright © 2019 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

orbot is a modified version of - the status icon from the Orbot project, - which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. - The resulting image is released under the GPLv3+ license.

cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.

@@ -130,6 +125,7 @@

map.

more.

new releases.

+

open_in_browser.

payment.

question_answer.

refresh.

@@ -1061,40 +1057,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -
- -

3-Clause BSD License

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met:

- - - -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - \ No newline at end of file +limitations under the License. \ No newline at end of file diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html index de4abd56..87e3895d 100644 --- a/app/src/main/assets/en/about_licenses_light.html +++ b/app/src/main/assets/en/about_licenses_light.html @@ -85,11 +85,6 @@

is derived from sort, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright © 2019 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

orbot is a modified version of - the status icon from the Orbot project, - which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. - The resulting image is released under the GPLv3+ license.

cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.

@@ -131,6 +126,7 @@

map.

more.

new releases.

+

open_in_browser.

payment.

question_answer.

refresh.

@@ -1062,40 +1058,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -
- -

3-Clause BSD License

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met:

- - - -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - \ No newline at end of file +limitations under the License. \ No newline at end of file diff --git a/app/src/main/assets/en/guide_tor_dark.html b/app/src/main/assets/en/guide_proxies_dark.html similarity index 64% rename from app/src/main/assets/en/guide_tor_dark.html rename to app/src/main/assets/en/guide_proxies_dark.html index cc7c47bf..cc723eab 100644 --- a/app/src/main/assets/en/guide_tor_dark.html +++ b/app/src/main/assets/en/guide_proxies_dark.html @@ -1,5 +1,5 @@ + + + + + + android:width="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0" > + + android:width="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0" > , - which is released under the 3-clause BSD license. Modifications copyright Soren Stoutner 2017. The resulting image is released under the GPLv3+ license. --> - - - - - - - diff --git a/app/src/main/res/drawable/orbot_disabled_light.xml b/app/src/main/res/drawable/orbot_disabled_light.xml deleted file mode 100644 index 0713b724..00000000 --- a/app/src/main/res/drawable/orbot_disabled_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/orbot_enabled_dark.xml b/app/src/main/res/drawable/orbot_enabled_dark.xml deleted file mode 100644 index be951fc4..00000000 --- a/app/src/main/res/drawable/orbot_enabled_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/orbot_enabled_light.xml b/app/src/main/res/drawable/orbot_enabled_light.xml deleted file mode 100644 index 9b28c715..00000000 --- a/app/src/main/res/drawable/orbot_enabled_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/proxy_disabled_dark.xml b/app/src/main/res/drawable/proxy_disabled_dark.xml new file mode 100644 index 00000000..4cffb070 --- /dev/null +++ b/app/src/main/res/drawable/proxy_disabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/proxy_disabled_light.xml b/app/src/main/res/drawable/proxy_disabled_light.xml new file mode 100644 index 00000000..00a2ebab --- /dev/null +++ b/app/src/main/res/drawable/proxy_disabled_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/proxy_enabled_dark.xml b/app/src/main/res/drawable/proxy_enabled_dark.xml new file mode 100644 index 00000000..597d97f8 --- /dev/null +++ b/app/src/main/res/drawable/proxy_enabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/proxy_enabled_light.xml b/app/src/main/res/drawable/proxy_enabled_light.xml new file mode 100644 index 00000000..f67235cc --- /dev/null +++ b/app/src/main/res/drawable/proxy_enabled_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/proxy_ghosted_dark.xml b/app/src/main/res/drawable/proxy_ghosted_dark.xml new file mode 100644 index 00000000..ccc948bf --- /dev/null +++ b/app/src/main/res/drawable/proxy_ghosted_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/proxy_ghosted_light.xml b/app/src/main/res/drawable/proxy_ghosted_light.xml new file mode 100644 index 00000000..5bf8795f --- /dev/null +++ b/app/src/main/res/drawable/proxy_ghosted_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml index df489fed..f386bb5a 100644 --- a/app/src/main/res/layout/about_tab_version.xml +++ b/app/src/main/res/layout/about_tab_version.xml @@ -171,6 +171,12 @@ android:layout_width="wrap_content" android:textIsSelectable="true" /> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml index f3d81054..744873fc 100644 --- a/app/src/main/res/menu/webview_options_menu.xml +++ b/app/src/main/res/menu/webview_options_menu.xml @@ -152,97 +152,132 @@ + + + + + + + + + + + + + + + - + @@ -251,66 +286,66 @@ @@ -318,37 +353,30 @@ - - Neuer Tab Laden… Fehler: + Anwenden Lade EasyList @@ -320,7 +321,7 @@ *. kann als Wildcard-Subdomain verwendet werden (z.B. *.stoutner.com) Standardeinstellung - Custom font size + Benutzerdefinierte Schriftgröße Standardeinstellung @@ -396,8 +397,7 @@ OK - Orbot-Proxy wird nicht funktionieren, solange Orbot nicht installiert ist. - Warte, bis sich Orbot verbindet... + Warte, bis sich Orbot verbindet. Über Privacy Browser @@ -514,18 +514,6 @@ Entfernt “?fbclid=”, “&fbclid=”, “?fbadid=” und “&fbadid=” sowie alles danach aus URLs. Twitter AMP-Umleitungen Entfernt “?amp=1” sowie alles danach URLs. - Tor - Proxy durch Orbot - Sämtlichen Web-Verkehr durch Orbot mittels localhost:8118 leiten. - TOR-Homepage - TOR-Suche - - Searx - DuckDuckGo - JavaScript deaktiviert - DuckDuckGo - JavaScript aktiviert - Eigene - - eigene TOR-Such-URL Suche Startpage diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c45b2477..71be98a5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -52,6 +52,7 @@ Nueva pestaña Cargando… Error: + Apply Cargando EasyList @@ -318,7 +319,7 @@ *. puede ser añadido a un dominio para incluir todos los subdominios (p.ej. *.stoutner.com) Por defecto del sistema - Custom font size + Tamaño de letra personalizado Por defecto del sistema @@ -396,8 +397,7 @@ OK - Enviar a través de Orbot no funcionará a menos que se instale Orbot. - Esperando a Orbot para conectar... + Esperando a Orbot para conectar. Acerca de Navegador Privado @@ -513,18 +513,6 @@ Eliminar “?fbclid=”, “&fbclid=”, “?fbadid=”, “&fbadid=” y cualquier cosa tras ello de las URLs. Redirecciones de Twitter AMP Eliminar “?amp=1” y cualquier cosa después de esto de las URLs. - Tor - Enviar a través de Orbot - Enviar todo el tráfico web a través de Orbot en localhost:8118. - Página de inicio de Tor - Búsqueda en Tor - - Searx - DuckDuckGo - Javascript deshabilitado - DuckDuckGo - Javascript habilitado - Personalizado - - URL personalizada de búsqueda en Tor Búsqueda Startpage diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bfae370c..b875be3b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -53,6 +53,7 @@ Nouvel onglet Chargement… Erreur : + Appliquer Chargement EasyList @@ -318,7 +319,7 @@ Faire précéder par *. pour inclure l\'ensemble des sous-domaines (ex. *.stoutner.com) Réglages systèmes - Custom font size + Taille de police personnalisée Réglages systèmes @@ -396,8 +397,7 @@ OK - Le proxy Orbot ne fonctionnera pas à moins qu\'Orbot soit installé. - En attente de connection d\'Orbot... + En attente de connection d\'Orbot. À propos @@ -513,18 +513,6 @@ Supprime “?fbclid=”, “&fbclid=”, “?fbadid=” et “&fbadid=” et tout ce qui suit après ces URLs. Twitter AMP Supprimer “?amp=1” et tout ce qui suit après cette URL. - Tor - Proxy au travers d\'Orbot - Proxifier tout le trafic web au travers d\'Orbot via localhost:8118. - Tor - Accueil - Tor - Recherche - - Searx - DuckDuckGo - JavaScript désactivé - DuckDuckGo - JavaScript activé - Custom - - Tor - URL personnalisée de recherche Moteur de Recherche Startpage diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a07d6f31..fdb96623 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -52,6 +52,7 @@ Nuova Scheda Caricamento… Errore: + Applica Caricamento EasyList @@ -317,7 +318,7 @@ è possibile anteporre *. a un dominio per includere tutti i sottodomini (es. *.stoutner.com) Impostazioni di default - Custom font size + Dimensione carattere personalizzata Impostazioni di default @@ -395,8 +396,7 @@ OK - Il Proxy con Orbot funziona solo se è installato Orbot. - In attesa della connessione di Orbot... + In attesa della connessione di Orbot. Informazioni su Privacy Browser @@ -513,18 +513,6 @@ Rimuovi “?fbclid=”, “&fbclid=”, “?fbadid=”, e “&fbadid=” e tutto quello che segue dalle URL. Reindirizzamenti Twitter AMP Rimuovi “?amp=1” e tutto quello che segue dalle URL. - Tor - Utilizza Proxy con Orbot - Utilizza Proxy attraverso Orbot su localhost:8118. - Tor Homepage - Tor - Ricerca - - Searx - DuckDuckGo - JavaScript disabilitato - DuckDuckGo - JavaScript abilitato - Personalizzata - - Tor - Ricerca personalizzata Ricerca Startpage diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 018a3c7f..3d9066a8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -50,6 +50,7 @@ Новая вкладка Загрузка… Ошибка: + Применить Загрузка EasyList @@ -314,7 +315,7 @@ добавьте *. для включения всех поддоменов (напр. *.stoutner.com) Настройки по умолчанию - Custom font size + Пользовательский размер шрифта Настройки по умолчанию @@ -390,8 +391,7 @@ OK - Проксирование Orbot работает только с установленным Orbot. - Ожидание Orbot для подключения... + Ожидание Orbot для подключения. О Privacy Browser @@ -507,18 +507,6 @@ Удалять из URL “?fbclid=”, “&fbclid=”, “?fbadid=”, и “&fbadid=” и все что будет после. AMP-перенаправления в Twitter Удалять из URL “?amp=1” и все что будет после. - Tor - Прокси через Orbot - Проксировать весь веб-трафик через Orbot на localhost:8118. - Домашняя страница Tor - Поиск Tor - - Searx - DuckDuckGo - JavaScript выключен - DuckDuckGo - JavaScript включен - Настраиваемый - - Настраиваемый URL поиска Tor Поиск Startpage diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 21806ca1..73416b76 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -389,8 +389,7 @@ OK - Orbot yüklenmeden Orbot vekil sunucusu çalışmayacaktır. - Orbot\'un bağlanması bekleniyor... + Orbot\'un bağlanması bekleniyor. Privacy Browser Hakkında @@ -508,18 +507,6 @@ URL\'lerde “?fbclid=”, “&fbclid=”, “?fbadid=”, ve “&fbadid=” ve onlardan sonra gelen her şey kaldırıldı. Twitter AMP yönlendirmeleri URL\'den sonra gelen “?amp=1” ve diğer şeyleri kaldırır. - Tor - Orbot vekil sunucusu - localhost:8118 üzerinden tüm web trafiği için vekil sunucusunu Orbot yapar. - Tor anasayfa - Tor arama - - Searx - DuckDuckGo - JavaScript devre dışı - DuckDuckGo - JavaScript etkin - Özel - - Tor özel sayfa arama Arama Startpage diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58ebf52c..5428730c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -397,9 +397,15 @@ Privacy Browser needs the storage permission to use the public download directory. If it is denied, the app’s download directory will be used instead. OK - - Orbot proxy will not work unless Orbot is installed. - Waiting for Orbot to connect... + + Proxy not installed dialog + Waiting for proxy dialog + Proxies + Orbot Not Installed + Proxying through Orbot will not work unless the Orbot app is installed. + I2P Not Installed + Proxying through I2P will not work unless the I2P app is installed + Waiting for Orbot to connect. About Privacy Browser @@ -420,6 +426,7 @@ WebView Provider: WebView Version: Orbot: + I2P: OpenKeychain: EasyList: EasyPrivacy: @@ -546,24 +553,6 @@ Remove “?fbclid=”, “&fbclid=”, “?fbadid=”, and “&fbadid=” and anything after them from URLs. Twitter AMP redirects Remove “?amp=1” and anything after it from URLs. - Tor - Proxy through Orbot - Proxy all web traffic through Orbot on localhost:8118. - Tor homepage - Tor search - - Searx - DuckDuckGo - JavaScript disabled - DuckDuckGo - JavaScript enabled - Custom - - - http://ulrn6sryqaifefld.onion/?q= - https://3g2upl4pq6kufc4m.onion/html/?q= - https://3g2upl4pq6kufc4m.onion/?q= - Custom URL - - Tor search custom URL Search Startpage @@ -578,7 +567,7 @@ Yahoo - JavaScript enabled Custom - + https://www.startpage.com/do/search?query= https://searx.me/?q= https://duckduckgo.com/html/?q= @@ -593,6 +582,29 @@ Search custom URL Custom URL + Proxy + None + Tor + I2P + Custom + + None + Tor + I2P + Custom + + + None + Tor + I2P + Custom + + No proxy enabled. Connect directly to the internet. + Tor - proxy through localhost on port 8118. + I2P - proxy through localhost on port 4444. + Custom proxy + Proxy custom host + Proxy custom port Full Screen Full screen browsing mode Double-tap to toggle full screen browsing mode. @@ -634,11 +646,11 @@ Privacy Browser PrivacyBrowser/1.0 - https://3g2upl4pq6kufc4m.onion/ - https://3g2upl4pq6kufc4m.onion/html?q= - https://www.startpage.com/do/search?query= + None + + https://www.startpage.com/ 100 diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 500fcb86..9b7d8135 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -158,37 +158,6 @@ android:defaultValue="true" /> - - - - - - - - - - - - @@ -208,6 +177,31 @@ android:inputType="textUri" /> + + + + + + + + + + diff --git a/build.gradle b/build.gradle index f5dea958..3286a50c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt new file mode 100644 index 00000000..e81eba47 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/full_description.txt @@ -0,0 +1,19 @@ +Privacy Browser a deux objectifs principaux. + +1. Réduire au minimum la quantité d'informations envoyées sur Internet. + +2. Réduire au minimum la quantité d'informations stockées sur le périphérique. + +La plupart des navigateurs donnent silencieusement aux sites Web des quantités énormes d'informations leur permettant de vous suivre et de compromettre votre confidentialité. Les sites Web et les réseaux publicitaires utilisent des technologies telles que JavaScript, les cookies, le stockage DOM, les agents utilisateur et bien d'autres choses pour identifier chaque utilisateur de manière unique et le suivre entre chaque visite et au travers du Web. + +A l'inverse, les fonctionnalités sensibles sont désactivées par défaut dans Privacy Browser. Si l'une de ces technologies est nécessaire au bon fonctionnement d'un site Web, l'utilisateur peut choisir de l'activer uniquement pour une visite. Il peut également utiliser des paramètres de domaine pour activer automatiquement certaines fonctionnalités lors de l'arrivée sun site Web spécifique et les désactiver à nouveau lors de son départ. + +Privacy Browser utilise actuellement WebView intégré à Android pour le rendu des pages Web. En tant que tel, cela fonctionne mieux lorsque la dernière version de WebView est installée (voir https://www.stoutner.com/privacy-browser/common-settings/webview/). Dans la série 4.x, Privacy Browser basculera vers une version de WebView d’Android appelée Privacy WebView, qui permettra des fonctionnalités de confidentialité avancées. + +Avertissement: Android KitKat (version 4.4.x, API 19) fournit une version ancienne d’OpenSSL, exposée aux attaques de MITM (Man In The Middle) lors de la navigation sur des sites Web utilisant des suites de protocoles et de chiffrement obsolètes. Plus d'informations sur ce problème sont disponibles sur https://www.stoutner.com/kitkat-security-problems/. + +Fonctionnalités: +• Blocage intégré des publicités EasyList. +• Prise en charge du proxy Tor Orbot. +• Épinglage de certificat SSL. +• Importation / exportation des paramètres et des favoris. \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt new file mode 100644 index 00000000..05f5e06a --- /dev/null +++ b/fastlane/metadata/android/fr-FR/short_description.txt @@ -0,0 +1 @@ +Un navigateur Web qui respecte votre vie privée. \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt new file mode 100644 index 00000000..ca458fec --- /dev/null +++ b/fastlane/metadata/android/fr-FR/title.txt @@ -0,0 +1 @@ +Privacy Browser \ No newline at end of file -- 2.43.0