From 2b15a4595039d5f8a5269cb990805b6e15f8613f Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 31 May 2017 13:43:52 -0700 Subject: [PATCH] Remove `Clear and Exit` and `Planned Features` from the Guide. --- .../main/assets/de/guide_clear_and_exit.html | 56 ------------------ .../assets/de/guide_planned_features.html | 51 ---------------- app/src/main/assets/de/guide_tor.html | 8 ++- .../main/assets/en/guide_clear_and_exit.html | 51 ---------------- .../assets/en/guide_planned_features.html | 46 -------------- app/src/main/assets/en/guide_tor.html | 8 ++- .../main/assets/en/images/orbot_dark_blue.png | Bin 0 -> 3126 bytes .../main/assets/es/guide_clear_and_exit.html | 53 ----------------- .../assets/es/guide_planned_features.html | 48 --------------- app/src/main/assets/es/guide_tor.html | 8 ++- .../main/assets/it/guide_clear_and_exit.html | 53 ----------------- .../assets/it/guide_planned_features.html | 48 --------------- app/src/main/assets/it/guide_tor.html | 8 ++- .../assets/zh-rTW/guide_clear_and_exit.html | 51 ---------------- .../assets/zh-rTW/guide_planned_features.html | 46 -------------- app/src/main/assets/zh-rTW/guide_tor.html | 8 ++- .../activities/GuideActivity.java | 8 +-- .../fragments/GuideTabFragment.java | 8 --- 18 files changed, 36 insertions(+), 523 deletions(-) delete mode 100644 app/src/main/assets/de/guide_clear_and_exit.html delete mode 100644 app/src/main/assets/de/guide_planned_features.html delete mode 100644 app/src/main/assets/en/guide_clear_and_exit.html delete mode 100644 app/src/main/assets/en/guide_planned_features.html create mode 100644 app/src/main/assets/en/images/orbot_dark_blue.png delete mode 100644 app/src/main/assets/es/guide_clear_and_exit.html delete mode 100644 app/src/main/assets/es/guide_planned_features.html delete mode 100644 app/src/main/assets/it/guide_clear_and_exit.html delete mode 100644 app/src/main/assets/it/guide_planned_features.html delete mode 100644 app/src/main/assets/zh-rTW/guide_clear_and_exit.html delete mode 100644 app/src/main/assets/zh-rTW/guide_planned_features.html diff --git a/app/src/main/assets/de/guide_clear_and_exit.html b/app/src/main/assets/de/guide_clear_and_exit.html deleted file mode 100644 index 4e521324..00000000 --- a/app/src/main/assets/de/guide_clear_and_exit.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - -

Den überflüssigen Inhalt leeren

- -

Leeren und Beenden bewirkt Folgendes:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/de/guide_planned_features.html b/app/src/main/assets/de/guide_planned_features.html deleted file mode 100644 index 5c235759..00000000 --- a/app/src/main/assets/de/guide_planned_features.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Das Beste kommt erst noch

- -

Privacy Browser ist noch unfertig. Die allerbesten Features werden erst noch mit eingebunden. Sie beinhalten Folgendes:

- - - -

Eine umfangreichere Liste aller geplanten Features und Fehler ist unter redmine.stoutner.com verfügbar.

- - \ No newline at end of file diff --git a/app/src/main/assets/de/guide_tor.html b/app/src/main/assets/de/guide_tor.html index 779b4a7e..3a1ceb3a 100644 --- a/app/src/main/assets/de/guide_tor.html +++ b/app/src/main/assets/de/guide_tor.html @@ -29,6 +29,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -40,7 +46,7 @@ -

Tor und seine Grenzen

+

Tor und seine Grenzen

Faktoren, die in die Privatsphäre im Web eindringen wollen lassen sich hauptsächlich in zwei verschiedene Kategorien unterteilen: Neugierige Behörden mit Zugriff auf Internetprovider und Megafirmen, die Soziale und Werbenetzwerke betreiben. diff --git a/app/src/main/assets/en/guide_clear_and_exit.html b/app/src/main/assets/en/guide_clear_and_exit.html deleted file mode 100644 index a0fdcf54..00000000 --- a/app/src/main/assets/en/guide_clear_and_exit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Cleaning Out the Cruft

- -

Clear and Exit does the following things:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/en/guide_planned_features.html b/app/src/main/assets/en/guide_planned_features.html deleted file mode 100644 index b1d81245..00000000 --- a/app/src/main/assets/en/guide_planned_features.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -

The Best Is Yet to Come

- -

Privacy Browser is still in its infancy. Most of the best features are yet to be implemented. They include the following:

- - - -

A full list of planned features and bug reports is available at redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/en/guide_tor.html b/app/src/main/assets/en/guide_tor.html index 96a208c2..e73f1ada 100644 --- a/app/src/main/assets/en/guide_tor.html +++ b/app/src/main/assets/en/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor and Its Limits

