March 2019 - tbb-commits - lists.torproject.org

[torbutton/master] Correcting branch name for securitylevel.properties
by gk＠torproject.org 17 Mar '19

17 Mar '19

commit 33d5b58a507ae529af073ef3448d6f5ab36fa8a7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Mar 17 09:24:49 2019 +0000 Correcting branch name for securitylevel.properties --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 088cdf95..5fbe4e7d 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -24,7 +24,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "browserOnboarding.properties:torbutton-browseronboardingproperties" "torbutton.dtd:torbutton-torbuttondtd" "torbutton.properties:torbutton-torbuttonproperties" - "securityLevel.properties:torbutton-securityLevelproperties" + "securityLevel.properties:torbutton-securitylevelproperties" ) # Verify that the FILEMAP contains an entry for each Torbutton file.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 17 Mar '19

17 Mar '19

commit a890699d47e08a640af4d56bb16533c96f7f2f8d Author: Georg Koppen <gk(a)torproject.org> Date: Sun Mar 17 09:20:16 2019 +0000 Translations update --- src/chrome/locale/da/aboutTBUpdate.dtd | 6 +++--- src/chrome/locale/da/aboutTor.dtd | 2 +- src/chrome/locale/da/browserOnboarding.properties | 2 +- src/chrome/locale/de/aboutTBUpdate.dtd | 2 +- src/chrome/locale/de/aboutTor.dtd | 2 +- src/chrome/locale/de/browserOnboarding.properties | 2 +- src/chrome/locale/es/aboutTBUpdate.dtd | 2 +- src/chrome/locale/es/torbutton.dtd | 6 +++--- src/chrome/locale/he/browserOnboarding.properties | 2 +- src/chrome/locale/is/aboutTBUpdate.dtd | 6 +++--- src/chrome/locale/is/aboutTor.dtd | 2 +- src/chrome/locale/is/browserOnboarding.properties | 2 +- src/chrome/locale/it/browserOnboarding.properties | 2 +- src/chrome/locale/nl/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/nl/aboutTor.dtd | 2 +- src/chrome/locale/nl/browserOnboarding.properties | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/pt-BR/browserOnboarding.properties | 2 +- src/chrome/locale/tr/browserOnboarding.properties | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd index c0d74bb2..0b1afb03 100644 --- a/src/chrome/locale/da/aboutTBUpdate.dtd +++ b/src/chrome/locale/da/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Ændringslog for Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser er blevet opdateret."> <!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,"> <!ENTITY aboutTBUpdate.linkLabel "Besøg vores webside"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Version"> -<!ENTITY aboutTBUpdate.releaseDate "Release Date"> -<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> +<!ENTITY aboutTBUpdate.releaseDate "Udgivelsesdato"> +<!ENTITY aboutTBUpdate.releaseNotes "Udgivelsesnoter"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 18c0275c..499fa13a 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> +<!ENTITY aboutTor.viewChangelog.label "Vis ændringslog"> <!ENTITY aboutTor.ready.label "Udforsk. Privat."> <!ENTITY aboutTor.ready2.label "Du er klar til verdenens mest private browseroplevelse."> diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties index 717dc4b2..aec6723b 100644 --- a/src/chrome/locale/da/browserOnboarding.properties +++ b/src/chrome/locale/da/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Se min sti onboarding.tour-tor-security=Sikkerhed onboarding.tour-tor-security.title=Vælg din oplevelse. onboarding.tour-tor-security.description=Vi giver dig også yderligere sikkerhedsindstillinger for at øge din browsersikkerhed. Vores sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan bruges til at angribe din computer. Klik nedenfor for at se hvad de forskellige valgmuligheder gør. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Se dit sikkerhedsniveau onboarding.tour-tor-expect-differences=Oplevelesestips onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. diff --git a/src/chrome/locale/de/aboutTBUpdate.dtd b/src/chrome/locale/de/aboutTBUpdate.dtd index cc1ab47c..607aac91 100644 --- a/src/chrome/locale/de/aboutTBUpdate.dtd +++ b/src/chrome/locale/de/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Änderungsprotokoll"> <!ENTITY aboutTBUpdate.updated "Tor Browser wurde aktualisiert."> <!ENTITY aboutTBUpdate.linkPrefix "Für die aktuellsten Informationen zu diesem Release, "> <!ENTITY aboutTBUpdate.linkLabel "besuche unsere Website"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index c4681b7b..dcb397ef 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Über Tor"> -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> +<!ENTITY aboutTor.viewChangelog.label "Änderungsprotokoll anzeigen"> <!ENTITY aboutTor.ready.label "Entdecken. Privat."> <!ENTITY aboutTor.ready2.label "Du bist bereit für das privateste Browsing-Erlebnis der Welt."> diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index c3856b8d..53a23c03 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit onboarding.tour-tor-security.title=Wähle deine Erfahrung onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicken Sie, um zu erfahren, was die verschiedenen Optionen bewirken. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Siehe deine Sicherheitsstufe onboarding.tour-tor-expect-differences=Erfahrungswerte onboarding.tour-tor-expect-differences.title=Erwarten Sie einige Unterschiede. diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd index 49470e29..70b46fae 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Registro de cambios de Tor Browser"> <!ENTITY aboutTBUpdate.updated "El Tor Browser ha sido actualizado."> <!ENTITY aboutTBUpdate.linkPrefix "Para ver la información más actualizada de esta versión, "> <!ENTITY aboutTBUpdate.linkLabel "visite nuestro sitio web"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index a44dfc6f..2c7a8921 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -25,12 +25,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad te permite deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a tentativas de hackeo."> <!ENTITY torbutton.prefs.sec_standard_label "Estándar"> <!ENTITY torbutton.prefs.sec_standard_description "Están habilitadas todas las características de Tor Browser y sitio web."> -<!ENTITY torbutton.prefs.sec_safer_label "Más segura"> +<!ENTITY torbutton.prefs.sec_safer_label "Más seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características del sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad."> <!ENTITY torbutton.prefs.sec_safer_list_label "En la configuración 'más segura':"> -<!ENTITY torbutton.prefs.sec_safest_label "La más segura"> +<!ENTITY torbutton.prefs.sec_safest_label "El más seguro de todos"> <!ENTITY torbutton.prefs.sec_safest_description "Sólo permite las características de sitio web requeridas para sitios estáticos y servicios básicos. Estos cambios afectan a imágenes, medios, y scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "En la configuración 'la más segura':"> +<!ENTITY torbutton.prefs.sec_safest_list_label "En la configuración de Nivel de seguridad 'El más seguro de todos':"> <!ENTITY torbutton.prefs.sec_learn_more_label "Conocer más"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está deshabilitado en sitios no-HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios."> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index 05d0cf48..906e3725 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=ראה את הנתיב שלי onboarding.tour-tor-security=אבטחה onboarding.tour-tor-security.title=בחר את חוויתך. onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולים לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=ראה את רמת האבטחה שלך onboarding.tour-tor-expect-differences=עצות חוויה onboarding.tour-tor-expect-differences.title=צפה למספר הבדלים. diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd index 65480323..46157f63 100644 --- a/src/chrome/locale/is/aboutTBUpdate.dtd +++ b/src/chrome/locale/is/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Breytingaannáll Tor-vafrans"> <!ENTITY aboutTBUpdate.updated "Tor-vafrinn var uppfærður."> <!ENTITY aboutTBUpdate.linkPrefix "Til að sjá allra nýjustu upplýsingar um þessa útgáfu,"> <!ENTITY aboutTBUpdate.linkLabel "heimsæktu vefsvæðið okkar"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Útgáfa"> -<!ENTITY aboutTBUpdate.releaseDate "Release Date"> -<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> +<!ENTITY aboutTBUpdate.releaseDate "Útgáfudagsetning"> +<!ENTITY aboutTBUpdate.releaseNotes "Útgáfuupplýsingar"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 39820ded..e54ee49b 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Um Tor"> -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> +<!ENTITY aboutTor.viewChangelog.label "Skoða breytingaannál"> <!ENTITY aboutTor.ready.label "Vafraðu í friði fyrir hnýsni."> <!ENTITY aboutTor.ready2.label "Nú er allt klárt fyrir mestu fáanlegu vernd við vafur á netinu."> diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties index 15078a7d..04648a75 100644 --- a/src/chrome/locale/is/browserOnboarding.properties +++ b/src/chrome/locale/is/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Skoða slóðina mína onboarding.tour-tor-security=Öryggi onboarding.tour-tor-security.title=Veldu hvernig þú vilt upplifa þetta. onboarding.tour-tor-security.description=Við höfum einnig útbúið viðbótarstillingar þar sem þú getur breytt öryggisstigi vafrans. Öryggisstillingarnar gera kleift að loka á atriði sem hægt væri að nota til árása á tölvuna þína. Smelltu hér fyrir neðan til að skoða hvernig hinir mismunandi valkostir virka. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Skoðaðu öryggisstig þitt onboarding.tour-tor-expect-differences=Ábendingar fyrir upplifunina onboarding.tour-tor-expect-differences.title=Gerður ráð fyrir að eitthvað verði öðruvísi. diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties index 4dae1440..a8bb329d 100644 --- a/src/chrome/locale/it/browserOnboarding.properties +++ b/src/chrome/locale/it/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Vedi il mio percorso onboarding.tour-tor-security=Sicurezza onboarding.tour-tor-security.title=Scegli la tua esperienza. onboarding.tour-tor-security.description=Ti forniamo anche impostazioni aggiuntive per aumentare la sicurezza del tuo browser. Le nostre impostazioni di sicurezza ti permettono di bloccare elementi che potrebbero essere utilizzati per attaccare il tuo computer. Clicca qui sotto per vedere cosa fanno le diverse opzioni. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Vedi il tuo livello di sicurezza onboarding.tour-tor-expect-differences=Consigli per l'esperienza onboarding.tour-tor-expect-differences.title=Aspettati delle differenze. diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd index 6b095994..56f0e81d 100644 --- a/src/chrome/locale/nl/aboutTBUpdate.dtd +++ b/src/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-changelog"> <!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> -<!ENTITY aboutTBUpdate.linkPrefix "Voor de meest recentste informatie over deze release,"> -<!ENTITY aboutTBUpdate.linkLabel "bezoek onze website"> -<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.linkPrefix "Bezoek "> +<!ENTITY aboutTBUpdate.linkLabel "onze website"> +<!ENTITY aboutTBUpdate.linkSuffix " voor de meest actuele informatie over deze release."> <!ENTITY aboutTBUpdate.version "Versie"> -<!ENTITY aboutTBUpdate.releaseDate "Release datum"> +<!ENTITY aboutTBUpdate.releaseDate "Releasedatum"> <!ENTITY aboutTBUpdate.releaseNotes "Uitgaveopmerkingen"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index b01a2f92..9f60afbf 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> +<!ENTITY aboutTor.viewChangelog.label "Bekijk wijzigingslogboek"> <!ENTITY aboutTor.ready.label "Onderzoek. Privé."> <!ENTITY aboutTor.ready2.label "Je bent klaar voor de meest private browsing ervaring van de wereld"> diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties index db8aa2d4..88b1b4ea 100644 --- a/src/chrome/locale/nl/browserOnboarding.properties +++ b/src/chrome/locale/nl/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Zie Mijn Pad onboarding.tour-tor-security=Beveiliging onboarding.tour-tor-security.title=Kies jouw ervaring. onboarding.tour-tor-security.description=We bieden ook additionele instellingen om de veiligheid van uw browser te verhogen. Onze 'Beveiligingsinstellingen' maken het mogelijk om elementen te blokkeren welk gebruikt zouden kunnen worden om uw computer aan te vallen. Klik hieronder om te zien wat de verschillende opties doen. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Bekijk je beveiligingsniveau onboarding.tour-tor-expect-differences=Ervaring tips onboarding.tour-tor-expect-differences.title=Verwacht enige verschillen. diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 4e3f88f6..b0324a9b 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Zobacz moją ścieżkę onboarding.tour-tor-security=Bezpieczeństwo onboarding.tour-tor-security.title=Wybierz swoje doświadczenie. onboarding.tour-tor-security.description=Umożliwiamy także dodatkowe ustawienia dla zwiększenia bezpieczeństwa Twojej przeglądarki. Nasze Ustawienia Bezpieczeństwa pozwalają Ci blokować elementy które mogą być użyte do ataku Twojego komputera. Kliknij poniżej aby zobaczyć co różne opcje robią. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Zobacz swój poziom bezpieczeństwa onboarding.tour-tor-expect-differences=Wskazówki do doświadczenia onboarding.tour-tor-expect-differences.title=Spodziewaj się różnic. diff --git a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd index 3458c99d..ac45c18c 100644 --- a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd +++ b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Registro de mudanças do navegador Tor"> <!ENTITY aboutTBUpdate.updated "O Navegador Tor foi atualizado."> <!ENTITY aboutTBUpdate.linkPrefix "Para obter as informações mais recentes sobre esta versão"> <!ENTITY aboutTBUpdate.linkLabel "visite nosso site."> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Versão"> -<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseDate "Data de lançamento"> <!ENTITY aboutTBUpdate.releaseNotes "Notas da Versão"> diff --git a/src/chrome/locale/pt-BR/browserOnboarding.properties b/src/chrome/locale/pt-BR/browserOnboarding.properties index 8d309797..fb3935b0 100644 --- a/src/chrome/locale/pt-BR/browserOnboarding.properties +++ b/src/chrome/locale/pt-BR/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Ver Meu Caminho onboarding.tour-tor-security=Segurança onboarding.tour-tor-security.title=Escolha sua experiência. onboarding.tour-tor-security.description=Nós também fornecemos a você configurações adicionais para aumentar a segurança do seu browser. Nossas Configurações de Segurança permitem você bloquear elementos que podem ser utilizados para atacar o seu computador. Clique abaixo para ver o que as diferentes opções fazem. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Veja seu nível de segurança onboarding.tour-tor-expect-differences=Dicas de Experiência onboarding.tour-tor-expect-differences.title=Espere algumas diferenças. diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties index 2abd38c2..ea52e092 100644 --- a/src/chrome/locale/tr/browserOnboarding.properties +++ b/src/chrome/locale/tr/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=Yolumu Göster onboarding.tour-tor-security=Güvenlik onboarding.tour-tor-security.title=Deneyiminizi özelleştirin. onboarding.tour-tor-security.description=Ek ayarları kullanarak web tarayıcınızın güvenliğini arttırabilirsiniz. Güvenlik Ayarlarımız bilgisayarınıza saldırmak için kullanılabilecek bileşenleri engellemenizi sağlar. Seçeneklerinizi görebilmek için aşağıya tıklayın. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.button=Güvenlik Düzeyinize Bakın onboarding.tour-tor-expect-differences=Deneyim İpuçları onboarding.tour-tor-expect-differences.title=Bazı farklılıklara açık olun.

