diff --git a/res/layout/ondemand.xml b/res/layout/ondemand.xml index 54c216b26..8fcf45571 100644 --- a/res/layout/ondemand.xml +++ b/res/layout/ondemand.xml @@ -206,15 +206,6 @@ android:visibility="gone" /> - - - مدخلات: تطبيق على الفئة بأكملها لمرة واحدة فقط - While visible القائمة البيضاء \'%s\' تمكين منع diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 409960dba..06e2564a2 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index e6027abb0..4f5c1bf0d 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -161,7 +161,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 4b2408d75..10fa13c17 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -163,7 +163,6 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml index 145f92e23..59b669589 100644 --- a/res/values-cy-rGB/strings.xml +++ b/res/values-cy-rGB/strings.xml @@ -163,7 +163,6 @@ sin embargo, es imposible garantizar que funcionará sin problemas en todas y ca paramedrau: Gwneud cais i gategori cyfan unwaith ar gyfer - While visible Gwyn/rhestr ddu ‘%1$s’ caniatáu gwrthod diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3423c1460..5dfb41e77 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -161,7 +161,6 @@ Parametre: Anvend for hele kategorien Once for - While visible White liste \'%s\' Tillad Afvis diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index b0affec91..8d51bd3d2 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -163,7 +163,6 @@ dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne A Parameter: Auf die gesamte Kategorie anwenden Nur einmalig für - While visible Positivliste \'%1$s\' Zulassen Blockieren diff --git a/res/values-ee/strings.xml b/res/values-ee/strings.xml index f33741a48..213a5b7b2 100644 --- a/res/values-ee/strings.xml +++ b/res/values-ee/strings.xml @@ -163,7 +163,6 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega. Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 69b564873..435d5daa2 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 17cf4e86a..db09f1d18 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -163,7 +163,6 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi Parámetros: Aplicar a toda la categoría Una vez para - While visible Lista blanca/negra \'%s\' Permitir Denegar diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index fa0b12c52..b4c7b9cfe 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -165,7 +165,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index fb05a3252..b45f1a5d0 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -162,7 +162,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 8eb845456..e5432bff3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -163,7 +163,6 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p Paramètres : Appliquer à toute la catégorie Une fois pendant - While visible Se souvenir de ‘%1$s’ Autoriser Bloquer diff --git a/res/values-ga/strings.xml b/res/values-ga/strings.xml index 714cc3e70..3f24b79fd 100644 --- a/res/values-ga/strings.xml +++ b/res/values-ga/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 203db9d75..8c07492c8 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -163,7 +163,6 @@ however it is impossible to guarantee it will work flawless on each and every de Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index c77dc432e..2da59ead7 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 90ad62336..9aaa70d64 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -162,7 +162,6 @@ Parametri: Primijeni na cijelu kategoriju Once for - While visible Dodaj na listu dopuštenih/ograničenih ‘%1$s’ Dopusti Zabrani diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 112e7468a..0ea9e6b31 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -163,7 +163,6 @@ de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 162b55d2c..cd368527a 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -163,7 +163,6 @@ Namun mustahil untuk menjamin akan berjalan lancar pada setiap perangkat dan unt Parameter: Terapkan ke seluruh kategori Sekali untuk - While visible Daftar hitam/putih ‘%1$s’ Ijinkan Tolak diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 78ebf4b4e..a4d1c4d8a 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -163,7 +163,6 @@ tuttavia non è possibile garantire che funzioni perfettamente su qualunque disp Parametri: Applica a intera categoria Una volta per - While visible White/blacklist \'%s\' Consenti Rifiuta diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 08353621d..eed2a9574 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -163,7 +163,6 @@ however it is impossible to guarantee it will work flawless on each and every de Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 234ea8af6..636ac5a16 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -163,7 +163,6 @@ パラメーター : カテゴリ全体に設定する 今回のみ設定する - While visible ホワイト/ブラックリスト ‘%1$s’ 許可 拒否 diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index dabf5f23f..4511ecc9b 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -163,7 +163,6 @@ 매개변수: 모두 적용 한번만 적용 - While visible 화이트/블랙리스트 ‘%1$s’ 허용 차단 diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml index 05b38cedb..462d5a51a 100644 --- a/res/values-ku-rIQ/strings.xml +++ b/res/values-ku-rIQ/strings.xml @@ -162,7 +162,6 @@ Parameters: بو هه موو به شه که Once for - While visible White/blacklist \'%s\' ریگه دان ریگه نه دان diff --git a/res/values-ku-rIR/strings.xml b/res/values-ku-rIR/strings.xml index 05b38cedb..462d5a51a 100644 --- a/res/values-ku-rIR/strings.xml +++ b/res/values-ku-rIR/strings.xml @@ -162,7 +162,6 @@ Parameters: بو هه موو به شه که Once for - While visible White/blacklist \'%s\' ریگه دان ریگه نه دان diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 76dad6170..790245074 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -163,7 +163,6 @@ Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietais Parameterai: Taikyti visą kategoriją Kartą - While visible Baltasis sąrašas \'%s\' Leisti Drausti diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 316194bd2..f5dbaa6f5 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -163,7 +163,6 @@ namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap pera Parameter: Laksanakan ke seluruh kategori Sekali untuk - While visible Senarai hitam/putih \'%s\' Benarkan Tidak dibenarkan diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index 1cee49e1c..3a8521c45 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -161,7 +161,6 @@ Parametere: Bruk for hele kategorien En gang for - While visible Positivliste \'%s\' Tillat Nekt diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 8fbed0f8a..9fb4689e1 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -163,7 +163,6 @@ maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke app Parameters: Pas toe op gehele categorie Eén keer voor - Zolang zichtbaar Negeerlijst ‘%1$s’ Toestaan Blokkeren diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index 1cee49e1c..3a8521c45 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -161,7 +161,6 @@ Parametere: Bruk for hele kategorien En gang for - While visible Positivliste \'%s\' Tillat Nekt diff --git a/res/values-no-rNO/strings.xml b/res/values-no-rNO/strings.xml index 1cee49e1c..3a8521c45 100644 --- a/res/values-no-rNO/strings.xml +++ b/res/values-no-rNO/strings.xml @@ -161,7 +161,6 @@ Parametere: Bruk for hele kategorien En gang for - While visible Positivliste \'%s\' Tillat Nekt diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 84d22ba18..4448f02f4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -163,7 +163,6 @@ Parametry: Zastosuj do całej kategorii Jednorazowo dla - While visible Biała lista \'%s\' Pozwól Zabroń diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 398d0269b..b791a5dd3 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -163,7 +163,6 @@ porém é impossível garantir que irá funcionar sem problemas em todos os disp Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index b60a44702..144906aaf 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -163,7 +163,6 @@ however it is impossible to guarantee it will work flawless on each and every de Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 60999b6e3..a742cad06 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -163,7 +163,6 @@ Параметры: Применить ко всей категории Один раз - While visible Белый список ‘%1$s’ Разрешить Запретить diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 034a5b410..307b199fa 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -163,7 +163,6 @@ avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zaria Parametre: Použiť na celú kategóriu Raz za - While visible Biela/čierna listina \'%1$s\' Povoliť Odmietnuť diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 4c44a672f..d66d210ad 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -163,7 +163,6 @@ Parametri: Uveljavi za celotno kategorijo Enkrat za - While visible Dodaj \'%1$s\' na belo listo Dovoli Zavrni diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 23195faad..d6f46d8f1 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -163,7 +163,6 @@ however it is impossible to guarantee it will work flawless on each and every de Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 8fca476dc..45d05f974 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -163,7 +163,6 @@ Det är emellertid omöjligt att garantera att appen fungerar på alla enheter o Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-tl-rPH/strings.xml b/res/values-tl-rPH/strings.xml index b90d7476e..146e75690 100644 --- a/res/values-tl-rPH/strings.xml +++ b/res/values-tl-rPH/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 032b16d63..4b88c3e80 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -162,7 +162,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml index 7ac6cbc4a..19053223a 100644 --- a/res/values-ua/strings.xml +++ b/res/values-ua/strings.xml @@ -163,7 +163,6 @@ Parameters: Apply to entire category Once for - While visible White/blacklist \'%s\' Allow Deny diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 8e0d94636..e2b704823 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -162,7 +162,6 @@ Các thông số: Áp dụng cho toàn bộ danh mục Một lần cho - While visible Danh sách cho phép \'%s\' Cho phép Từ chối diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 33a59b7d0..4642465b9 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -163,7 +163,6 @@ 参数: 应用到整个权限类别 Once for - While visible 白名单/黑名单‘%1$s’ 允许 拒绝 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0bc0b49b3..1921f83d1 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -163,7 +163,6 @@ 參數： 套用至整個限制分類 再次詢問： - While visible 白名單 \'%s\' 允許 封鎖 diff --git a/res/values/strings.xml b/res/values/strings.xml index 3cdc9a363..66bbb7cf6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -171,7 +171,6 @@ however it is impossible to guarantee it will work flawlessly on each and every Parameters: Apply to entire category Once for - While visible White/blacklist ‘%1$s’ Allow Deny diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java index 41963bf25..c0d114ea1 100644 --- a/src/biz/bokhorst/xprivacy/PrivacyManager.java +++ b/src/biz/bokhorst/xprivacy/PrivacyManager.java @@ -148,7 +148,6 @@ public class PrivacyManager { public final static String cSettingODCategory = "ODCategory"; public final static String cSettingODOnce = "ODOnce"; public final static String cSettingODOnceDuration = "ODOnceDuration"; - public final static String cSettingODWhileVisible = "ODWhileVisible"; // Special value names public final static String cValueRandom = "#Random#"; diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java index 9d7ade1e9..e745beb8d 100644 --- a/src/biz/bokhorst/xprivacy/PrivacyService.java +++ b/src/biz/bokhorst/xprivacy/PrivacyService.java @@ -102,7 +102,6 @@ public class PrivacyService extends IPrivacyService.Stub { private Map mSettingCache = new HashMap(); private Map mAskedOnceCache = new HashMap(); private Map mRestrictionCache = new HashMap(); - private Map mRestrictionVisible = new HashMap(); private final long cMaxUsageDataHours = 12; private final int cMaxUsageDataCount = 700; @@ -478,30 +477,6 @@ else if (slash > 0) // Domain name } } - // Check for method while visible - synchronized (mRestrictionVisible) { - if (XActivityManagerService.isVisible(restriction.uid)) { - CRestriction wkey = new CRestriction(restriction, null); - if (mRestrictionVisible.containsKey(wkey)) { - mcached = true; - CRestriction wrestriction = mRestrictionVisible.get(wkey); - mresult.restricted = wrestriction.restricted; - mresult.asked = true; - Util.log(null, Log.WARN, "While visible " + mresult); - } else { - wkey.setMethodName(null); - if (mRestrictionVisible.containsKey(wkey)) { - mcached = true; - CRestriction wrestriction = mRestrictionVisible.get(wkey); - mresult.restricted = wrestriction.restricted; - mresult.asked = true; - Util.log(null, Log.WARN, "While visible " + mresult); - } - } - } else - mRestrictionVisible.clear(); - } - if (!mcached) { boolean methodFound = false; PRestriction cresult = new PRestriction(restriction.uid, restriction.restrictionName, null); @@ -1746,7 +1721,6 @@ private View getOnDemandView(final PRestriction restriction, final Hook hook, Ap final CheckBox cbCategory = (CheckBox) view.findViewById(R.id.cbCategory); final CheckBox cbOnce = (CheckBox) view.findViewById(R.id.cbOnce); final Spinner spOnce = (Spinner) view.findViewById(R.id.spOnce); - final CheckBox cbWhileVisible = (CheckBox) view.findViewById(R.id.cbWhileVisible); final LinearLayout llWhiteList = (LinearLayout) view.findViewById(R.id.llWhiteList); final CheckBox cbWhitelist = (CheckBox) view.findViewById(R.id.cbWhitelist); final CheckBox cbWhitelistExtra1 = (CheckBox) view.findViewById(R.id.cbWhitelistExtra1); @@ -1761,9 +1735,7 @@ private View getOnDemandView(final PRestriction restriction, final Hook hook, Ap boolean expert = getSettingBool(userId, PrivacyManager.cSettingODExpert, false); boolean category = getSettingBool(userId, PrivacyManager.cSettingODCategory, true); boolean once = getSettingBool(userId, PrivacyManager.cSettingODOnce, false); - boolean whilevisible = getSettingBool(userId, PrivacyManager.cSettingODWhileVisible, false); - whilevisible = whilevisible && XActivityManagerService.isVisible(restriction.uid); - expert = expert || !category || once || whilevisible; + expert = expert || !category || once; final boolean whitelistDangerous = (hook != null && hook.isDangerous() && hook.whitelist() != null); // Set values @@ -1812,11 +1784,6 @@ private View getOnDemandView(final PRestriction restriction, final Hook hook, Ap .parseInt(getSetting(new PSetting(userId, "", PrivacyManager.cSettingODOnceDuration, "0")).value); spOnce.setSelection(osel); - // While visible - cbWhileVisible.setChecked(whilevisible); - if (!XActivityManagerService.isVisible(restriction.uid)) - cbWhileVisible.setEnabled(false); - // Whitelisting if (hook != null && hook.whitelist() != null && restriction.extra != null) { cbWhitelist.setText(resources.getString(R.string.title_whitelist, restriction.extra)); @@ -1843,10 +1810,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { setSettingBool(userId, "", PrivacyManager.cSettingODCategory, true); setSettingBool(userId, "", PrivacyManager.cSettingODOnce, false); - setSettingBool(userId, "", PrivacyManager.cSettingODWhileVisible, false); cbCategory.setChecked(true); cbOnce.setChecked(false); - cbWhileVisible.setChecked(false); cbWhitelist.setChecked(false); cbWhitelistExtra1.setChecked(false); cbWhitelistExtra2.setChecked(false); @@ -1879,19 +1844,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { - cbWhileVisible.setChecked(false); - cbWhitelist.setChecked(false); - cbWhitelistExtra1.setChecked(false); - cbWhitelistExtra2.setChecked(false); - cbWhitelistExtra3.setChecked(false); - } - } - }); - cbWhileVisible.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - cbOnce.setChecked(false); cbWhitelist.setChecked(false); cbWhitelistExtra1.setChecked(false); cbWhitelistExtra2.setChecked(false); @@ -1905,7 +1857,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { cbCategory.setChecked(false); cbOnce.setChecked(false); - cbWhileVisible.setChecked(false); cbWhitelistExtra1.setChecked(false); cbWhitelistExtra2.setChecked(false); cbWhitelistExtra3.setChecked(false); @@ -1918,7 +1869,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { cbCategory.setChecked(false); cbOnce.setChecked(false); - cbWhileVisible.setChecked(false); cbWhitelist.setChecked(false); cbWhitelistExtra2.setChecked(false); cbWhitelistExtra3.setChecked(false); @@ -1931,7 +1881,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { cbCategory.setChecked(false); cbOnce.setChecked(false); - cbWhileVisible.setChecked(false); cbWhitelist.setChecked(false); cbWhitelistExtra1.setChecked(false); cbWhitelistExtra3.setChecked(false); @@ -1944,7 +1893,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { cbCategory.setChecked(false); cbOnce.setChecked(false); - cbWhileVisible.setChecked(false); cbWhitelist.setChecked(false); cbWhitelistExtra1.setChecked(false); cbWhitelistExtra2.setChecked(false); @@ -1974,12 +1922,9 @@ else if (cbWhitelistExtra3.isChecked()) else { setSettingBool(userId, "", PrivacyManager.cSettingODCategory, cbCategory.isChecked()); setSettingBool(userId, "", PrivacyManager.cSettingODOnce, cbOnce.isChecked()); - setSettingBool(userId, "", PrivacyManager.cSettingODWhileVisible, cbWhileVisible.isChecked()); if (cbOnce.isChecked()) onDemandOnce(restriction, cbCategory.isChecked(), result, oResult, spOnce); - else if (cbWhileVisible.isChecked()) - onDemandWhileVisible(restriction, cbCategory.isChecked(), result, oResult); else onDemandChoice(restriction, cbCategory.isChecked(), false); } @@ -2016,12 +1961,9 @@ else if (cbWhitelistExtra3.isChecked()) else { setSettingBool(userId, "", PrivacyManager.cSettingODCategory, cbCategory.isChecked()); setSettingBool(userId, "", PrivacyManager.cSettingODOnce, cbOnce.isChecked()); - setSettingBool(userId, "", PrivacyManager.cSettingODWhileVisible, cbWhileVisible.isChecked()); if (cbOnce.isChecked()) onDemandOnce(restriction, cbCategory.isChecked(), result, oResult, spOnce); - else if (cbWhileVisible.isChecked()) - onDemandWhileVisible(restriction, cbCategory.isChecked(), result, oResult); else onDemandChoice(restriction, cbCategory.isChecked(), true); } @@ -2157,23 +2099,6 @@ else if (unit == 'm') } } - private void onDemandWhileVisible(PRestriction restriction, boolean category, PRestriction result, - OnDemandResult oResult) { - result.time = new Date().getTime() + PrivacyManager.cRestrictionCacheTimeoutMs; - Util.log(null, Log.WARN, (result.restricted ? "Deny" : "Allow") + " while visible " + restriction - + " category=" + category); - - CRestriction key = new CRestriction(result, null); - if (category) { - key.setMethodName(null); - key.setExtra(null); - } - - synchronized (mRestrictionVisible) { - mRestrictionVisible.put(key, key); - } - } - private void onDemandChoice(PRestriction restriction, boolean category, boolean restrict) { try { PRestriction result = new PRestriction(restriction); diff --git a/tools/addstring.sh b/tools/addstring.sh index 501a78064..533694d0a 100755 --- a/tools/addstring.sh +++ b/tools/addstring.sh @@ -1,6 +1,6 @@ #!/bin/bash -grep -RIl "\While visible' +grep -RIl "\The privacy database was reset, because it was corrupt' #grep -RIl "\