+

Tor and Its Limits

There are two general categories of bad actors that want to infringe on the privacy of the web: malicious governments with access to ISPs (Internet Service Providers) and mega corporations that run social and advertising networks. TOR (The Onion Router) is 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).

diff --git a/app/src/main/assets/en/images/orbot_dark_blue.png b/app/src/main/assets/en/images/orbot_dark_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..70bc318f2b388d472a0dc92a702a13fc33a21711 GIT binary patch literal 3126 zcmV-649W9}P)nYnW=#KgqJ#FQywTYw4DGv*)Z zB#LuI<*DtJ8ccgk7;V1Dhcnez~Q?d7xZ0U1cr!68UWYzRAk{kwEXh!2Qm%r5eZLM0uy%osJlCx zebN_wAtIUv0MzmB1q#D7n+*ENBk{~>H&4KkzX0QhhCUSMI{e~rG6xt`!1_0Q;(tRUQ)agT- zK;>0{FE-pd7UkI8KJ7*2((d+_NIyM{ya8a)1RfP90;_jDu0k8Y2h~0O3=Z`>Sug0R zx#cat3Q(pM%EABuJKCE!=CV3nkgI@KfVOO<_W%Hk-2$o)0eO^#s#@FK?mlNxZp>)O zHoD_8r`^2!wS3HOL~mI*kZy3#6_E!SyoI|KbTuNctIFFVybH2LC9x&{QDG~c?tpE* zHi?`84ybd}y-E2GFlhvT*2CaUqke=uO5x*UJ&3-h9xL+IEM>7f+>ND@BXS1FG`3y_ z`b)p#3cTbwl@0l}>o)lv+a{5l1Pb0BpYV+ag<~AA|85hpZ4xa5xUQo}y{YgDv&YSF z4>lFw29YvA_F1PEm}oGC(_i77VK9E+M9Kh)o^LvbsGes!N03Bj5}0jt$1Ac9*xzs} z#gl2d6)jI2&Jzd`8Udsg^PLYMIQompXS!no$Yq>J7$Ds^Z@R+w159~TcLCooHEocv zEnu`%&u|aLkv1R`WL`nOmOQL}V_{v#njrJ~O-UPI?CI_#kS72;mu5m!Rn7F*3SFJA zTFLJNC2N3jGu(p}=>Tdh%5VhENlmHm>RZ?G4~sfJHzjF+Ok?Xb&!HVS#I_a&=TT>; zrqr)1MH7_VWniYE^}C4P#o&{^a3Q)Vx9PwuSo6Jp+fw$Gk}<%^!47SFvqr* zy&>?pR_WYQSwvbA1{gcjJ;rh5VRm~{C#)#EBO-Hi%UYhXtz|euKL^M*wqAtr2N~J( zeX9sm0~e=irYHI?s9Qy6rw;o^mI&<#Fuuvn4is6aB6DqP84ZH0EDj_t=y|;P1KV1L zB9sQGZgh|JkcWZK)ch+^)+2g;ZkhX(Z6Ui8x>G>5ao&ZBEMbrJ{z{T8$VI6s^;`Sa zb%biQafl3{lAYza3U>e%w$&KG0ZvcW)J-mYscso>b$Yf1L0C=!b#6tbiu)0{z_yft zSd#10xnU?^ZQlTM+^S5s{1%vPTS}lPPbO2TGdC~2CTCNIT>~^NNT$85O9UFN>ad0I zbgEZpZR&LMwj|hF4^X?XGUIJ~q-;AMKsmWLI*$M-ze64<(e;N}3e3oAYKen;H-dn4r( z^*2FI3Ij7hdcylZLWx|ZO#>XAP0DpaB@5&fkexZdM#Xy>VZR{qMSy}jIyK+s8eeQ0 z$Oxbb@3y$}M?@8#1X7&J_y~|`Y@G(W%5U`rlB8ot306EN2 z-OyU=iT>SWj;JH(2_`F+865$Nj$UOlemS6u(L1KbMu726ZnnQD@5htBQPW#dOitRm z^4fjb2Wi9@8v*)@&be{t`$DRiD4cC7xVck+=()yXml-BshB0#rXj+iWcw0XN#u|xV ze)Qy=aT92}vd{0pMn-_Ky7d&|&i9kCX||ncBCrtyh{uqdF~y7mWtxewW(*(_KlJe# zQH<tsaU-3Pr-vQN=1N@E|Gl+`+->v_XKrvdZx!f6IN7K>ay8%RkE!bF2 zc;bI4Tmz>7s{D=_Gl-+=`*&;N6c8K05NhDNjYP5NGQ#)58UD`!zSU z08jBUP!{g2%zuz9W!PS58dc@O#ep!mGyqdj2Xmn zoVR_C>36^ZNxb8C%$Pxnj`yzLF^xR6%QVj0gxUT3%8@O(_LhktzSbQ!bswPQHckjT z3TyoCd@yAIA<$$0snuu%00ABnyu>Z(v6H$#AAW@(bD4K{}rVLaRlbt348!^DP zPInvdf{EB=%CjZ+ZXm)Rjm0iIAD^mG0;zc5#hny#scbiUP+yFb;n>VUxJQo-tg5I8QyKa-|Ji$~79jLqo zFmfX!qI{SrrhXnoqCoZw=zsHxp44H}`;ao;9%ck6^26>G%})oBE3jqZ-37f9_*YQ* zN|?XpPx2N8l`PQLxU;ibk5kpvL~~+0B$s+pbu>VnK$ zLNw=>yT1=IVc>5Db#Iz<6YxyXdBcvtC*W|~T72eh5t-AytmS#zLUtu|C1Ua`uV0(!(-Qw$6tTjsUxooz;4Qs@_G3?l=7LHGXsVN!|in*R!o>C_-%jfc?(6@u157;%y4& z+14^bRtb7(ce~qVTgcuBy#aQTZgA^GN9NmG9w~*+hY}hAK85Q#*=M9lMJ_@0Ou+X#`Xk^K z;Er5YA7rsxu&Cp6QJMzWh0JL;Pmqd%^Hpg=bQ%OwtN5RaET$-n^DD1k8$do|l)M2x zMV(ubO>(S?oGMDK2ZsyP0O?Ug-446}`n)R7S9(0Rb)_4bI!Mtnz#bSg)191foWl^E z2vRM|{+?>Je7v)%isVJL9{`aLoT9g(Si$-#Sihys?Y1gDCMG5(CdLf^19LZTWRhxd Q9smFU07*qoM6N<$g8cl{761SM literal 0 HcmV?d00001 diff --git a/app/src/main/assets/es/guide_clear_and_exit.html b/app/src/main/assets/es/guide_clear_and_exit.html deleted file mode 100644 index 187ceef8..00000000 --- a/app/src/main/assets/es/guide_clear_and_exit.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -

