Fixed on demand restricting for dangerous methods with whitelists

Fixed #1653
M66B · May 17, 2014 · e064e3e · e064e3e
1 parent 116ee6b
commit e064e3e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ Changelog
 **Next release**
 
 * Fixed displaying contacts without display name ([issue](/../../issues/1660))
+* Fixed on demand restricting for dangerous methods with whitelists ([issue](/../../issues/1653))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -467,10 +467,10 @@ public static void applyTemplate(int uid, String restrictionName, boolean method
 							Boolean.toString(parentRestricted && (hook.isDangerous() ? dangerous : true))
 									+ (parentAsked ? "+asked" : "+ask"), false);
 					boolean restricted = value.contains("true");
-					boolean asked = value.contains("asked");
+					boolean asked = (!ondemand || value.contains("asked"));
 					if ((parentRestricted && !restricted) || (!parentAsked && asked))
 						listPRestriction.add(new PRestriction(uid, rRestrictionName, hook.getName(), parentRestricted
-								&& restricted, parentAsked || asked || !ondemand));
+								&& restricted, parentAsked || asked));
 				}
 		}
 		setRestrictionList(listPRestriction);

diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -525,7 +525,7 @@ public PRestriction getRestriction(final PRestriction restriction, boolean usage
 					if (!methodFound && hook != null && hook.isDangerous())
 						if (!getSettingBool(userId, PrivacyManager.cSettingDangerous, false)) {
 							mresult.restricted = false;
-							mresult.asked = true;
+							mresult.asked = (hook.whitelist() == null);
 						}
 
 					// Check whitelist