Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Added option to blacklist applications, accounts and contacts
Browse files Browse the repository at this point in the history
Closes #1781
  • Loading branch information
M66B committed Jul 5, 2014
1 parent 878f0b6 commit 1b7c94e
Show file tree
Hide file tree
Showing 50 changed files with 85 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Changelog
**Next release**

* Added option to specify file name to import/export intent ([issue](/../../issues/1784))
* Added option to blacklist applications, accounts and contacts ([issue](/../../issues/1781))
* Updated Japanese translation
* Updated Slovenian translation

Expand Down
6 changes: 6 additions & 0 deletions res/layout/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
android:layout_height="wrap_content"
android:text="@string/settings_ondemand" />

<CheckBox
android:id="@+id/cbBlacklist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_blacklist" />

<CheckBox
android:id="@+id/cbUsage"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">بيانات وهمية</string>
<string name="settings_notify">تحديث الإشعارات</string>
<string name="settings_ondemand">تقييد عند الطلب</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log"> سِجِل تصحيح الأخطاء (يتطلب إعادة التشغيل) </string>
<string name="settings_expert">وضع الخبراء</string>
<string name="settings_confidence">الحد الأقصى لجلب فترة الثقة</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Registre de depuració (cal reiniciar)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a
<string name="settings_fake_data">Falešné údaje</string>
<string name="settings_notify">Upozorňovat při aktualizacích aplikací</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Ukládat ladící záznam (vyžaduje restart)</string>
<string name="settings_expert">Režim experta</string>
<string name="settings_confidence">Maximální rozsah spolehlivosti stahování</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Updaterings notifikationer</string>
<string name="settings_ondemand">Begræns on-demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug-log (kræver genstart)</string>
<string name="settings_expert">Ekspert tilstand</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne A
<string name="settings_fake_data">Daten manipulieren</string>
<string name="settings_notify">Update-Benachrichtigungen</string>
<string name="settings_ondemand">Beschränkungen nach Aufforderung festlegen</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug-Log (erfordert Geräteneustart)</string>
<string name="settings_expert">Experten-Modus</string>
<string name="settings_confidence">Maximales Abruf-Konfidenzintervall</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ee/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega.
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Silumislogi (nõuab restarti)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi
<string name="settings_fake_data">Datos falsos</string>
<string name="settings_notify">Notificaciones de actualización</string>
<string name="settings_ondemand">Restringir en demanda</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Registro de depuración (requiere inicio)</string>
<string name="settings_expert">Modo experto</string>
<string name="settings_confidence">Intervalo de confianza para bajar restricciones</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">لاگ ایرادیابی (نیازمند دوباره راه اندازی می باشد)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Päivitä ilmoitukset</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debuggaus logi (vaatii uudelleenkäynnistyksen)</string>
<string name="settings_expert">Expert tila</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p
<string name="settings_fake_data">Fausses données</string>
<string name="settings_notify">Notifications de MàJ</string>
<string name="settings_ondemand">Restrictions sur demande</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (redémarrage requis)</string>
<string name="settings_expert">Mode expert</string>
<string name="settings_confidence">Intervalle de confiance maximum</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ga/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">logáil Debug (Éilíonn atosú)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">नकली डेटा</string>
<string name="settings_notify">अद्यतन सुचना</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (पुनरारंभ जरूरी)</string>
<string name="settings_expert">विशेषज्ञ mode</string>
<string name="settings_confidence">अधिकतम विश्वसनीय fetch अंतराल</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön
<string name="settings_fake_data">Kamu adat</string>
<string name="settings_notify">Értesítések frissítése</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (újraindítás szükséges)</string>
<string name="settings_expert">Szakértői mód</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ tuttavia non è possibile garantire che funzioni perfettamente su qualunque disp
<string name="settings_fake_data">Dati alterati</string>
<string name="settings_notify">Notifiche di aggiornamento</string>
<string name="settings_ondemand">Restringi su richiesta</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Registro errori (richiede riavvio)</string>
<string name="settings_expert">Modalità esperto</string>
<string name="settings_confidence">Intervallo massimo di confidenza nella ricezione</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">データ偽装</string>
<string name="settings_notify">アプリ更新の際に通知する</string>
<string name="settings_ondemand">制限をオンデマンドで設定する</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">デバッグログを出力する (要再起動)</string>
<string name="settings_expert">上級者モード</string>
<string name="settings_confidence">制限の設定を取得する際の信頼区間の最大値</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ku-rIQ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<string name="settings_fake_data">زانیاری هه له</string>
<string name="settings_notify">نوی کردنه وهی ئاگه داریه کان</string>
<string name="settings_ondemand">داوات لیبکریت بو سنوردار کردنیان</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">چه ند هه لبژاردنیکی مه ترسیدار که تایبه ته به که سانی شاره زا</string>
<string name="settings_confidence">زورترین راده ی دلنیابوون له زانیاریه دابه زینراوه کان</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ku-rIR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<string name="settings_fake_data">زانیاری هه له</string>
<string name="settings_notify">نوی کردنه وهی ئاگه داریه کان</string>
<string name="settings_ondemand">داوات لیبکریت بو سنوردار کردنیان</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">چه ند هه لبژاردنیکی مه ترسیدار که تایبه ته به که سانی شاره زا</string>
<string name="settings_confidence">زورترین راده ی دلنیابوون له زانیاریه دابه زینراوه کان</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietais
<string name="settings_fake_data">Netikri duomenys</string>
<string name="settings_notify">Atnaujinimų Pranešimas</string>
<string name="settings_ondemand">Riboti pagal reikalavimą</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">DEBUG žurnalas (perkrauti prietaisą)</string>
<string name="settings_expert">Eksperto režimas</string>
<string name="settings_confidence">Maks. pasitikėjimo gavimo intervalas</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ms/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap pera
<string name="settings_fake_data">Data palsu</string>
<string name="settings_notify">Pemberitahuan pengemaskinian</string>
<string name="settings_ondemand">Sekatan di atas permintaan</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Log nyahsilap (perlu mula semula)</string>
<string name="settings_expert">Mod pakar</string>
<string name="settings_confidence">Selang keyakinan pengambilan maxima</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nb-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">Forfalsket data</string>
<string name="settings_notify">Oppdater varslinger</string>
<string name="settings_ondemand">Blokkering på forespørsel</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Feilsøkingsloggfil (omstart nødvendig)</string>
<string name="settings_expert">Ekspert modus</string>
<string name="settings_confidence">Maksimalt konfidensintervall for å hente restriksjoner</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke app
<string name="settings_fake_data">Nepgegevens</string>
<string name="settings_notify">Bijgewerkt notificaties</string>
<string name="settings_ondemand">Beperken op verzoek</string>
<string name="settings_blacklist">Zwarte lijst voor accounts, applicaties en contacten</string>
<string name="settings_log">Debug log (herstart vereist)</string>
<string name="settings_expert">Expertmodus</string>
<string name="settings_confidence">Maximum betrouwbaarheidsinterval voor ophalen</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nn-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">Forfalsket data</string>
<string name="settings_notify">Oppdater varslinger</string>
<string name="settings_ondemand">Blokkering på forespørsel</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Feilsøkingsloggfil (omstart nødvendig)</string>
<string name="settings_expert">Ekspert modus</string>
<string name="settings_confidence">Maksimalt konfidensintervall for å hente restriksjoner</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-no-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<string name="settings_fake_data">Forfalsket data</string>
<string name="settings_notify">Oppdater varslinger</string>
<string name="settings_ondemand">Blokkering på forespørsel</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Feilsøkingsloggfil (omstart nødvendig)</string>
<string name="settings_expert">Ekspert modus</string>
<string name="settings_confidence">Maksimalt konfidensintervall for å hente restriksjoner</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">Fałszowanie danych</string>
<string name="settings_notify">Aktualizuj powiadomienia</string>
<string name="settings_ondemand">Ograniczanie na żądanie</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Log debugowania (wymaga restartu)</string>
<string name="settings_expert">Tryb eksperta</string>
<string name="settings_confidence">Maksymalna wartość wspołczynnika zaufania</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ porém é impossível garantir que irá funcionar sem problemas em todos os disp
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Relatório de depuração (requer reinicialização)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="settings_fake_data">Fake data</string>
<string name="settings_notify">Update notifications</string>
<string name="settings_ondemand">Restrict on demand</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Debug log (requires restart)</string>
<string name="settings_expert">Expert mode</string>
<string name="settings_confidence">Maximum fetch confidence interval</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<string name="settings_fake_data">Фальшивые данные</string>
<string name="settings_notify">Обновить уведомления</string>
<string name="settings_ondemand">Запрос разрешений</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Отладочный лог (требует перезапуска)</string>
<string name="settings_expert">Режим эксперта</string>
<string name="settings_confidence">Макс. доверительный интервал выборки</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zaria
<string name="settings_fake_data">Falošné údaje</string>
<string name="settings_notify">Oznámenia o aktualizáciách</string>
<string name="settings_ondemand">Obmedziť na požiadanie</string>
<string name="settings_blacklist">Blacklist accounts, applications and contacts</string>
<string name="settings_log">Záznam na ladenie (vyžadovaný reštart)</string>
<string name="settings_expert">Režim experta</string>
<string name="settings_confidence">Maximálny interval spoľahlivosti sťahovania</string>
Expand Down
Loading

0 comments on commit 1b7c94e

Please sign in to comment.