Added parameter key to SystemProperties

M66B · Jun 29, 2014 · c27c2b2 · c27c2b2
1 parent ab63089
commit c27c2b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ Changelog
 * Added restriction for heart rate sensor (Android "L") ([issue](/../../issues/1757))
 * Added restriction *SIP.isSipWifiOnly*
 * Added parameter destination address to *sendDataMessage*, *sendMultipartTextMessage* and *sendTextMessage* (SMS)
+* Added parameter key to *%imei*, *%hostname*, *%serialno*, *%macaddr* and *%cid*
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/src/biz/bokhorst/xprivacy/XSystemProperties.java b/src/biz/bokhorst/xprivacy/XSystemProperties.java
@@ -52,11 +52,11 @@ protected void after(XParam param) throws Throwable {
 		if (key != null)
 			if (mPropertyName.startsWith("%") ? key.contains(mPropertyName.substring(1)) : key.equals(mPropertyName))
 				if (mMethod == Methods.get) {
-					if (param.getResult() != null && isRestricted(param, mPropertyName))
+					if (param.getResult() != null && isRestrictedExtra(param, mPropertyName, key))
 						param.setResult(PrivacyManager.getDefacedProp(Binder.getCallingUid(), mPropertyName));
 
 				} else if (param.args.length > 1) {
-					if (isRestricted(param, mPropertyName))
+					if (isRestrictedExtra(param, mPropertyName, key))
 						param.setResult(param.args[1]);
 
 				} else