Eliminar y salir

- -

Eliminar y salir hace lo siguiente:

- -
    -
  • Elimina todas las cookies.
    • -
  • Elimina todo el almacenamiento DOM.
    • -
  • Elimina todos los datos de formulario.
    • -
  • Borra la caché, incluidos los archivos de disco.
    • -
  • Borra el historial de atrás/adelante.
    • -
  • Borra las preferencias de certificado SSL guardadas (certificados SSL con errores que se ignoran).
    • -
  • Elimina la URL actual.
    • -
  • Destruye el estado interno del WebView.
    • -
  • Cierra Navegador Privado. Para Android Lollipop y más reciente (versión >= 5.0 o API >= 21), Navegador Privado también se elimina de la lista de aplicaciones recientes.
    • -
- - \ No newline at end of file diff --git a/app/src/main/assets/es/guide_planned_features.html b/app/src/main/assets/es/guide_planned_features.html deleted file mode 100644 index 18e1fc95..00000000 --- a/app/src/main/assets/es/guide_planned_features.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - -

Lo mejor está por venir

- -

Navegador Privado aún está en su infancia. La mayoría de sus mejores características están aún por implementar. Éstas incluyen lo siguiente:

- -
    -
  • Controles muy precisos para cookies y almacenamiento DOM.
    • -
  • Sincronización cifrada entre dispositivos.
    • -
  • Navegación por pestañas.
    • -
- -

Una lista completa de características planeadas e informe de errores está disponible en redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/es/guide_tor.html b/app/src/main/assets/es/guide_tor.html index c104a0b3..1d84d916 100644 --- a/app/src/main/assets/es/guide_tor.html +++ b/app/src/main/assets/es/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor y sus límites

+

Tor y sus límites

Existen dos categorías generales de malos actores que quieren infringir la privacidad de la web: gobiernos maliciosos con acceso a ISPs (Proveedores de Servicios de Internet) y grandes corporaciones que ofrecen redes sociales y de publicidad. TOR (El Enrutador de Cebolla) es útil en proteger la privacidad de gobiernos maliciosos (que espían el tráfico en tránsito) pero no de grandes corporaciones (que incrustan código malicioso en los servidores web).

diff --git a/app/src/main/assets/it/guide_clear_and_exit.html b/app/src/main/assets/it/guide_clear_and_exit.html deleted file mode 100644 index b473cbe0..00000000 --- a/app/src/main/assets/it/guide_clear_and_exit.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -

Pulizia dei dati di navigazione

- -

Elimina Dati ed Esci esegue le seguenti azioni:

