From e59f99e8ba2f66916186c13dabea9686e1b6f70f Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 4 Jan 2017 11:03:34 -0700 Subject: [PATCH] Fix a crash when a resource request has a null host and ad blocking is enabled. Fixes https://redmine.stoutner.com/issues/80. --- app/src/main/assets/de/about_changelog.html | 2 +- app/src/main/assets/en/about_changelog.html | 2 +- app/src/main/assets/es/about_changelog.html | 4 ++-- .../activities/MainWebView.java | 21 ++++++++++--------- app/src/main/res/values-es/strings.xml | 2 -- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 33920356..54a413c3 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,7 +33,7 @@

1.14 (version code 16)

26 December 2016 - minimum API 19, target API 25

Implement ad blocking.
Change the default user agent to PrivacyBrowser/1.0 for real this time.

1.14 (version code 16)

26 December 2016 - minimum API 19, target API 25

Implement ad blocking.
Change the default user agent to PrivacyBrowser/1.0 for real this time.

1.14 (código de versión 16)

26 de diciembre de 2016 - API mínimo 19, API dirigido 25

Incluir un bloqueador de anuncios.
Cambiar el agente de usuario por defecto a PrivacyBrowser/1.0 de verdad esta vez.
Añadir la opción de habilitar pantalla completa y poner un defecto de falso.
Arreglar un error que a veces cambió la barra de navegación gris en modo de pantalla completa al cambiar entre aplicaciones.
Aumentar el API dirigido a 25.
Actualizar la traducción parcial al español.
Actualizar la traducción parcial de español.

1.13 (código de versión 15)

. + * Copyright 2015-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -127,7 +127,6 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN public static SslCertificate sslCertificate; - // `drawerLayout` is used in `onCreate()`, `onNewIntent()`, and `onBackPressed()`. private DrawerLayout drawerLayout; @@ -529,14 +528,16 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN // Create a variable to track if this is an ad server. boolean requestHostIsAdServer = false; - // Check all the subdomains of `requestHost`. - while (requestHost.contains(".")) { - if (adServersSet.contains(requestHost)) { - requestHostIsAdServer = true; - } + // Check all the subdomains of `requestHost` if it is not null. + if (requestHost != null) { + while (requestHost.contains(".")) { + if (adServersSet.contains(requestHost)) { + requestHostIsAdServer = true; + } - // Strip out the lowest subdomain of `requestHost`. - requestHost = requestHost.substring(requestHost.indexOf(".") + 1); + // Strip out the lowest subdomain of `requestHost`. + requestHost = requestHost.substring(requestHost.indexOf(".") + 1); + } } if (requestHostIsAdServer) { // It is an ad server. @@ -1518,7 +1519,7 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN String fileName = downloadFileNameEditText.getText().toString(); // Once we have `WRITE_EXTERNAL_STORAGE` permissions we can use `setDestinationInExternalPublicDir`. - if (Build.VERSION.SDK_INT >= 23) { // If API >= 23, set the download save in the the `DIRECTORY_DOWNLOADS` using `fileName`. + if (Build.VERSION.SDK_INT >= 23) { // If API >= 23, set the download location to `/sdcard/Android/data/com.stoutner.privacybrowser.standard/files` named `fileName`. downloadRequest.setDestinationInExternalFilesDir(this, "/", fileName); } else { // Only set the title using `fileName`. downloadRequest.setTitle(fileName); diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 83c162b3..bb0444f5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,8 +18,6 @@ You should have received a copy of the GNU General Public License along with Privacy Browser. If not, see . --> - - Navegador Privado -- 2.43.0