commit e58a15ebd77dc90fcdfc926eb21be0c8e5c11aad Author: Hans-Christoph Steiner hans@eds.org Date: Wed Jun 3 17:36:41 2015 -0400
Promo Apps: choose "all apps" URL based on which app store is installed
Since most people using devices without Google Play will be in China, where Google is generally blocked, instead direct people to f-droid.org unless they have Google Play installed. --- res/layout/layout_wizard_tips.xml | 2 +- res/values-ar/strings.xml | 6 +- res/values-az/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs-rCZ/strings.xml | 2 +- res/values-da/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-eo/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et/strings.xml | 2 +- res/values-eu/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rFR/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl/strings.xml | 2 +- res/values-he/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-id-rID/strings.xml | 2 +- res/values-is/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-mk/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rBR/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-si-rLK/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zh/strings.xml | 2 +- res/values/strings.xml | 3 +- .../android/ui/wizard/PromoAppsActivity.java | 90 +++++++++++++------- 47 files changed, 108 insertions(+), 79 deletions(-)
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 43afc43..83ed2d4 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -97,7 +97,7 @@ android:layout_gravity="left" android:layout_marginTop="10px" android:drawableLeft="@drawable/ic_play" - android:text="@string/wizard_tips_play" /> + android:text="@string/wizard_tips_fdroid_org" />
</LinearLayout> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 8ace8ba..28af9d6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -96,10 +96,8 @@ <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string> <string name="wizard_tips_orweb">Orweb: متصفح مصمّم للخصوصية و يعمل مع تور</string> <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject -</string> - <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> - <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> + +
<string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/ad...</string>--> <!--Transparent Proxy screen--> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index b7c5ae3..9035a84 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orveb: Tor vasitəsilə işləyən təhlükəsizliyi gücləndirilmiş brauzer</string>
<string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 0658540..d5e339b 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -103,7 +103,7 @@ <string name="wizard_tips_orweb">Orweb: Браузър с повишена анонимност, който работи през Тор</string>
<string name="wizard_tips_play">Намери всики Guardin Project програми в Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index ea1da27..9cd2414 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Navegador amb privacitat millorada que funciona a través de Tor</string>
<string name="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index 6189e31..bfe8f64 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: webový prohlížeč s rozšířeným soukromím pracující přes Tor</string>
<string name="wizard_tips_play">Najděte všechny aplikace Guardian Projektu na Obchodu Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5bc69ff..0590006 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -96,7 +96,7 @@ <string name="wizard_tips_title">Orbot-aktiverede apps</string> <string name="wizard_tips_orweb">Orweb: Privatlivs-forbedret browser der virker gennem Tor</string> <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c497bf0..1687854 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -104,7 +104,7 @@ <string name="wizard_tips_orweb">Orweb: Ein im Datenschutz erweiterter Browser, der durch Tor arbeitet</string>
<string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 19dc032..7f09fda 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb - Περιηγητής ιστού με ενισχυμένη ασφάλεια που είναι συμβατό με Tor</string>
<string name="wizard_tips_play">Βρες όλες τις εφαρμογές Guardian Project στο Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml index a1fd49d..cc7a1ff 100644 --- a/res/values-eo/strings.xml +++ b/res/values-eo/strings.xml @@ -79,7 +79,7 @@
<string name="wizard_tips_play">Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index e18abb6..0e1ed4e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -115,7 +115,7 @@ <string name="wizard_tips_orweb">Orweb - navegador de privacidad-mejorada que funciona a través de Tor</string>
<string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index eab2c48..701c306 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Kõrgendatud privaatsusega veebisirvik mis töötab läbi Tor'i</string>
<string name="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 345cac3..25742b2 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string>
<string name="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 150bb58..cdc7271 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -107,7 +107,7 @@ <string name="wizard_tips_orweb">مرورگر پیازی: مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز ربات پیازی</string>
<string name="wizard_tips_play">تمامي برنامه هاي Guardian Project را در Google Play پيدا كنيد.</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3c40ffe..326a7d8 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Tietosuojaa parantava selain, joka toimii Torin läpi</string>
<string name="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml index 5d26704..7504f90 100644 --- a/res/values-fr-rFR/strings.xml +++ b/res/values-fr-rFR/strings.xml @@ -115,7 +115,7 @@ <string name="wizard_tips_orweb">Orweb : navigateur à confidentialité améliorée qui fonctionne avec Tor</string>
<string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 9b00404..7d8ee91 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -109,7 +109,7 @@ <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string>
<string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 5627e07..cc05944 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Navegador con privacidade mellorada que traballa a través de Tor</string>
<string name="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 8c087a5..4027c1c 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -99,7 +99,7 @@ tor-assistants@torproject.org</string> <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string> <string name="wizard_tips_orweb">Orweb- דפדפן עם פרטיות רבה שעובד דרך Tor</string> <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 6e3ddd8..168d597 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Preglednik poboljšane privatnosti koji radi kroz Tor</string>
<string name="wizard_tips_play">Pronađi sve Guardian Projekt aplikacije na Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 0f01958..2608c2b 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -104,7 +104,7 @@ <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string>
<string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-id-rID/strings.xml b/res/values-id-rID/strings.xml index 8af87c7..dfb9b1a 100644 --- a/res/values-id-rID/strings.xml +++ b/res/values-id-rID/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Peramban dengan Peningkatan-privasi yang bekerja melalui Tor</string>
<string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 20687d7..c271d63 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Næðis-bættur vafri sem virkar í gegnum Tor</string>
<string name="wizard_tips_play">Finndu öll Guardian Verkefnis smáforrit á Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index c1e2ce2..faed7b3 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb - Browser progettato per la privacy e Orbot</string>
<string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 8b48b41..cbcef8d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Torを使う匿名インターネットブラウザ</string>
<string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index a88bb09..3bf33dc 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -106,7 +106,7 @@ <string name="wizard_tips_orweb">Orweb: 토르를 통해 작동하는 보안 강화 브라우저</string>
<string name="wizard_tips_play">구글 플레이에서 모든 가디언 프로젝트 앱 찾기</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 2ba0609..39a4276 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Pārlūks ar uzlabotu privātumu un kurš strādā caur Tor tīklu</string>
<string name="wizard_tips_play">Visas Guardian Project'a lietotnes atrodamas Google Play'ā</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 5158e59..7ddf3f0 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -96,7 +96,7 @@ <string name="wizard_tips_orweb">Орвеб: Моќен анонимен прелистувач кој работи преку Тор</string>
<string name="wizard_tips_play">Најди ги сите Guardian Project апликации на Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 8e527d3..0ca0239 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -96,7 +96,7 @@ <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string> <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string> <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 0741073..669591b 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Nettleser med forsterket personvern som fungerer gjennom Tor</string>
<string name="wizard_tips_play">Finn alle Guardian Prosjekt sine applikasjoner på Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index f982fcd..473103b 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string>
<string name="wizard_tips_play">Vind alle Guardian Project apps op Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 34ee20a..ae592e2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -115,7 +115,7 @@ <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string>
<string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index e2775bf..2584648 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
<string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 790c818..71791fd 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -89,7 +89,7 @@ <string name="wizard_tips_orweb">Orweb: Privacidade melhorada que funciona via Tor</string>
<string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 373c6ae..7c6ac85 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: browser de internet cu setari avansate de intimitate care functioneaza cu Tor</string>
<string name="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 247b6cc..7b0ff00 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string>
<string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index a5b002c..5bd04e7 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -96,7 +96,7 @@ <string name="wizard_tips_title">Orbot සබල කල යොමු</string> <string name="wizard_tips_orweb">Orweb: Tor හරහා පෞද්ගලිකත්වය වැඩිකරන බ්රව්සරයකි.</string> <string name="wizard_tips_play">Google Play තුලින් Guardian Project apps තෝරාගන්න </string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index c373fcc..c4db452 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -96,7 +96,7 @@ <string name="wizard_tips_title">Апликације са омогућеним Орботом.</string> <string name="wizard_tips_orweb">Orweb: Претраживач са побољшаном приватношћу који ради кроз Тор мрежу</string> <string name="wizard_tips_play">Пронађите све Guardian Project апликације на Google Play сервису</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index a345fc0..04ea84b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor</string>
<string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 472ef93..df44568 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: rivacy-enhanced browser na gumagana sa Tor</string>
<string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 218db87..b124b44 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -103,7 +103,7 @@ <string name="wizard_tips_orweb">Orweb: Tor üzerinden çalışabilen, gizliliği artırılmış tarayıcı.</string>
<string name="wizard_tips_play">Google Play'deki tüm Guardian Projesi uygulamalarına bakın</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index b4b9d9c..79194e7 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">ORWEB (Тільки для версії Android 1.x) - браузер, розроблений для забезпечення безпеки і для Orbot</string>
<string name="wizard_tips_play">Знайти всі додатки Guardian Project на Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0883aee..2a32e18 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orweb: Trình duyệt có khả năng bảo mật cao được dùng qua mạng Tor</string>
<string name="wizard_tips_play">Hãy tìm những ứng dụng của Guardian Project trên Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index f23b133..43d1524 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -74,7 +74,7 @@
<string name="wizard_tips_play">在 Google Play 尋找所有的 Guardian Project 應用程式</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml index 1f81af9..3ac7287 100644 --- a/res/values-zh/strings.xml +++ b/res/values-zh/strings.xml @@ -107,7 +107,7 @@ <string name="wizard_tips_orweb">Orweb：使用 Tor 网络的隐私保护浏览器</string>
<string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 309345c..99c3d4e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -109,7 +109,8 @@ <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> + <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> + <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> <!--Transparent Proxy screen--> <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java index a368165..048528f 100644 --- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -3,7 +3,9 @@ package org.torproject.android.ui.wizard; import android.app.Activity; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; @@ -35,22 +37,22 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { super.onCreate(savedInstanceState);
} - + @Override protected void onStart() { - + super.onStart(); setContentView(R.layout.layout_wizard_tips); - + stepFive(); - + } - + @Override protected void onResume() { super.onResume(); - - + + }
void stepFive(){ @@ -135,45 +137,64 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } });
- btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); + PackageManager pm = getPackageManager(); + final Intent intent = new Intent(Intent.ACTION_VIEW); + // change text and icon based on which app store is installed (or not) + try { + if (isAppInstalled(pm, FDROID_PACKAGE_NAME)) { + Drawable icon = pm.getApplicationIcon(FDROID_PACKAGE_NAME); + btnLink.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); + btnLink.setText(R.string.wizard_tips_fdroid); + intent.setPackage(FDROID_PACKAGE_NAME); + intent.setData(Uri.parse(FDROID_URI)); + } else if (isAppInstalled(pm, PLAY_PACKAGE_NAME)) { + Drawable icon = pm.getApplicationIcon(PLAY_PACKAGE_NAME); + btnLink.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); + btnLink.setText(R.string.wizard_tips_play); + intent.setPackage(PLAY_PACKAGE_NAME); + intent.setData(Uri.parse(PLAY_URI)); + } + } catch (NameNotFoundException e) { + e.printStackTrace(); + btnLink.setText(R.string.wizard_tips_fdroid_org); + intent.setData(Uri.parse(FDROID_URI)); + }
btnLink.setOnClickListener(new OnClickListener() { - - public void onClick(View view) { - - String url = getString(R.string.wizard_tips_play_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+ @Override + public void onClick(View view) { + startActivity(intent); } - }); - - + }); + + // Button back = ((Button)findViewById(R.id.btnWizard1)); Button next = ((Button)findViewById(R.id.btnWizard2)); - + /* back.setOnClickListener(new View.OnClickListener() { - + public void onClick(View v) { finish(); startActivityForResult(new Intent(PromoAppsActivity.this, ChooseLocaleWizardActivity.class), 1); } });*/ - + next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { //showWizardFinal(); - + finish(); } }); - + } - - - + + + //Code to override the back button! @Override public boolean onKeyDown(int keyCode, KeyEvent event) { @@ -185,6 +206,15 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { return false; }
+ boolean isAppInstalled(PackageManager pm, String packageName) { + try { + pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); + return true; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } + Intent getInstallIntent(String packageName) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(MARKET_URI + packageName)); @@ -215,21 +245,21 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { { String title = null; String msg = null; - - + + title = context.getString(R.string.wizard_final); msg = context.getString(R.string.wizard_final_msg); - + DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { - + @Override public void onClick(DialogInterface dialog, int which) { context.startActivity(new Intent(context, Orbot.class));
} }; - - + + new AlertDialog.Builder(context) .setIcon(R.drawable.icon) .setTitle(title)