- -
    -
  • Rimozione di tutti i cookie.
    • -
  • Puliza del DOM storage.
    • -
  • Rimozione di tutti i dati dei moduli.
    • -
  • Puliza della cache, inclusi i file su memoria principale.
    • -
  • Pulizia della cronologia di navigazione.
    • -
  • Pulizia delle preferenze dei certificati SSL salvati (Certificati SSL con errori ignorati).
    • -
  • Eliminazione dell'ultima URL visitata.
    • -
  • Pulizia dello stato di WebView.
    • -
  • Chiusura di Privacy Browser. Per Android Lollipop o successivo (versione >= 5.0 o API >= 21), Privacy Browser viene anche rimosso dall'elenco delle app recenti.
    • -
- - \ No newline at end of file diff --git a/app/src/main/assets/it/guide_planned_features.html b/app/src/main/assets/it/guide_planned_features.html deleted file mode 100644 index 9b73574e..00000000 --- a/app/src/main/assets/it/guide_planned_features.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - -

Il meglio deve ancora venire

- -

Privacy Browser è ancora all'inzio dello sviluppo. La maggior parte delle migliori funzionalità deve essere ancora implementata, come ad esempio:

- -
    -
  • Controllo fine dei cookie e del DOM storage.
    • -
  • Sincronizzazione criptata tra diversi dispositivi.
    • -
  • Navigazione con tab.
    • -
- -

Una lista completa delle funzionalità e dei bug è disponibile su redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/it/guide_tor.html b/app/src/main/assets/it/guide_tor.html index e9f0a284..78c125c9 100644 --- a/app/src/main/assets/it/guide_tor.html +++ b/app/src/main/assets/it/guide_tor.html @@ -28,6 +28,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -39,7 +45,7 @@ -

Tor e i suoi limiti

+

Tor e i suoi limiti

Esistono due categorie generali di cattivi soggetti che vogliono violare la privacy del web: governi maliziosi con accesso agli ISP (Internet Service Providers) e mega corporations che gestiscono social network e agenzie pubblicitarie. TOR (The Onion Router) è utile per proteggere la privacy dai governi maliziosi (che spiano il traffico in transito) ma non dalle mega corporations (che mettono codice maligno sui web server).

diff --git a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html b/app/src/main/assets/zh-rTW/guide_clear_and_exit.html deleted file mode 100644 index a0fdcf54..00000000 --- a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Cleaning Out the Cruft

- -

Clear and Exit does the following things:

- -
    -
  • Removes all cookies.
    • -
  • Removes all DOM storage.
    • -
  • Removes all form data.
    • -
  • Clears the cache, including disk files.
    • -
  • Clears the back/forward history.
    • -
  • Clears any saved SSL certificate preferences (SSL certificates with errors that are ignored).
    • -
  • Deletes the current URL.
    • -
  • Destroys the internal state of the WebView.
    • -
  • Closes Privacy Browser. For Android Lollipop and newer (version >= 5.0 or API >= 21), Privacy Browser is also removed from the recent app list.
    • -
- - \ No newline at end of file diff --git a/app/src/main/assets/zh-rTW/guide_planned_features.html b/app/src/main/assets/zh-rTW/guide_planned_features.html deleted file mode 100644 index b1d81245..00000000 --- a/app/src/main/assets/zh-rTW/guide_planned_features.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -

The Best Is Yet to Come

- -

Privacy Browser is still in its infancy. Most of the best features are yet to be implemented. They include the following:

- -
    -
  • Fine grained controls for cookies and DOM storage.
    • -
  • Encrypted sync between devices.
    • -
  • Tabbed browsing.
    • -
- -

A full list of planned features and bug reports is available at redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/zh-rTW/guide_tor.html b/app/src/main/assets/zh-rTW/guide_tor.html index be99b0b6..27cacb60 100644 --- a/app/src/main/assets/zh-rTW/guide_tor.html +++ b/app/src/main/assets/zh-rTW/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor and Its Limits

+

Tor and Its Limits

There are two general categories of bad actors that want to infringe on the privacy of the web: malicious governments with access to ISPs (Internet Service Providers) and mega corporations that run social and advertising networks. TOR (The Onion Router) is 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).

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 ca7756e9..70907fca 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -66,7 +66,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 9; + return 7; } @Override @@ -94,12 +94,6 @@ public class GuideActivity extends AppCompatActivity { case 6: return getString(R.string.tracking_ids); - case 7: - return getString(R.string.clear_and_exit); - - case 8: - return getString(R.string.planned_features); - default: return ""; } 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 5925f8c9..a3b2249a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java @@ -86,14 +86,6 @@ public class GuideTabFragment extends Fragment { case 6: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids.html"); break; - - case 7: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_clear_and_exit.html"); - break; - - case 8: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_planned_features.html"); - break; } return tabLayout; -- 2.43.0