From: Soren Stoutner Date: Mon, 23 Jul 2018 22:03:26 +0000 (-0700) Subject: Fix “Waiting for Orbot”. https://redmine.stoutner.com/issues/307 X-Git-Tag: v2.12~11 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=c3f5fb6cb3db4582c15beda3219a84d23ede1ce2;p=PrivacyBrowserAndroid.git Fix “Waiting for Orbot”. https://redmine.stoutner.com/issues/307 --- diff --git a/app/src/main/assets/es/guide_requests_dark.html b/app/src/main/assets/es/guide_requests_dark.html index 098f511e..cdab0599 100644 --- a/app/src/main/assets/es/guide_requests_dark.html +++ b/app/src/main/assets/es/guide_requests_dark.html @@ -26,16 +26,17 @@ -

Resource Requests

Peticiones de recursos

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.

Cuando se carga una URL, normalmente realiza una serie de peticiones de recursos para CCS, JavaScript, imÃ¡genes y otros archivos. + Los detalles sobre estas solicitudes se pueden ver en la Actividad de peticiones. El cajÃ³n de navegaciÃ³n tiene un enlace a la Actividad de peticiones y tambiÃ©n muestra cuÃ¡ntas Ã³rdenes se bloquearon. + Al tocar una solicitud se muestran los detalles de por quÃ© se ha permitido o bloqueado.

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.

Navegador Privado incluye cuatro listas de bloqueo basadas en la sintaxis de Adblock: + EasyList, EasyPrivacy, Lista molesta de Fanboy y Lista de bloqueo social de Fanboy. + Estas listas de bloqueo son procesadas por Navegador Privado en las siguientes 22 sublistas, que verifican las solicitudes de recursos en el orden listado.

Lista blanca principal
Lista negra de expresiones regulares

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.

Las listas iniciales se comparan con el principio de la URL. Las listas finales se comparan con el final de la URL. Las listas de dominios sÃ³lo se comparan con ciertos dominios. + Las listas de terceras partes sÃ³lo se aplican si el dominio raÃz de la solicitud es diferente del dominio raÃz de la URL principal. + Las listas de expresiones regulares siguen la sintaxis de las expresiones regulares. + Cada elemento de la sublista tiene una o mÃ¡s entradas. + En el caso de sublistas de dominio, la solicitud de recurso sÃ³lo se compara con el artÃculo si la primera entrada coincide con el dominio de la URL principal.

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.

Debido a las limitaciones del WebView de Android, y para acelerar el procesamiento de las solicitudes, Navegador Privado implementa una interpretaciÃ³n simplificada de la sintaxis de Adblock. + Esto puede conducir a veces a falsos positivos, en los que los recursos se permiten o bloquean de formas que no estaban previstas en la entrada original. + Una descripciÃ³n mÃ¡s detallada de cÃ³mo se procesan las entradas de la lista de bloqueo estÃ¡ disponible en 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.

Navegador Privado tiene una quinta lista de bloqueo que bloquea todas las solicitudes de terceras partes. + Una solicitud sÃ³lo se considera de terceras partes si el dominio base de la solicitud es diferente del dominio base de la URL. + Por ejemplo, si www.website.com carga una imagen de images.website.com, + esto no se bloquea como peticiÃ³n de una tercera parte porque ambos comparten el mismo dominio base de website.com. + El bloqueo de todas las solicitudes de terceras partes aumenta la privacidad, pero esta lista de bloqueo estÃ¡ desactivada por defecto porque rompe un gran nÃºmero de pÃ¡ginas web.

\ 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 index 2c6cee85..b162ed18 100644 --- a/app/src/main/assets/es/guide_requests_light.html +++ b/app/src/main/assets/es/guide_requests_light.html @@ -26,16 +26,17 @@ -

Resource Requests

Peticiones de recursos

Lista blanca principal
Lista negra de expresiones regulares

