Display system components as disabled when restricting system compone…

…nts is not enabled Fixes #1744
M66B · Jun 20, 2014 · 7efd8a7 · 7efd8a7
1 parent 27c9f50
commit 7efd8a7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ Changelog
 **Next release**
 
 * Fixed updating dangerous functions restrictions when dangerous enabled ([issue](/../../issues/1742))
+* Display system components as disabled when restricting system components is not enabled ([issue](/../../issues/1744))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java
@@ -1290,7 +1290,8 @@ else if (PrivacyManager.cContacts.equals(restrictionName))
 
 					// Check if can be restricted
 					boolean can = enabled
-							&& PrivacyManager.canRestrict(rstate.mUid, Process.myUid(), rstate.mRestrictionName, null);
+							&& PrivacyManager.canRestrict(rstate.mUid, Process.myUid(), rstate.mRestrictionName, null,
+									true);
 					holder.llName.setEnabled(can);
 					holder.tvName.setEnabled(can);
 					holder.imgCbAsk.setEnabled(can);
@@ -1586,7 +1587,7 @@ public void onClick(View view) {
 					// Check if can be restricted
 					boolean can = enabled
 							&& PrivacyManager.canRestrict(rstate.mUid, Process.myUid(), rstate.mRestrictionName,
-									rstate.mMethodName);
+									rstate.mMethodName, true);
 					holder.llMethodName.setEnabled(can);
 					holder.tvMethodName.setEnabled(can);
 					holder.imgCbMethodAsk.setEnabled(can);

diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -1755,7 +1755,7 @@ else if (state == STATE_SHARED)
 					// Display enabled state
 					boolean can = enabled
 							&& PrivacyManager.canRestrict(rstate.mUid, Process.myUid(), rstate.mRestrictionName,
-									rstate.mMethodName);
+									rstate.mMethodName, true);
 					holder.tvName.setEnabled(can);
 					holder.imgCbRestricted.setEnabled(can);
 					holder.imgCbAsk.setEnabled(can);

diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -380,11 +380,11 @@ public static void setRestriction(int uid, String restrictionName, String method
 		for (String rRestrictionName : listRestriction)
 			listPRestriction.add(new PRestriction(uid, rRestrictionName, methodName, restricted, asked));
 
-		// Make exceptions for dangerous methods
+		// Make exceptions
 		if (methodName == null)
 			for (String rRestrictionName : listRestriction)
 				for (Hook md : getHooks(rRestrictionName)) {
-					if (!canRestrict(uid, Process.myUid(), rRestrictionName, md.getName()))
+					if (!canRestrict(uid, Process.myUid(), rRestrictionName, md.getName(), false))
 						listPRestriction.add(new PRestriction(uid, rRestrictionName, md.getName(), false, true));
 					else if (md.isDangerous())
 						listPRestriction.add(new PRestriction(uid, rRestrictionName, md.getName(), false, md
@@ -394,12 +394,18 @@ else if (md.isDangerous())
 		setRestrictionList(listPRestriction);
 	}
 
-	public static boolean canRestrict(int uid, int xuid, String restrictionName, String methodName) {
+	public static boolean canRestrict(int uid, int xuid, String restrictionName, String methodName, boolean system) {
 		int _uid = Util.getAppId(uid);
+		int userId = Util.getUserId(uid);
 
 		if (_uid == Process.SYSTEM_UID && PrivacyManager.cIdentification.equals(restrictionName))
 			return false;
 
+		if (system)
+			if (!isApplication(_uid))
+				if (!getSettingBool(userId, PrivacyManager.cSettingSystem, false))
+					return false;
+
 		// @formatter:off
 		if ((_uid == Util.getAppId(xuid)) &&
 			(((PrivacyManager.cIdentification.equals(restrictionName) &&

diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -407,13 +407,6 @@ public PRestriction getRestriction(final PRestriction restriction, boolean usage
 					return mresult;
 				}
 
-				// Check if can be restricted
-				if (!PrivacyManager.canRestrict(restriction.uid, getXUid(), restriction.restrictionName,
-						restriction.methodName)) {
-					mresult.asked = true;
-					return mresult;
-				}
-
 				// Get meta data
 				Hook hook = null;
 				if (restriction.methodName != null) {
@@ -424,9 +417,18 @@ public PRestriction getRestriction(final PRestriction restriction, boolean usage
 				}
 
 				// Check for system component
-				if (usage && !PrivacyManager.isApplication(restriction.uid))
-					if (!getSettingBool(userId, PrivacyManager.cSettingSystem, false))
+				if (!PrivacyManager.isApplication(restriction.uid))
+					if (!getSettingBool(userId, PrivacyManager.cSettingSystem, false)) {
+						mresult.asked = true;
 						return mresult;
+					}
+
+				// Check if can be restricted
+				if (!PrivacyManager.canRestrict(restriction.uid, getXUid(), restriction.restrictionName,
+						restriction.methodName, false)) {
+					mresult.asked = true;
+					return mresult;
+				}
 
 				// Check if restrictions enabled
 				if (usage && !getSettingBool(restriction.uid, PrivacyManager.cSettingRestricted, true))
@@ -1319,7 +1321,7 @@ private boolean onDemandDialog(final Hook hook, final PRestriction restriction,
 				if (hook != null && !hook.canOnDemand())
 					return false;
 				if (!PrivacyManager.canRestrict(restriction.uid, getXUid(), restriction.restrictionName,
-						restriction.methodName))
+						restriction.methodName, false))
 					return false;
 
 				// Check if enabled
@@ -1741,7 +1743,7 @@ private void onDemandChoice(PRestriction restriction, boolean category, boolean
 					// Clear category on change
 					for (Hook hook : PrivacyManager.getHooks(restriction.restrictionName))
 						if (!PrivacyManager.canRestrict(restriction.uid, getXUid(), restriction.restrictionName,
-								hook.getName())) {
+								hook.getName(), false)) {
 							result.methodName = hook.getName();
 							result.restricted = false;
 							result.asked = true;