Revert "Fixed on demand restricting for dangerous methods with whitel…

…ists" This reverts commit 63946e5. Refs #1653
M66B · May 17, 2014 · 116ee6b · 116ee6b
1 parent 59d1678
commit 116ee6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,6 @@ 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 = (!ondemand || value.contains("asked"));
-					if ((parentRestricted && !restricted) || (!parentAsked && asked) || hook.isDangerous())
+					boolean asked = value.contains("asked");
+					if ((parentRestricted && !restricted) || (!parentAsked && asked))
 						listPRestriction.add(new PRestriction(uid, rRestrictionName, hook.getName(), parentRestricted
-								&& restricted, parentAsked || asked));
+								&& restricted, parentAsked || asked || !ondemand));
 				}
 		}
 		setRestrictionList(listPRestriction);