\ No newline at end of file diff --git a/app/src/main/assets/it/guide_requests_dark.html b/app/src/main/assets/it/guide_requests_dark.html index 920d7ee0..aeb20fb9 100644 --- a/app/src/main/assets/it/guide_requests_dark.html +++ b/app/src/main/assets/it/guide_requests_dark.html @@ -26,16 +26,18 @@ -

Resource Requests

Richieste di Risorse

Quando viene caricata un URL, generalmente effettua un certo numero di richieste di risorse per CCS, JavaScript, immagini, e altri files. + I dettagli relativi a queste richieste possono essere visualizzati nella scheda delle Richieste. + Il menÃ¹ a cassetto ha un collegamento alla scheda delle richieste e mostra quante sono state bloccate. + Se si tocca una delle richieste in elenco vengono mostrati i dettagli sui motivi per cui Ã¨ stata permessa o bloccata.

Privacy Browser include quattro liste di blocco basate sulla Sintassi di Adblock: + EasyList, EasyPrivacy, Fanboyâs Annoyance List, e Fanboyâs Social Blocking List. + Queste blocklist sono processate da Privacy Browser nelle seguenti 22 liste secondarie, che verificano le richieste di risorse nell'ordine elencato.

Whitelist principale
Blacklist per le espressioni regolari

Le liste iniziali servono per la verifica della parte iniziale delle URL. Le liste iniziali servono per la verifica della parte finale delle URL. + Le liste dei domini servono per la verifica di certi domini. Le liste di terze parti si applicano solo se il dominio di root della richiesta Ã¨ diverso dal dominio di root della URL principale. + Le liste per le espressioni regolari seguono la sintassi delle espressioni regolari. + Ogni oggetto delle liste secondarie ha uno o piÃ¹ elementi. + Nel caso delle liste secondarie dei domini, la richiesta di risorse Ã¨ verificata solo se il primo elemento combacia con il dominio della URL principale.

A causa delle limitazioni della WebView di Android, e per velocizzare il processo delle richiesta, Privacy Browser implementa una versione semplificata della sintassi di Adblock. + Questo approccio potrebbe a volte portare ad avere falsi positivi, nel caso in cui le risorse siano bloccate o permesse in modi che non erano previsti dall'elemento originale. + Una descrizione piÃ¹ dettagliata su come sono processati gli elementi delle liste di blocco Ã¨ disponibile su stoutner.com.

Privacy Browser ha una quinta lista di blocco che blocca tutte le richieste di terze parti. + Una richiesta Ã¨ considerata di terze parti solo se il dominio di base della richiesta Ã¨ diverso dal dominio di base della URL. + Ad esempio se www.website.com carica un'immagine da images.website.com, + questa non Ã¨ bloccata come richiesta di terze parti, perchÃ¨ il dominio di base Ã¨ lo stesso: website.com. + Il blocco di tutte le richieste di terze parti aumenta la privacy, ma questa lista di blocco Ã¨ disabilitata di default perchÃ¨ impedisce la corretta visualizzazione di un gran numero di siti web.

\ 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 index 73cef4bc..adfe890e 100644 --- a/app/src/main/assets/it/guide_requests_light.html +++ b/app/src/main/assets/it/guide_requests_light.html @@ -26,16 +26,18 @@ -

Resource Requests

Richieste di Risorse

Whitelist principale
Blacklist per le espressioni regolari

\ No newline at end of file diff --git a/app/src/main/assets/ru/guide_requests_dark.html b/app/src/main/assets/ru/guide_requests_dark.html index ce24d0d5..09ac13cc 100644 --- a/app/src/main/assets/ru/guide_requests_dark.html +++ b/app/src/main/assets/ru/guide_requests_dark.html @@ -24,16 +24,17 @@ -

Resource Requests

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²

