From 6ebae5d66f99d2980a0db159e261eef4f8adcbb2 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 17 Aug 2014 08:48:02 +0200 Subject: [PATCH] Display if update service is busy in reboot layout Fixes #1887 --- CHANGELOG.md | 2 ++ res/layout/reboot.xml | 16 +++++++++--- res/values-ar/strings.xml | 1 + res/values-bg/strings.xml | 1 + res/values-ca/strings.xml | 1 + res/values-cs/strings.xml | 1 + res/values-da/strings.xml | 1 + res/values-de/strings.xml | 1 + res/values-ee/strings.xml | 1 + res/values-el/strings.xml | 1 + res/values-es/strings.xml | 1 + res/values-fa/strings.xml | 1 + res/values-fi/strings.xml | 1 + res/values-fr/strings.xml | 1 + res/values-ga/strings.xml | 1 + res/values-he/strings.xml | 1 + res/values-hi/strings.xml | 1 + res/values-hr/strings.xml | 1 + res/values-hu/strings.xml | 1 + res/values-it/strings.xml | 1 + res/values-iw/strings.xml | 1 + res/values-ja/strings.xml | 1 + res/values-ku-rIQ/strings.xml | 1 + res/values-ku-rIR/strings.xml | 1 + res/values-lt/strings.xml | 1 + res/values-ms/strings.xml | 1 + res/values-nb-rNO/strings.xml | 1 + res/values-nl/strings.xml | 3 ++- res/values-nn-rNO/strings.xml | 1 + res/values-no-rNO/strings.xml | 1 + res/values-pl/strings.xml | 1 + res/values-pt/strings.xml | 1 + res/values-ro/strings.xml | 1 + res/values-ru/strings.xml | 1 + res/values-sk/strings.xml | 1 + res/values-sl/strings.xml | 1 + res/values-sr/strings.xml | 1 + res/values-sv/strings.xml | 1 + res/values-tl-rPH/strings.xml | 1 + res/values-tr/strings.xml | 1 + res/values-ua/strings.xml | 1 + res/values-vi/strings.xml | 1 + res/values-zh-rCN/strings.xml | 1 + res/values-zh-rTW/strings.xml | 1 + res/values/strings.xml | 1 + src/biz/bokhorst/xprivacy/ActivityApp.java | 2 +- src/biz/bokhorst/xprivacy/ActivityBase.java | 26 ++++++++++++++------ src/biz/bokhorst/xprivacy/ActivityMain.java | 2 +- src/biz/bokhorst/xprivacy/ActivityShare.java | 2 +- src/biz/bokhorst/xprivacy/ActivityUsage.java | 2 +- tools/addstring.sh | 6 ++--- 51 files changed, 84 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05b4268c5..2a6aaa07b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,8 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www **Next release** * Flush will clear the asked once cache too +* Display if update service is busy in reboot layout ([issue](/../../issues/1887)) +* Updated Dutch translation * Updated French translation * Updated Slovenian translation diff --git a/res/layout/reboot.xml b/res/layout/reboot.xml index 385a29266..e8c069f67 100644 --- a/res/layout/reboot.xml +++ b/res/layout/reboot.xml @@ -56,8 +56,7 @@ android:text="@string/msg_service_missing" android:textAppearance="?android:attr/textAppearance" android:textStyle="italic" - android:visibility="gone" - tools:ignore="HardcodedText" /> + android:visibility="gone" /> + android:visibility="gone" /> + + \ No newline at end of file diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 874bbd0a3..54dab0c73 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -75,6 +75,7 @@ تم التقييد بواسطة XPrivacy لم يتم العثور على خدمة الخصوصية; هل قمت بتمكين XPrivacy في مثبت إكسبوسيد وقمت بإعادة تشغيل جهازك ؟ Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed بُذلت عناية كبيرة لتطوير وإختبار XPrivacy, ومع ذلك فإنه من المستحيل ضمان أنه سيعمل خالياً من العيوب على كل جهاز ولكل تطبيق. \n\nالإستخدام على مسئوليتك الخاصة.\n\nراجع أيضاً الترخيص: diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 1d64e1192..85ee87604 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed XPrivacy е разработен и тестван с голямо внимание, но е невъзможно да се гарантира безпроблемна работа на всякакви устройства при всякакви приложения. \n\nИзползвате го на свой собствен риск.\n\nВижте и лиценза: diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index fd9088ab7..71d426552 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed S\'ha tingut molta cura desenvolupant i provant XPrivacy, però és impossible garantir que funcionarà perfectament a tots els dispositius i per a totes les aplicacions.\n\nUtilitzeu-lo sota el vostre propi risc.\n\nVegeu també la llicència: Comptes (Google, Facebook, etc.) Navegador (marcadors/historial) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 35f8e01eb..20f9c4f5c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Vývoj a testování aplikace XPrivacy probíhaly s maximální možnou péčí, nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a se všemi aplikacemi. \n\nPoužívejte pouze na vlastní riziko.\n\nLicence aplikace: diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index dbb6c5840..20fc023a5 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -75,6 +75,7 @@ Begrænset af XPrivacy Privatheds service blev ikke fundet; har du slået XPrivacy til i Xposed installeren og genstartet din enhed? Privatheds service versionen matcher ikke; har du genstartet din enhed efter opgradering af XPrivacy? + Please wait until the update service has been completed XPrivacy er grundigt udviklet og testet, dog er det umuligt at garantere, at appen fungerer fejlfrit på alle enheder og for alle apps.\n\nBrug af denne app foregår udelukkende på egen risiko.\n\nSe også licensen: Konti (Google, Facebook, osv.) Browser (bogmærker/historik) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 6a783d298..4f4fcb108 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -75,6 +75,7 @@ Durch XPrivacy beschränkt Privacy Service nicht gefunden. Haben Sie XPrivacy im Xposed Installer aktiviert und Ihr Gerät neu gestartet? Privacy Service Versionsunterschied festgestellt. Haben Sie nach dem Upgrade von XPrivacy Ihr Gerät neu gestartet? + Please wait until the update service has been completed XPrivacy wurde mit größter Sorgfalt entwickelt und getestet.\nDennoch kann nicht gewährleistet werden, dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne App funktioniert. \n\nSie verwenden XPrivacy ausschließlich auf eigenes Risiko!\n\nBitte beachten Sie auch die Lizenz: diff --git a/res/values-ee/strings.xml b/res/values-ee/strings.xml index b5c69f740..9395e3b2b 100644 --- a/res/values-ee/strings.xml +++ b/res/values-ee/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Palju vaeva on nähtud Xprivacy arendamisel ja testimisel, kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega. \n\nKasuta ainult omal vastutusel.\n\nSee also the license: diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 4893202f6..6beedd291 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Μεγάλη προσοχή έχει ληφθεί για την ανάπτυξη και δοκιμή του XPrivacy, ωστόσο, είναι αδύνατο να εγγυηθεί ότι θα λειτουργήσει άψογα σε κάθε συσκευή και για κάθε εφαρμογή. \n\nΗ χρήση γίνεται αποκλειστικά με δική σας ευθύνη.\n\nΔείτε επίσης την άδεια: diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 809e843e5..a1a8d94f5 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -75,6 +75,7 @@ Restringido por XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Se ha puesto mucho cuidado en el desarrollo y pruebas de XPrivacy, sin embargo no puedo garantizar que funcione sin ningún fallo para cada dispositivo y aplicación. \n\nÚselo bajo su responsabilidad.\n\nVéase también el permiso: diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 4bf314eba..753399d97 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -77,6 +77,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed نرم افزار ایکس پرایوسی با دقت بالایی تولید و تست شده است، با این وجود تضمینی برای عملکرد صحیح این نرم افزار بر روی تمامی دستگاه ها و در مورد تمامی نرم افزارها وجود ندارد. \n\n ریسک استفاده از این نرم افزار بر عهده ی شما می باشد\n\n:همچنین پروانه ی برنامه را مشاهده کنید diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 101dcf2b3..bdaac6f92 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Xprivacy on tehty ja testattu huolellisesti, mutta on kuitenkin mahdotonta antaa takeita että se toimii virheettömästi kaikissa laitteissa ja jokaisessa applikaatiossa. \n\nKäyttö on täysin omalla vastuullasi.\n\nKatso myös lisenssi: Tilit (Google, Facebook, jne) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 336dcd6df..2cfb72f08 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -75,6 +75,7 @@ Restreint par XPrivacy Service Privacy non trouvé : avez-vous activé XPrivacy dans l\'installateur Xposed et redémarré votre appareil ? Décalage de la version du service Privacy : avez-vous redémarré votre appareil après la mise à niveau de XPrivacy ? + Please wait until the update service has been completed Un grand soin est apporté au développement et aux tests de XPrivacy. Toutefois, il est impossible de garantir un fonctionnement parfait sur chaque appareil et pour chaque application. \nSon utilisation est à vos risques et périls !\n\nVeuillez prendre connaissance de la licence : diff --git a/res/values-ga/strings.xml b/res/values-ga/strings.xml index 86828a369..571207b24 100644 --- a/res/values-ga/strings.xml +++ b/res/values-ga/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed cúram mór aire do a fhorbairt agus a thástáil XPrivacy, áfach, go bhfuil sé dodhéanta a ráthú go mbeidh sé obair flawless ar gach gléas agus do gach agus gach iarratas. \n\nBain úsáid as ar do phriacal féin.\n\nFéach freisin an ceadúnas: diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index c6d1e4f99..562718424 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 60e790370..f900e2939 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed XPrivacy बनाने मैं बहुत ख्याल रखा गया है, किन्तु वह सभी साधन और सभी application के लिए बरोबर चलेगा उसकी गारंटी देना असंभव है। \n\nइसका उपयोग पूरी तरह से आपके अपने जोखिम पर है।\n\nलाइसेंस को भी पढ़े: diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 62d23b624..a08030ee4 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -75,6 +75,7 @@ Ograničeno od strane Xprivacy-a Xprivacy usluga nije pronađena; jeste li uključili XPrivacy modul u Xposed Installer-u i ponovno pokrenuli svoj uređaj? Verzija XPrivacy usluge ne odgovara; jeste li ponovno pokrenuli svoj uređaj nakon nadogradnje Xprivacy-a? + Please wait until the update service has been completed Unatoč velikoj pažnji koja je bila potrebna da bi se razvio i testirao Xprivacy, nemoguće je garantirati da će raditi savršeno na svakom uređaju i/ili za svaku aplikaciju. \n\nKoristiti isključivo na vlastitu odgovornost.\n\nTakođer pogledati licencu: Korisnički računi diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 5c0bf39f3..f9d8a7204 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Az XPrivacy fejlesztése és tesztelése nagy gondossággal történik, de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön és az összes alkalmazással. \n\nCsak saját felelősségre.\n\nNézze meg a licenszet is: diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 1611f519b..ca08783ac 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -75,6 +75,7 @@ Ristretto da XPrivacy Servizio Privacy non trovato; hai attivato XPrivacy nell\'installatore di Xposed e riavviato il dispositivo? Servizio Privacy conflitto di versione; hai riavviato il dispositivo dopo l\'aggiornamento di XPrivacy? + Please wait until the update service has been completed Grande cura è stata posta nello sviluppo e verifica di XPrivacy, tuttavia non è possibile garantire che funzioni perfettamente su qualunque dispositivo e per qualsiasi applicazione. \n\nL\'utilizzo è interamente a tuo rischio.\n\nVedi anche la licenza: diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3c45678c0..b829a3302 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9b1ee1d0d..3defb967c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -75,6 +75,7 @@ XPrivacy により制限されました Privacy service が見つかりません。XPrivacy を Xposed インストーラーで有効にして端末を再起動しましたか? Privacy service のバージョンが違います。XPrivacy を更新した後で端末を再起動しましたか? + Please wait until the update service has been completed XPrivacy の開発およびテストには細心の注意を払いましたが、 すべての端末のあらゆるアプリで完璧な動作を保証することは不可能です。 \n\n完全に自己責任のうえでご利用ください。\n\nライセンスについて : diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml index ceed741f4..0d73459a1 100644 --- a/res/values-ku-rIQ/strings.xml +++ b/res/values-ku-rIQ/strings.xml @@ -75,6 +75,7 @@ له لایه ن اکسپراوسی یه وه ری لی گیرا Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed هه ول و ماندو بوونیکی زور دراوه بو دروستکردن و تاقیکردنه وه ی ئه م به رنامه يه به لام له گه ل ئه وه شدا ناتوانين دلنياتان بكه ين له وه ىكه ئه م به رنامه يه بى هه له يه و له سه ر هه موو موبايليك ياخود بو هه ر به رنامه يه ك كار ده كات. \n\nته نيا خوت به رپرسیاریت له به کارهینانی ئه م به رنامه يه.\n\nهه روه ها سه يريكى موله تى ريپیدان بکه: حیسابه کان (گوگل, فه یسبوک, هتد) diff --git a/res/values-ku-rIR/strings.xml b/res/values-ku-rIR/strings.xml index ceed741f4..0d73459a1 100644 --- a/res/values-ku-rIR/strings.xml +++ b/res/values-ku-rIR/strings.xml @@ -75,6 +75,7 @@ له لایه ن اکسپراوسی یه وه ری لی گیرا Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed هه ول و ماندو بوونیکی زور دراوه بو دروستکردن و تاقیکردنه وه ی ئه م به رنامه يه به لام له گه ل ئه وه شدا ناتوانين دلنياتان بكه ين له وه ىكه ئه م به رنامه يه بى هه له يه و له سه ر هه موو موبايليك ياخود بو هه ر به رنامه يه ك كار ده كات. \n\nته نيا خوت به رپرسیاریت له به کارهینانی ئه م به رنامه يه.\n\nهه روه ها سه يريكى موله تى ريپیدان بکه: حیسابه کان (گوگل, فه یسبوک, هتد) diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 1cbf7bcc6..b623dd0d5 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -75,6 +75,7 @@ Ribojama su XPrivacy Privacy procesas nerastas; ar aktyvavote XPrivacy sistemoje Xposed ir perkrovėte prietaisą? Privacy procesas veikia netinkamai; perkrovėte prietaisą po XPrivacy atnaujinimo? + Please wait until the update service has been completed Puiku, kad sutikote išbandyti XPrivacy. Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietaisu. \n\nTodėl naudokite visiškai savo pačių rizika.\n\nTaip pat žiūrėkite licenciją: diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 7b4e669af..0788057a2 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -75,6 +75,7 @@ Disekatkan oleh XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Penjagaan rapi telah diambil untuk membangunkan dan menguji XPrivacy, namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap peranti dan untuk semua applikasi. \n\nPenggunaan adalah sepenuhnya di atas risiko sendiri.\n\nLihat juga lesen: diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index 5e3153252..5e2180063 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -75,6 +75,7 @@ Blokkert av XPrivacy Personvernservice fantes ikke; har du aktivert XPrivacy i Xposed appen og omstartet enheten din? Personvernservice uoverensstemmelse; har du omstartet enheten din etter oppdatering av XPrivacy? + Please wait until the update service has been completed XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index f6bc3a05c..50650b361 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -67,7 +67,7 @@ Registreer a.u.b. uw apparaat Vul a.u.b. uw e-mail adres in: Controleer uw e-mail om uw apparaat te activeren - Bijwerkdienst actief + Bijwerken Migratie %1$s Willekeurig %1$s Bijwerken %1$s @@ -75,6 +75,7 @@ Beperkt door XPrivacy Privacy service niet gevonden; heeft u XPrivacy aangezet in de Xposed installer en uw apparaat opnieuw gestart? Privacy service versie verkeerd; heeft u uw apparaat opnieuw gestart na het bijwerken van XPrivacy? + Wacht a.u.b. tot het bijwerken voltooid is XPrivacy is zorgvuldig ontwikkeld en getest, maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke applicatie foutloos werkt. \n\nGebruik is geheel op eigen risico.\n\nZie ook de licentie: diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index 5e3153252..5e2180063 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -75,6 +75,7 @@ Blokkert av XPrivacy Personvernservice fantes ikke; har du aktivert XPrivacy i Xposed appen og omstartet enheten din? Personvernservice uoverensstemmelse; har du omstartet enheten din etter oppdatering av XPrivacy? + Please wait until the update service has been completed XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-no-rNO/strings.xml b/res/values-no-rNO/strings.xml index 5e3153252..5e2180063 100644 --- a/res/values-no-rNO/strings.xml +++ b/res/values-no-rNO/strings.xml @@ -75,6 +75,7 @@ Blokkert av XPrivacy Personvernservice fantes ikke; har du aktivert XPrivacy i Xposed appen og omstartet enheten din? Personvernservice uoverensstemmelse; har du omstartet enheten din etter oppdatering av XPrivacy? + Please wait until the update service has been completed XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 07f6e6696..e621e2cdd 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -75,6 +75,7 @@ Ograniczone przez XPrivacy Usługa prywatności nie została znaleziona; czy włączyłeś XPrivacy w instalatorze Xposed oraz uruchomiłeś ponownie urządzenie? Inna wersja usługi prywatności; czy uruchomiłeś ponownie urządzenie po aktualizacji XPrivacy? + Please wait until the update service has been completed Dołożyliśmy wszelkich starań podczas programowania i testów XPrivacy. Jednak nie możemy zagwarantować, że będzie on działać bezbłędnie na każdym urządzeniu oraz z każdą aplikacją. \n\nUżywasz go całkowicie na własne ryzyko.\n\nZobacz też licencję: diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d8b992768..e4ad01b55 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed A aplicação XPrivacy foi desenvolvida e testada com todo o cuidado, porém é impossível garantir que irá funcionar sem problemas em todos os dispositivos e com todas as aplicações. \n\nO uso desta aplicação é inteiramente por sua conta e risco.\n\nVer também a licença: diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 6661c3181..9475e8a12 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index a05eec52f..1ac54af5a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -75,6 +75,7 @@ Запрещено XPrivacy Сервис Privacy не найден; Вы включили XPrivacy в Xposed и перезагрузили своё устройство? Версия сервиса Privacy не совпадает; Вы перезагрузили своё устройство после обновления XPrivacy? + Please wait until the update service has been completed Большое внимание было уделено разработке и тестированию XPrivacy, однако нельзя гарантировать, что оно будет работать безупречно на всех устройствах и со всеми приложениями. \n\nИспользуйте исключительно на свой страх и риск.\n\nСм. также лицензию: diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 605628592..434562cc7 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -75,6 +75,7 @@ Obmedzené pomocou XPrivacy Nenájdená služba súkromia; povolili ste XPrivacy v Xposed Inštalátori a vykonali reštart vášho zariadenia? Verzia služby súkromia sa nezhoduje; vykonali ste reštart vášho zariadenia po aktualizovaní XPrivacy? + Please wait until the update service has been completed Veľká starostlivosť bola venovaná vývoju a testovaniu XPrivacy, avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zariadení a na každú aplikáciu. \n\nPoužitie je plne na vlastné riziko.\n\nPozrite tiež licenciu: diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d6f77f6a5..7bbd6a9b3 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -75,6 +75,7 @@ Omejeno z XPrivacy Storitev za zasebnost ni bila najdena; ste omogočili XPrivacy v programu Xposed installer in ponovno zagnali Vašo napravo? Različica storitve za zasebnost se ne ujema; ste zagnali ponovno Vašo napravo po nadgradnji programa XPrivacy? + Please wait until the update service has been completed V razvoj in preizkušanje programa XPrivacy je bilo vloženo veliko truda, vendar pa je nemogoče zagotoviti brezhibno delovanje na vsaki napravi in za vsak program.\n\nUporaba programa je na lastno odgovornost\n\nPreberite si tudi licenco: diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index e88aa51cf..bacb3f220 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index a74620305..e4b16990d 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed XPrivacy utvecklas och testas med stor omsorg. Det är emellertid omöjligt att garantera att appen fungerar på alla enheter och appar. \n\nAnvänding sker helt på egen risk.\n\nSe också licensen: diff --git a/res/values-tl-rPH/strings.xml b/res/values-tl-rPH/strings.xml index 0f68dcc0d..1fabe65e0 100644 --- a/res/values-tl-rPH/strings.xml +++ b/res/values-tl-rPH/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Malaking pag-aalaga ang ginampanan sa pagkabuo at sa pagsusuri ng XPrivacy, ngunit sadyang walang garantisado na gagana siya na walang kamali-mali sa lahat ng mga kagamitan o bawat sa isa\'t isang aplikasyon. \n\nAng paggamit nito ay ganap na nasa sa iyong pagbabakasakali.\n\nAlamin din ang kanyang lisensiya at sangguni dito sa: diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 70482da82..cc373905c 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Xprivacy titizlikle geliştirilmiş ve test edilmiştir, ancak her cihazda veya her uygulamada kusursuz çalışacağını garantilemek imkansızdır. \n\nKullanım riski tamamen size aittir.\n\nAyrıca lisansa bakınız: Hesaplar (Google, Facebook, vb) diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml index 2531ee5f3..8207ca97b 100644 --- a/res/values-ua/strings.xml +++ b/res/values-ua/strings.xml @@ -75,6 +75,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed Велика увага була приділена розробці та тестуванню XPrivacy, але не можна гарантувати, що вона буде працювати бездоганно на всіх пристроях та зі всімома програмами. \n\nВикористовуйте виключно на свій страх та ризик.\n\nДив. також ліцензію: diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 423c66bd7..cd03ad021 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -75,6 +75,7 @@ Đã hạn chế bởi XPrivacy Không tìm thấy dịch vụ bảo mật; bạn đã kích hoạt XPrivacy trong trình cài đặt Xposed và khởi động lại thiết bị? Phiên bản của dịch vụ bảo mật không trùng khớp; bạn đã khởi động lại thiết bị sau khi cập nhật XPrivacy? + Please wait until the update service has been completed XPrivacy đã được lập trình và kiểm tra một cách cẩn trọng nhất, tuy nhiên, không thể đảm bảo chắc chắn XPrivacy sẽ hoạt động trơn tru trên mọi thiết bị cũng như với mọi ứng dụng. \n\nBạn tự chịu trách nhiệm khi sử dụng ứng dụng này.\n\nXem thêm về bản quyền: Các tài khoản (Google, Facebook, ...) diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 9f4efb475..a57828f43 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -75,6 +75,7 @@ 由 XPrivacy 限制 没有找到Privacy服务，您是否在Xposed Installer中启用XPrivacy并重启设备？ Privacy服务版本不对，您是否在升级XPrivacy后忘了重启？ + Please wait until the update service has been completed XPrivacy 的开发和测试工作已经非常全面和细致, 但仍然不可能保证它能完美兼容所有设备及应用。 \n\n使用者需自行承担风险。\n\n另请参阅使用许可: diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0d0b88035..053d37a0c 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -75,6 +75,7 @@ 已被 XPrivacy 限制權限 找不到 XPrivacy 服務。請確認已經在 Xposed installer 中啟用 XPrivacy 模組，並且重新開機。 XPrivacy 服務版本不符。請確認在更新 XPrivacy 後有重新開機。 + Please wait until the update service has been completed 儘管 XPrivacy 在開發過程中經過詳細測試，但仍無法保證可以在所有裝置/安卓版本/各app上正常使用 \n\n請自行承擔使用XPrivacy的可能風險。 \n\n請參閱說明文件： diff --git a/res/values/strings.xml b/res/values/strings.xml index 0f29187b6..5ca63a37a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -80,6 +80,7 @@ Restricted by XPrivacy Privacy service not found; did you enable XPrivacy in the Xposed installer and reboot your device? Privacy service version mismatch; did you reboot your device after upgrading XPrivacy? + Please wait until the update service has been completed \? Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawlessly on each and every device and for each and every application. diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java index 577b4dfc8..ef23986b1 100644 --- a/src/biz/bokhorst/xprivacy/ActivityApp.java +++ b/src/biz/bokhorst/xprivacy/ActivityApp.java @@ -124,7 +124,7 @@ public void onCreate(Bundle savedInstanceState) { final int userId = Util.getUserId(Process.myUid()); // Check privacy service client - if (!PrivacyService.checkClient()) + if (!PrivacyService.checkClient() || isUpdating()) return; // Set layout diff --git a/src/biz/bokhorst/xprivacy/ActivityBase.java b/src/biz/bokhorst/xprivacy/ActivityBase.java index abc6eb813..7451a14be 100644 --- a/src/biz/bokhorst/xprivacy/ActivityBase.java +++ b/src/biz/bokhorst/xprivacy/ActivityBase.java @@ -2,6 +2,8 @@ import android.annotation.SuppressLint; import android.app.Activity; +import android.app.ActivityManager; +import android.app.ActivityManager.RunningServiceInfo; import android.content.pm.PackageInfo; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -25,14 +27,16 @@ public class ActivityBase extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (PrivacyService.checkClient()) { + // Check if update service running + boolean updating = isUpdating(); + if (PrivacyService.checkClient() && !updating) { // Set theme int userId = Util.getUserId(Process.myUid()); String themeName = PrivacyManager.getSetting(userId, PrivacyManager.cSettingTheme, ""); mThemeId = (themeName.equals("Dark") ? R.style.CustomTheme : R.style.CustomTheme_Light); setTheme(mThemeId); } else { - // Privacy client now available + // Privacy client not available setContentView(R.layout.reboot); try { @@ -44,18 +48,26 @@ protected void onCreate(Bundle savedInstanceState) { } // Show reason - if (PrivacyService.getClient() == null) { - TextView tvRebootClient = (TextView) findViewById(R.id.tvRebootClient); - tvRebootClient.setVisibility(View.VISIBLE); + if (updating) + ((TextView) findViewById(R.id.tvServiceUpdating)).setVisibility(View.VISIBLE); + else if (PrivacyService.getClient() == null) { + ((TextView) findViewById(R.id.tvRebootClient)).setVisibility(View.VISIBLE); Requirements.checkCompatibility(this); } else { - TextView tvRebootClient = (TextView) findViewById(R.id.tvRebootVersion); - tvRebootClient.setVisibility(View.VISIBLE); + ((TextView) findViewById(R.id.tvRebootVersion)).setVisibility(View.VISIBLE); Requirements.check(this); } } } + protected boolean isUpdating() { + ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE); + for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) + if (UpdateService.class.getName().equals(service.service.getClassName())) + return true; + return false; + } + protected Bitmap getOffCheckBox() { if (mCheck == null) buildCheckBoxes(); diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java index 4b244509e..017d076d2 100644 --- a/src/biz/bokhorst/xprivacy/ActivityMain.java +++ b/src/biz/bokhorst/xprivacy/ActivityMain.java @@ -165,7 +165,7 @@ protected void onCreate(Bundle savedInstanceState) { final int userId = Util.getUserId(Process.myUid()); // Check privacy service client - if (!PrivacyService.checkClient()) + if (!PrivacyService.checkClient() || isUpdating()) return; // Import license file diff --git a/src/biz/bokhorst/xprivacy/ActivityShare.java b/src/biz/bokhorst/xprivacy/ActivityShare.java index 80bcdc6ad..e76e33b2c 100644 --- a/src/biz/bokhorst/xprivacy/ActivityShare.java +++ b/src/biz/bokhorst/xprivacy/ActivityShare.java @@ -147,7 +147,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Check privacy service client - if (!PrivacyService.checkClient()) + if (!PrivacyService.checkClient() || isUpdating()) return; // Get data diff --git a/src/biz/bokhorst/xprivacy/ActivityUsage.java b/src/biz/bokhorst/xprivacy/ActivityUsage.java index 23fe9d47f..e9dc5a05e 100644 --- a/src/biz/bokhorst/xprivacy/ActivityUsage.java +++ b/src/biz/bokhorst/xprivacy/ActivityUsage.java @@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Check privacy service client - if (!PrivacyService.checkClient()) + if (!PrivacyService.checkClient() || isUpdating()) return; // Set layout diff --git a/tools/addstring.sh b/tools/addstring.sh index 7042abc13..2ab6a4db6 100755 --- a/tools/addstring.sh +++ b/tools/addstring.sh @@ -1,8 +1,8 @@ #!/bin/bash -grep -RIl "\Once for' +grep -RIl "\Please wait until the update service has been completed' #grep -RIl "\