From 17192263e33166f6e2fcb0c8b8f1d015544faf30 Mon Sep 17 00:00:00 2001 From: jpeg729 Date: Mon, 3 Feb 2014 13:43:24 +0100 Subject: [PATCH 1/2] Don't prompt from ui --- src/biz/bokhorst/xprivacy/PrivacyManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java index c69377a28..3ece16fcc 100644 --- a/src/biz/bokhorst/xprivacy/PrivacyManager.java +++ b/src/biz/bokhorst/xprivacy/PrivacyManager.java @@ -374,7 +374,7 @@ else if (mRestart.keySet().contains(restrictionName)) try { for (String restriction : listRestriction) { for (String method : mRestart.get(restriction)) - listRestartRestriction.add(getRestriction(null, uid, restriction, method, null)); + listRestartRestriction.add(getRestrictionEx(uid, restriction, method).restricted); } } catch (Throwable ex) { Util.bug(null, ex); From 6f4cfe82a49e398e8bdd4ab6288f7dd5a4ab0d76 Mon Sep 17 00:00:00 2001 From: jpeg729 Date: Mon, 3 Feb 2014 13:55:00 +0100 Subject: [PATCH 2/2] getRestrictionList is only called from the ui, so no secret --- src/biz/bokhorst/xprivacy/PrivacyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java index 048725710..e1d14531d 100644 --- a/src/biz/bokhorst/xprivacy/PrivacyService.java +++ b/src/biz/bokhorst/xprivacy/PrivacyService.java @@ -550,14 +550,14 @@ public List getRestrictionList(PRestriction selector) throws Remot if (selector.restrictionName == null) for (String sRestrictionName : PrivacyManager.getRestrictions()) { PRestriction restriction = new PRestriction(selector.uid, sRestrictionName, null, false); - restriction.restricted = getRestriction(restriction, false, mSecret).restricted; + restriction.restricted = getRestriction(restriction, false, null).restricted; result.add(restriction); } else for (Hook md : PrivacyManager.getHooks(selector.restrictionName)) { PRestriction restriction = new PRestriction(selector.uid, selector.restrictionName, md.getName(), false); - restriction.restricted = getRestriction(restriction, false, mSecret).restricted; + restriction.restricted = getRestriction(restriction, false, null).restricted; result.add(restriction); } } catch (Throwable ex) {