Fix disabling restrictions

M66B · Jun 28, 2014 · 91e3269 · 91e3269
1 parent e181992
commit 91e3269
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,7 +34,7 @@ Changelog
 ```
 cd /data/system/xprivacy
 echo "ipc" >disabled
-echo "system/getInstalledProviders" >>disabled
+echo "system.getInstalledProviders" >>disabled
 ```
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -371,10 +371,14 @@ else if (name.equals(Context.WIFI_SERVICE))
 
 	public static void hookAll(List<XHook> listHook, ClassLoader classLoader, String secret) {
 		for (XHook hook : listHook)
-			if (hook.getRestrictionName() != null) {
+			if (hook.getRestrictionName() == null)
+				hook(hook, classLoader, secret);
+			else {
 				CRestriction crestriction = new CRestriction(0, hook.getRestrictionName(), null, null);
 				CRestriction mrestriction = new CRestriction(0, hook.getRestrictionName(), hook.getMethodName(), null);
-				if (!(mListDisabled.contains(crestriction) || mListDisabled.contains(mrestriction)))
+				if (mListDisabled.contains(crestriction) || mListDisabled.contains(mrestriction))
+					Util.log(hook, Log.WARN, "Skipping " + hook);
+				else
 					hook(hook, classLoader, secret);
 			}
 	}