1 0

[tor-browser-build/master] Picking up tor-browser build2
by gk＠torproject.org 16 Mar '19

16 Mar '19

commit d6471d51f7b2b90ff4dc043b9280a01914a6294c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Mar 16 09:10:46 2019 +0000 Picking up tor-browser build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index ee6ba3d..9c85fcb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 1d72524..ce4b260 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a8 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.6.0esr-8.5-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 16 Mar '19

16 Mar '19

commit 30d158c260404e073c681f91838cc8ba4a650284 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Mar 16 09:05:47 2019 +0000 squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. --- mobile/locales/search/list.json | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json index 498e136182a9..a0ee93d4f7f7 100644 --- a/mobile/locales/search/list.json +++ b/mobile/locales/search/list.json @@ -247,49 +247,49 @@ "et": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "twitter", "wikipedia-et" + "google", "amazon-co-uk", "twitter", "wikipedia-et" ] } }, "eu": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "elebila", "wikipedia-eu" + "google", "bing", "elebila", "wikipedia-eu" ] } }, "fa": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-fa" + "google", "bing", "wikipedia-fa" ] } }, "ff": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "wikipedia-fr" + "google", "bing", "amazon-fr", "wikipedia-fr" ] } }, "fi": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "twitter", "wikipedia-fi" + "google", "amazondotcom", "twitter", "wikipedia-fi" ] } }, "fr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "twitter", "wikipedia-fr" + "google", "bing", "ddg", "qwant", "twitter", "wikipedia-fr" ] } }, "fy-NL": { "default": { "visibleDefaultEngines": [ - "google-b-m", "wikipedia-fy-NL", "bolcom-fy-NL" + "google", "wikipedia-fy-NL", "bolcom-fy-NL" ] }, "experimental-hidden": { @@ -301,133 +301,133 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "tearma", "twitter", "wikipedia-ga-IE" + "google", "amazon-co-uk", "tearma", "twitter", "wikipedia-ga-IE" ] } }, "gd": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "faclair-beag", "wikipedia-gd" + "google", "bing", "ddg", "faclair-beag", "wikipedia-gd" ] } }, "gl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-gl" + "google", "bing", "amazondotcom", "twitter", "wikipedia-gl" ] } }, "gn": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-gn" + "google", "bing", "amazondotcom", "twitter", "wikipedia-gn" ] } }, "gu-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-gu" + "google", "bing", "amazon-in", "wikipedia-gu" ] } }, "he": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-he" + "google", "bing", "amazondotcom", "twitter", "wikipedia-he" ] } }, "hi-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "twitter", "wikipedia-hi" + "google", "bing", "amazon-in", "twitter", "wikipedia-hi" ] } }, "hr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "twitter", "wikipedia-hr" + "google", "bing", "amazon-co-uk", "ddg", "twitter", "wikipedia-hr" ] } }, "hsb": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "twitter", "wikipedia-hsb" + "google", "bing", "amazon-de", "twitter", "wikipedia-hsb" ] } }, "hu": { "default": { "visibleDefaultEngines": [ - "google-b-m", "sztaki-en-hu", "vatera", "twitter", "wikipedia-hu" + "google", "sztaki-en-hu", "vatera", "twitter", "wikipedia-hu" ] } }, "hy-AM": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "list-am", "wikipedia-hy-AM" + "google", "bing", "amazondotcom", "list-am", "wikipedia-hy-AM" ] } }, "ia": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" + "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" ] } }, "id": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "twitter", "wikipedia-id" + "google", "bing", "twitter", "wikipedia-id" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "leit-is", "wikipedia-is" + "google", "bing", "amazondotcom", "leit-is", "wikipedia-is" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-it" + "google", "bing", "ddg", "twitter", "wikipedia-it" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-jp", "bing", "twitter-ja", "wikipedia-ja", "yahoo-jp" + "google", "amazon-jp", "bing", "twitter-ja", "wikipedia-ja", "yahoo-jp" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka" + "google", "bing", "amazondotcom", "ddg", "wikipedia-ka" ] } }, "kab": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-kab" + "google", "bing", "wikipedia-kab" ] } }, "kk": { "default": { "visibleDefaultEngines": [ - "yandex", "google-b-m", "bing", "twitter", "wikipedia-kk" + "yandex", "google", "bing", "twitter", "wikipedia-kk" ] } }, @@ -558,42 +558,42 @@ "nn-NO": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NN" + "google", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NN" ] } }, "oc": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-oc", "wiktionary-oc" + "google", "bing", "wikipedia-oc", "wiktionary-oc" ] } }, "or": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-or", "wiktionary-or" + "google", "bing", "amazon-in", "wikipedia-or", "wiktionary-or" ] } }, "pa-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-pa" + "google", "bing", "wikipedia-pa" ] } }, "pl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-pl" + "google", "bing", "ddg", "twitter", "wikipedia-pl" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "twitter", "wikipedia-pt" + "google", "bing", "twitter", "wikipedia-pt" ] }, "experimental-hidden": { @@ -605,105 +605,105 @@ "pt-PT": { "default": { "visibleDefaultEngines": [ - "google-b-m", "wikipedia-pt" + "google", "wikipedia-pt" ] } }, "rm": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" + "google", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" ] } }, "ro": { "default": { "visibleDefaultEngines": [ - "google-b-m", "twitter", "wikipedia-ro" + "google", "twitter", "wikipedia-ro" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "google-b-m", "yandex-ru", "twitter", "wikipedia-ru" + "google", "yandex-ru", "twitter", "wikipedia-ru" ] } }, "sk": { "default": { "visibleDefaultEngines": [ - "google-b-m", "azet-sk", "slovnik-sk", "twitter", "wikipedia-sk" + "google", "azet-sk", "slovnik-sk", "twitter", "wikipedia-sk" ] } }, "sl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ceneje", "odpiralni", "twitter", "wikipedia-sl" + "google", "ceneje", "odpiralni", "twitter", "wikipedia-sl" ] } }, "son": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "twitter", "wikipedia-fr" + "google", "bing", "amazon-fr", "twitter", "wikipedia-fr" ] } }, "sq": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "twitter", "wikipedia-sq" + "google", "bing", "amazon-co-uk", "twitter", "wikipedia-sq" ] } }, "sr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-sr" + "google", "bing", "ddg", "twitter", "wikipedia-sr" ] } }, "sv-SE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "prisjakt-sv-SE", "twitter", "wikipedia-sv-SE" + "google", "prisjakt-sv-SE", "twitter", "wikipedia-sv-SE" ] } }, "ta": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" + "google", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" ] } }, "te": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-te", "wiktionary-te" + "google", "bing", "amazon-in", "wikipedia-te", "wiktionary-te" ] } }, "th": { "default": { "visibleDefaultEngines": [ - "google-b-m", "twitter", "wikipedia-th" + "google", "twitter", "wikipedia-th" ] } }, "tl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "twitter" + "google", "bing", "amazondotcom", "ddg", "twitter" ] } }, "tr": { "default": { "visibleDefaultEngines": [ - "yandex-tr", "google-b-m", "twitter", "wikipedia-tr" + "yandex-tr", "google", "twitter", "wikipedia-tr" ] } }, @@ -774,7 +774,7 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-zh-TW" + "google", "bing", "ddg", "wikipedia-zh-TW" ] }, "experimental-hidden": {

