Fixed on demand restricting asking again

Closes #1447

CHANGELOG.md

@@ -22,6 +22,7 @@ Changelog
 * Import/export one application will not import/export global settings
 * Option to enable/disable usage data parameters (**default disabled**)
 * Removed phone properties restrictions (these are covered by function restrictions too)
+* Fixed on demand restricting asking again ([issue](/../../issues/1447))
 * Updated Dutch translation
 * Updated Italian translation
 * Updated Polish translation

src/biz/bokhorst/xprivacy/CRestriction.java

@@ -43,11 +43,11 @@ public int getUid() {
 		return mUid;
 	}
 
-	public boolean matches(PRestriction restriction) {
+	public boolean isSameMethod(PRestriction restriction) {
 		// @formatter:off
 		return (restriction.uid == mUid
 				&& restriction.restrictionName.equals(mRestrictionName)
-				&& (restriction.methodName == null ? true : restriction.methodName.equals(mMethodName)));
+				&& restriction.methodName.equals(mMethodName));
 		// @formatter:on
 	}
 

src/biz/bokhorst/xprivacy/PrivacyService.java

@@ -411,16 +411,16 @@ private void setRestrictionInternal(PRestriction restriction) throws RemoteExcep
 				// Update cache
 				if (mUseCache)
 					synchronized (mRestrictionCache) {
-						// Clear cache
-						for (CRestriction key : new ArrayList<CRestriction>(mRestrictionCache.keySet()))
-							if (key.matches(restriction))
-								mRestrictionCache.remove(key);
-
-						if (restriction.methodName != null) {
-							// Update cache
-							CRestriction key = new CRestriction(restriction, restriction.extra);
-							mRestrictionCache.put(key, key);
+						if (restriction.methodName != null && restriction.extra == null) {
+							for (CRestriction key : new ArrayList<CRestriction>(mRestrictionCache.keySet()))
+								if (key.isSameMethod(restriction))
+									mRestrictionCache.remove(key);
 						}
+
+						CRestriction key = new CRestriction(restriction, restriction.extra);
+						if (mRestrictionCache.containsKey(key))
+							mRestrictionCache.remove(key);
+						mRestrictionCache.put(key, key);
 					}
 			} catch (Throwable ex) {
 				Util.bug(null, ex);