Privacy Browser Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð² ÑÐµÐ±Ñ ÑÐµÑÑÑÐµ ÑÐ¿Ð¸ÑÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÑ Ð½Ð° ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸ÑÐµ Adblock: + EasyList, EasyPrivacy, Fanboyâs Annoyance List, Ð¸ Fanboyâs Social Blocking List. + ÐÑÐ¸ ÑÐ¿Ð¸ÑÐºÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑÑÑ Privacy Browser Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ 22 Ð¿Ð¾Ð´ÑÐ¿Ð¸ÑÐºÐ°Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¿ÑÐ¾Ð²ÐµÑÑÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð² Ð² ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼ Ð¿Ð¾ÑÑÐ´ÐºÐµ.

ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº
Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°

\ 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 index b8aaec3f..542377b3 100644 --- a/app/src/main/assets/ru/guide_requests_light.html +++ b/app/src/main/assets/ru/guide_requests_light.html @@ -24,16 +24,17 @@ -

Resource Requests

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²

ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº
Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°

\ No newline at end of file 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 950a59f1..191e56aa 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -173,7 +173,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // and `ViewSslCertificateDialog`. It is also used in `onCreate()`. public static SslCertificate sslCertificate; - // `orbotStatus` is public static so it can be accessed from `OrbotProxyHelper`. It is also used in `onCreate()`. + // `orbotStatus` is public static so it can be accessed from `OrbotProxyHelper`. It is also used in `onCreate()` and `onResume()`. public static String orbotStatus; // `webViewTitle` is public static so it can be accessed from `CreateBookmarkDialog` and `CreateHomeScreenShortcutDialog`. It is also used in `onCreate()`. @@ -369,7 +369,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // `ignorePinnedSslCertificateForDomain` is used in `onCreate()`, `onSslMismatchProceed()`, and `applyDomainSettings()`. private boolean ignorePinnedSslCertificate; - // `waitingForOrbot` is used in `onCreate()` and `applyAppSettings()`. + // `waitingForOrbot` is used in `onCreate()`, `onResume()`, and `applyAppSettings()`. private boolean waitingForOrbot; // `domainSettingsApplied` is used in `prepareOptionsMenu()`, `applyDomainSettings()`, and `setDisplayWebpageImages()`. @@ -1189,6 +1189,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { if (url.startsWith("http")) { // Load the URL in Privacy Browser. + // Reset the formatted URL string so the page will load correctly if blocking of third-party requests is enabled. + formattedUrlString = ""; + // Apply the domain settings for the new URL. `applyDomainSettings` doesn't do anything if the domain has not changed. applyDomainSettings(url, true, false); @@ -1262,7 +1265,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Initialize the third party request tracker. boolean isThirdPartyRequest = false; - // + // Initialize the current domain string. String currentDomain = ""; // Nobody is happy when comparing null strings. @@ -1680,6 +1683,12 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // The AdView is destroyed and recreated, which changes the ID, every time it is reloaded to handle possible rotations. AdHelper.resumeAd(findViewById(R.id.adview)); } + + // Display a message to the user if waiting for Orbot. + if (waitingForOrbot && !orbotStatus.equals("ON")) { + // Load a waiting page. `null` specifies no encoding, which defaults to ASCII. + mainWebView.loadData(waitingForOrbotHTMLString, "text/html", null); + } } @Override @@ -3423,7 +3432,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook appBar.setBackgroundDrawable(ContextCompat.getDrawable(this, R.color.blue_50)); } - // Display a message to the user if we are waiting on Orbot. + // Display a message to the user if waiting for Orbot. if (!orbotStatus.equals("ON")) { // Set `waitingForOrbot`. waitingForOrbot = true;

Resource Requests

Peticiones de recursos

Resource Requests

Peticiones de recursos

Resource Requests

Richieste di Risorse

Resource Requests

Richieste di Risorse

Resource Requests

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²

Resource Requests

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²

ÐÐ°Ð¿ÑÐ¾ÑÑ ÑÐµÑÑÑÑÐ¾Ð²