1 0

[tor-browser-build/master] Release preparations for 8.5a9
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 4728614433f2c3248a0a60891ded27ff7003f267 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 15 22:30:43 2019 +0000 Release preparations for 8.5a9 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 50 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 +-- 6 files changed, 58 insertions(+), 8 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index a56f3f9..ee6ba3d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.5.1 + firefox_platform_version: 60.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a68ff69..1054827 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,59 @@ +Tor Browser 8.5a9 -- March 19 2019 + * All platforms + * Update Firefox to 60.6.0esr + * Update Torbutton to 2.1.5 + * Bug 25658: Replace security slider with security level UI + * Bug 28628: Change onboarding Security panel to open new Security Level panel + * Bug 29440: Update about:tor when Tor Browser is updated + * Bug 27478: Improved Torbutton icons for dark theme + * Bug 29021: Tell NoScript it is running within Tor Browser + * Bug 29239: Don't ship the Torbutton .xpi on mobile + * Translations update + * Bug 29120: Enable media cache in memory + * Bug 29445: Enable support for enterprise policies + * Windows + OS X + Linux + * Update Tor to 0.4.0.2-alpha + * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update OpenSSL to 1.0.2r + * Update Tor Launcher to 0.2.18.1 + * Bug 29328: Account for Tor 0.4.0.x's revised bootstrap status reporting + * Bug 22402: Improve "For assistance" link + * Translations update + * Bug 25658+29554: Replace security slider with security level UI + * Bug 28885: notify users that update is downloading + * Bug 29180: MAR download stalls when about dialog is opened + * Bug 27485: Users are not taught how to open security-slider dialog + * Bug 27486: Avoid about:blank tabs when opening onboarding pages + * Bug 29440: Update about:tor when Tor Browser is updated + * Bug 23359: WebExtensions icons are not shown on first start + * Bug 28628: Change onboarding Security panel to open new Security Level panel + * Android + * Bug 28329: Design Tor Browser for Android configuration UI + * Bug 28802: Support PTs in Tor Browser for Android + * Bug 29794: Update TBA built-in bridges + * Bug 27210: Add support for x86 on Android + * Bug 29633: Don't ship pdnsd anymore + * Bug 28708: about:tor is not the default homepage after upgrade + * Bug 29626: Application name is now "Always-On Notifications" + * Bug 29467: Backport fix for arc4random_buf bustage + * Build System + * All platforms + * Bug 25876: Generate source tarballs during build + * Bug 28685: Set Build ID based on Tor Browser version + * Bug 29194: Set DEBIAN_FRONTEND=noninteractive + * Linux + * Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy + * Bug 29758: Build firefox debug symbols for linux-i686 + * Android + * Bug 29632: Use HTTPS for downloading Gradle + Tor Browser 8.5a8 -- February 13 2019 * All platforms * Update Firefox to 60.5.1esr * Update HTTPS Everywhere to 2019.1.31 * Bug 29378: Remove 83.212.101.3 from default bridges * Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js + * Bug 29327: TypeError: hostName is null on about:tor page * Build System * All Platforms * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 8087727..600b048 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.18 +version: 0.2.18.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 369d7e4..a834417 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.4 +version: 2.1.5 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index d39316c..1d72524 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a8' - torbrowser_build: 'build2' + torbrowser_version: '8.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a7 + - 8.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.6.0esr-8.5-1] Pull in latest Torbutton code
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 16cd9b21911c5405381dafbd9566cc4ce8a78fa2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 15 22:22:28 2019 +0000 Pull in latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 52c12d905ff4..498d64784659 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 52c12d905ff4f6d35d5788b5cc379e474be429e9 +Subproject commit 498d64784659082877bc83ecca24fbf8d137125f

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 28329 - Part 1. Add new Tor resources
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 0db4c9243320d2c516329949ee17e8b0a5b13624 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Feb 19 22:45:46 2019 +0000 Bug 28329 - Part 1. Add new Tor resources --- .../main/res/color/tor_bridges_enabled_colors.xml | 10 ++++++ .../main/res/color/tor_bridges_select_builtin.xml | 8 +++++ .../res/drawable-nodpi/tor_bootstrap_onion.gif | Bin 0 -> 137518 bytes .../app/src/main/res/drawable/ic_settings_24px.xml | 36 +++++++++++++++++++++ .../res/drawable/list_section_divider_material.xml | 19 +++++++++++ .../drawable/list_section_divider_mtrl_alpha.9.png | Bin 0 -> 164 bytes .../app/src/main/res/drawable/rounded_corners.xml | 11 +++++++ .../src/main/res/drawable/tor_spinning_onion.xml | 12 +++++++ mobile/android/app/src/main/res/xml/separator.xml | 13 ++++++++ .../android/app/src/photon/res/values/colors.xml | 2 ++ .../base/locales/en-US/torbrowser_strings.dtd | 32 ++++++++++++++++++ mobile/android/base/strings.xml.in | 29 +++++++++++++++++ 12 files changed, 172 insertions(+) diff --git a/mobile/android/app/src/main/res/color/tor_bridges_enabled_colors.xml b/mobile/android/app/src/main/res/color/tor_bridges_enabled_colors.xml new file mode 100644 index 000000000000..a51ffd547c04 --- /dev/null +++ b/mobile/android/app/src/main/res/color/tor_bridges_enabled_colors.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_checked="true" + android:color="@color/tor_bootstrap_background" /> + <item android:color="#808080" /> +</selector> diff --git a/mobile/android/app/src/main/res/color/tor_bridges_select_builtin.xml b/mobile/android/app/src/main/res/color/tor_bridges_select_builtin.xml new file mode 100644 index 000000000000..948ed552d539 --- /dev/null +++ b/mobile/android/app/src/main/res/color/tor_bridges_select_builtin.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="#808080" /> +</selector> diff --git a/mobile/android/app/src/main/res/drawable-nodpi/tor_bootstrap_onion.gif b/mobile/android/app/src/main/res/drawable-nodpi/tor_bootstrap_onion.gif new file mode 100755 index 000000000000..b9478997b5d6 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-nodpi/tor_bootstrap_onion.gif differ diff --git a/mobile/android/app/src/main/res/drawable/ic_settings_24px.xml b/mobile/android/app/src/main/res/drawable/ic_settings_24px.xml new file mode 100644 index 000000000000..c582193aa12d --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/ic_settings_24px.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> + + + + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:width="24dp" + android:height="24dp" + android:viewportWidth="20" + android:viewportHeight="20" + tools:ignore="NewApi"> + + <path + android:pathData="M0,0 L20,0 L20,20 L0,20 L0,0 Z" /> + <path + android:fillColor="?attr/colorControlNormal" + android:pathData="M15.95,10.78 C15.98,10.53,16,10.27,16,10 S15.98,9.47,15.94,9.22 L17.63,7.9 C17.78,7.78,17.82,7.56,17.73,7.39 L16.13,4.62 C16.03,4.44,15.82,4.38,15.64,4.44 L13.65,5.24 C13.23,4.92,12.79,4.66,12.3,4.46 L12,2.34 C11.97,2.14,11.8,2,11.6,2 L8.4,2 C8.2,2,8.04,2.14,8.01,2.34 L7.71,4.46 C7.22,4.66,6.77,4.93,6.36,5.24 L4.37,4.44 C4.19,4.37,3.98,4.44,3.88,4.62 L2.28,7.39 C2.18,7.57,2.22,7.78,2.38,7.9 L4.07,9.22 C4.03,9.47,4,9.74,4,10 S4.02,10.53,4.06,10.78 L2.37,12.1 C2.22,12.22,2.18,12.44,2.27,12.61 L3.87,15.38 C3.97,15.56,4.18,15.62,4.36,15.56 L6.35,14.76 C6.77,15.08,7.21,15.34,7.7,15.54 L8,17.66 C8.04,17.86,8.2,18,8.4,18 L11.6,18 C11.8,18,11.97,17.86,11.99,17.66 L12.29,15.54 C12.78,15.34,13.23,15.07,13.64,14.76 L15.63,15.56 C15.81,15.63,16.02,15.56,16.12,15.38 L17.72,12.61 C17.82,12.43,17.78,12.22,17.62,12.1 L15.95,10.78 Z M10,13 C8.35,13,7,11.65,7,10 S8.35,7,10,7 S13,8.35,13,10 S11.65,13,10,13 Z" /> +</vector> diff --git a/mobile/android/app/src/main/res/drawable/list_section_divider_material.xml b/mobile/android/app/src/main/res/drawable/list_section_divider_material.xml new file mode 100644 index 000000000000..dd66b88381fa --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/list_section_divider_material.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/list_section_divider_mtrl_alpha" + android:tint="#ff000000" + android:alpha="0.12" /> diff --git a/mobile/android/app/src/main/res/drawable/list_section_divider_mtrl_alpha.9.png b/mobile/android/app/src/main/res/drawable/list_section_divider_mtrl_alpha.9.png new file mode 100644 index 000000000000..12d8b2f4aa00 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable/list_section_divider_mtrl_alpha.9.png differ diff --git a/mobile/android/app/src/main/res/drawable/rounded_corners.xml b/mobile/android/app/src/main/res/drawable/rounded_corners.xml new file mode 100644 index 000000000000..670da2fed66e --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/rounded_corners.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#FFFFFF" /> + <corners android:radius="5dp" /> +</shape> diff --git a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml new file mode 100644 index 000000000000..6bcc52f87f93 --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml @@ -0,0 +1,12 @@ + + +<vector android:height="24dp" android:viewportHeight="289" + android:viewportWidth="247" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF000000" android:pathData="M100.02,44.97C96.2,31.15 83.92,21.59 69.91,21.51V0c16.52,0 32.07,7.97 41.98,21.51V0h20.99v21.51C142.78,7.97 158.33,0 174.85,0v21.51c-14.01,0.08 -26.29,9.63 -30.12,23.45C203.49,54.97 41.26,54.97 100.02,44.97z"/> + <path android:fillColor="#FF000000" android:pathData="M123.92,52.47c-62.22,0 -112.65,50.44 -112.65,112.65c0,62.22 50.44,112.65 112.65,112.65V52.47z"/> + <path android:fillColor="#FF000000" android:pathData="M123.92,266.51c56,0 101.39,-45.39 101.39,-101.39c0,-56 -45.39,-101.39 -101.39,-101.39S22.53,109.13 22.53,165.12C22.53,221.12 67.92,266.51 123.92,266.51zM123.92,289.04C55.48,289.04 0,233.56 0,165.12S55.48,41.2 123.92,41.2s123.92,55.48 123.92,123.92S192.36,289.04 123.92,289.04z"/> + <path android:fillColor="#FF000000" android:pathData="M124.92,78.78v22.53c34.79,0.54 62.84,28.89 62.84,63.81c0,34.92 -28.04,63.28 -62.84,63.81v22.53c47.24,-0.54 85.37,-38.98 85.37,-86.34C210.29,117.76 172.16,79.32 124.92,78.78z"/> + <path android:fillColor="#FF000000" android:pathData="M123.92,116.31v22.53c14.52,0 26.29,11.77 26.29,26.29s-11.77,26.29 -26.29,26.29v22.53c26.96,0 48.82,-21.86 48.82,-48.82C172.74,138.16 150.88,116.31 123.92,116.31z"/> +</vector> diff --git a/mobile/android/app/src/main/res/xml/separator.xml b/mobile/android/app/src/main/res/xml/separator.xml new file mode 100644 index 000000000000..edd95cd90a3a --- /dev/null +++ b/mobile/android/app/src/main/res/xml/separator.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<View xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textSize="8sp" + android:textStyle="bold" + android:background="@drawable/list_section_divider_material"/> diff --git a/mobile/android/app/src/photon/res/values/colors.xml b/mobile/android/app/src/photon/res/values/colors.xml index b322a46fe008..2762e364dd79 100644 --- a/mobile/android/app/src/photon/res/values/colors.xml +++ b/mobile/android/app/src/photon/res/values/colors.xml @@ -154,6 +154,8 @@ <color name="tor_tab_inactive_text">#484848</color> <color name="tor_tab_active_text">#7D4698</color> <color name="tor_description_background_text">#FAFAFA</color> + + <color name="tor_bootstrap_background">#420C5D</color>  <color name="restricted_profile_background_gold">#ffffcb51</color> diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 5419f4942b3e..44b4a44ff93c 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -23,3 +23,35 @@ <!ENTITY firstrun_onionservices_title "Onion Services."> <!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> <!ENTITY firstrun_onionservices_next "Go to explore"> + +<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs"> +<!ENTITY tor_bootstrap_connect "Connect"> +<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network..."> + +<!ENTITY pref_tor_network_title "Network"> +<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge"> +<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge"> + +<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?"> +<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others."> + +<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here"> +<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor"> + +<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know"> +<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge"> +<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge"> +<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source"> +<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port"> +<!ENTITY pref_tor_hint_type_one_per_line "Type one per line"> + + +<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)"> +<!ENTITY pref_bridges_type_meek_azure "meek-azure"> +<!ENTITY pref_bridges_type_obfs3 "obfs3"> +<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change"> +<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change"> +<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> +<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge."> + +<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information."> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 2beb152ad5bb..eaa902b95060 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -82,6 +82,35 @@ <string name="firstrun_onionservices_message">&firstrun_onionservices_message;</string> <string name="firstrun_onionservices_next">&firstrun_onionservices_next;</string> + <string name="pref_tor_network_title">&pref_tor_network_title;</string> + <string name="pref_tor_select_a_bridge_title">&pref_tor_select_a_bridge_title;</string> + <string name="pref_tor_provide_a_bridge_title">&pref_tor_provide_a_bridge_title;</string> + <string name="pref_category_tor_network_summary">&pref_category_tor_network_summary;</string> + <string name="pref_category_tor_bridge_summary">&pref_category_tor_bridge_summary;</string> + <string name="tor_notify_user_about_error">&tor_notify_user_about_error;</string> + + <string name="tor_bootstrap_swipe_for_logs">&tor_bootstrap_swipe_for_logs;</string> + <string name="tor_bootstrap_connect">&tor_bootstrap_connect;</string> + <string name="tor_bootstrap_starting_status">&tor_bootstrap_starting_status;</string> + + <string name="pref_choice_tor_bridges_enabled_title">&pref_choice_tor_bridges_enabled_title;</string> + <string name="pref_choice_tor_bridges_enabled_summary">&pref_choice_tor_bridges_enabled_summary;</string> + <string name="pref_bridges_type_obfs4">&pref_bridges_type_obfs4;</string> + <string name="pref_bridges_type_meek_azure">&pref_bridges_type_meek_azure;</string> + <string name="pref_bridges_type_obfs3">&pref_bridges_type_obfs3;</string> + + <string name="pref_tor_bridges_provide_manual_button_title">&pref_tor_bridges_provide_manual_button_title;</string> + <string name="pref_tor_bridges_provide_select_text_title">&pref_tor_bridges_provide_select_text_title;</string> + <string name="pref_tor_bridges_provide_manual_text_title">&pref_tor_bridges_provide_manual_text_title;</string> + <string name="pref_tor_bridges_provide_manual_summary">&pref_tor_bridges_provide_manual_summary;</string> + + <string name="pref_tor_bridges_provide_manual_address_port_placeholder">&pref_tor_bridges_provide_manual_address_port_placeholder;</string> + <string name="pref_tor_hint_type_one_per_line">&pref_tor_hint_type_one_per_line;</string> + <string name="pref_tor_network_bridges_enabled_change_custom">&pref_tor_network_bridges_enabled_change_custom;</string> + <string name="pref_tor_network_bridges_enabled_change_builtin">&pref_tor_network_bridges_enabled_change_builtin;</string> + <string name="pref_tor_network_using_multiple_provided_bridges">&pref_tor_network_using_multiple_provided_bridges;</string> + <string name="pref_tor_network_using_a_provided_bridge">&pref_tor_network_using_a_provided_bridge;</string> + <string name="bookmarks_title">&bookmarks_title;</string> <string name="history_title">&history_title;</string>

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 28329 - Part 2. Implement checking if the Tor service is running
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit a6e87093856101ec93bbeaf93eed22ac77031f73 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Feb 20 01:04:56 2019 +0000 Bug 28329 - Part 2. Implement checking if the Tor service is running --- .../base/java/org/mozilla/gecko/BrowserApp.java | 130 +++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 9330a6ba9838..5aa0a6a7f3ac 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -51,6 +51,7 @@ import android.support.design.widget.Snackbar; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.NotificationCompat; +import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.res.ResourcesCompat; import android.support.v4.view.MenuItemCompat; import android.text.TextUtils; @@ -182,6 +183,7 @@ import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; import org.torproject.android.OrbotMainActivity; +import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import java.io.File; @@ -270,6 +272,7 @@ public class BrowserApp extends GeckoApp private TabsPanel mTabsPanel; private boolean mOrbotNeedsStart = true; + private boolean mTorNeedsStart = true; private boolean showSplashScreen = false; private SplashScreen splashScreen; @@ -1079,6 +1082,131 @@ public class BrowserApp extends GeckoApp } /** + * Send the service a request for the current status. + * The response is sent as a broadcast. Capture that in + * receiveTorIsStartedAsync(). + */ + private void requestTorIsStartedAsync() { + Intent torServiceStatus = new Intent(this, TorService.class); + torServiceStatus.setAction(TorServiceConstants.ACTION_STATUS); + startService(torServiceStatus); + } + + private BroadcastReceiver mLocalBroadcastReceiver; + private Boolean mTorStatus; + + /** + * Setup the status receiver for broadcasts from the service. + * The response is sent as a broadcast. Create a background thread + * for receiving/handling the broadcast. + * + * This method is coupled with receiveTorIsStartedAsync(). They should + * be used together. + */ + private BroadcastReceiver setupReceiveTorIsStartedAsync() { + + // Create a thread specifically for defining the BroadcastReceiver + new Thread(new Runnable() { + + @Override + public void run() { + mLocalBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (action == null) { + return; + } + + // We only want ACTION_STATUS messages + if (!action.equals(TorServiceConstants.ACTION_STATUS)) { + return; + } + + // The current status has the EXTRA_STATUS key + String currentStatus = + intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); + + try { + synchronized (mTorStatus) { + mTorStatus = (currentStatus == TorServiceConstants.STATUS_ON); + mTorStatus.notify(); + } + } catch (IllegalMonitorStateException e) { + // |synchronized| should prevent this + } + } + }; + + LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(BrowserApp.this); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.ACTION_STATUS)); + + } + }).start(); + + return mLocalBroadcastReceiver; + } + + /** + * Receive the current status from the service. + * The response is sent as a broadcast. If it is not received within + * 1 second, then return false. + * + * This method is coupled with setupReceiveTorIsStartedAsync(). They + * should be used together. + */ + private boolean receiveTorIsStartedAsync(BroadcastReceiver mLocalBroadcastReceiver, Boolean torStatus) { + // Wait until we're notified from the above thread, or we're + // interrupted by the timeout. + try { + // One thousand milliseconds = one second + final long oneSecTimeout = Math.round(Math.pow(10, 3)); + synchronized (torStatus) { + // We wake from wait() because we reached the one second + // timeout, the BroadcastReceiver notified us, or we received + // a spurious wakeup. For all three cases, we can accept the + // current value of torStatus. + torStatus.wait(oneSecTimeout); + } + } catch (InterruptedException e) { + // ignore. + } catch (IllegalArgumentException e) { + // oneSecTimeout should never be negative + } catch (IllegalMonitorStateException e) { + // |synchronized| should take care of this + } + + // Unregister the receiver + LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); + + return torStatus; + } + + /** + * Receive the current Tor status. + * + * Send a request for the current status and receive the response. + * Returns true if Tor is running, false otherwise. + * + * mTorStatus provides synchronization across threads. + */ + private boolean checkTorIsStarted() { + // When tor is started, true. Otherwise, false + mTorStatus = false; + BroadcastReceiver br = setupReceiveTorIsStartedAsync(); + new Thread(new Runnable() { + @Override + public void run() { + requestTorIsStartedAsync(); + } + }).start(); + + return receiveTorIsStartedAsync(br, mTorStatus); + } + + + /** * Code to actually show the first run pager, separated * for distribution purposes. */ @@ -1309,6 +1437,7 @@ public class BrowserApp extends GeckoApp final SafeIntent intent = new SafeIntent(getIntent()); if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) { checkStartOrbot(); + mTorNeedsStart = !checkTorIsStarted(); } } @@ -1763,6 +1892,7 @@ public class BrowserApp extends GeckoApp GeckoNetworkManager.destroy(); mOrbotNeedsStart = true; + mTorNeedsStart = true; super.onDestroy(); }

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 28051 - Open Orbot when the notification is tapped"
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit fbf54c71e26a64859f953e18a34e5c9e8831f071 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Jan 18 13:07:10 2019 +0000 Revert "Bug 28051 - Open Orbot when the notification is tapped" This reverts commit b5be1210aab76340526aa7828d5d9050b8183e62. Orbot isn't our bootstrapper anymore --- .../base/java/org/mozilla/gecko/LauncherActivity.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java index 4cd94ed538c7..e8f8facc24c6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java +++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java @@ -45,9 +45,6 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN; import org.mozilla.gecko.deeplink.DeepLinkContract; -import org.torproject.android.OrbotMainActivity; -import org.torproject.android.service.TorServiceConstants; - /** * Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app). */ @@ -70,9 +67,6 @@ public class LauncherActivity extends Activity { } else if (isWebAppIntent(safeIntent)) { dispatchWebAppIntent(); - } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) { - dispatchOrbotIntent(); - // If it's not a view intent, it won't be a custom tabs intent either. Just launch! } else if (!isViewIntentWithURL(safeIntent)) { dispatchNormalIntent(); @@ -122,18 +116,6 @@ public class LauncherActivity extends Activity { startActivity(intent); } - private void dispatchOrbotIntent() { - final String orbotStartAction = "android.intent.action.MAIN"; - final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); - - //When we launch Orbot, we want a new task. - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - - startActivity(intent); - } - private void dispatchUrlIntent(@NonNull String url) { Intent intent = new Intent(getIntent()); intent.setData(Uri.parse(url));

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 28329 - Part 3. Remove OrbotActivity dependency
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit e4d2df5e776b6270b5eb98f4b718ea6eb5ea5094 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Feb 20 01:08:36 2019 +0000 Bug 28329 - Part 3. Remove OrbotActivity dependency --- mobile/android/app/build.gradle | 5 ----- mobile/android/base/AndroidManifest.xml.in | 8 ++++++++ .../base/java/org/mozilla/gecko/BrowserApp.java | 18 ------------------ .../base/java/org/mozilla/gecko/GeckoApplication.java | 5 ----- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index d0060901b6b3..c8380042d8a9 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -225,7 +225,6 @@ dependencies { implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" - implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar') implementation files('orbotservice-release.aar') implementation files('jsocksAndroid-release.aar') @@ -266,10 +265,6 @@ dependencies { // Including the Robotium JAR directly can cause issues with dexing. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4' - // Orbot - implementation 'com.github.delight-im:Android-Languages:v1.0.1' - implementation 'pl.bclogic:pulsator4droid:1.0.3' - // Orbotservice implementation 'org.torproject:tor-android-binary:0.3.4.9' implementation 'com.jrummyapps:android-shell:1.0.1' diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index c7c5ead7f82f..72b1e16925b7 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -493,5 +493,13 @@ <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> #endif +  + <service + android:name="org.torproject.android.service.TorService" + android:enabled="true" + android:exported="false" + android:stopWithTask="true"> + </service> + </application> </manifest> diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5aa0a6a7f3ac..464b4054c9ff 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -182,7 +182,6 @@ import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.GeckoSession; -import org.torproject.android.OrbotMainActivity; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; @@ -242,7 +241,6 @@ public class BrowserApp extends GeckoApp public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002; public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003; - public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001; public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE"; @@ -271,7 +269,6 @@ public class BrowserApp extends GeckoApp private HomeScreen mHomeScreen; private TabsPanel mTabsPanel; - private boolean mOrbotNeedsStart = true; private boolean mTorNeedsStart = true; private boolean showSplashScreen = false; @@ -1410,14 +1407,6 @@ public class BrowserApp extends GeckoApp } } - public void checkStartOrbot() { - if (mOrbotNeedsStart) { - final String orbotStartAction = "android.intent.action.MAIN"; - final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class); - startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null); - } - } - @Override public void onResume() { super.onResume(); @@ -1436,7 +1425,6 @@ public class BrowserApp extends GeckoApp // need to know if we are in automation. final SafeIntent intent = new SafeIntent(getIntent()); if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) { - checkStartOrbot(); mTorNeedsStart = !checkTorIsStarted(); } } @@ -1891,7 +1879,6 @@ public class BrowserApp extends GeckoApp NotificationHelper.destroy(); GeckoNetworkManager.destroy(); - mOrbotNeedsStart = true; mTorNeedsStart = true; super.onDestroy(); @@ -3111,11 +3098,6 @@ public class BrowserApp extends GeckoApp TabQueueHelper.processTabQueuePromptResponse(resultCode, this); break; - case ACTIVITY_RESULT_ORBOT_LAUNCH: - Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH"); - mOrbotNeedsStart = false; - break; - default: for (final BrowserAppDelegate delegate : delegates) { delegate.onActivityResult(this, requestCode, resultCode, data); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index b8e4985332a9..b38e7184c798 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -63,7 +63,6 @@ import java.net.URL; import java.util.UUID; import org.torproject.android.service.util.Prefs; -import org.torproject.android.settings.Languages; public class GeckoApplication extends Application implements HapticFeedbackDelegate { @@ -325,10 +324,6 @@ public class GeckoApplication extends Application // Give Orbot the base Context Prefs.setContext(context); - // Initialize Orbot's Language settings - Languages.setup(BrowserApp.class, R.string.menu_settings); - Languages.setLanguage(this, Prefs.getDefaultLocale(), true); - super.onCreate(); }

1 0