Merge restrictions

Refs #1700

src/biz/bokhorst/xprivacy/PrivacyManager.java

@@ -459,6 +459,13 @@ public static void applyTemplate(int uid, String restrictionName, boolean method
 					+ "+ask", false);
 			boolean parentRestricted = parentValue.contains("true");
 			boolean parentAsked = (!ondemand || parentValue.contains("asked"));
+			if (!clear) {
+				PRestriction parentMerge = getRestrictionEx(uid, rRestrictionName, null);
+				if (parentMerge.restricted)
+					parentRestricted = true;
+				if (!parentMerge.asked)
+					parentAsked = false;
+			}
 			listPRestriction.add(new PRestriction(uid, rRestrictionName, null, parentRestricted, parentAsked));
 
 			// Childs
@@ -470,7 +477,15 @@ public static void applyTemplate(int uid, String restrictionName, boolean method
 									+ (parentAsked ? "+asked" : "+ask"), false);
 					boolean restricted = value.contains("true");
 					boolean asked = (!ondemand || value.contains("asked"));
-					if ((parentRestricted && !restricted) || (!parentAsked && asked) || hook.whitelist() != null)
+					if (!clear) {
+						PRestriction childMerge = getRestrictionEx(uid, rRestrictionName, hook.getName());
+						if (childMerge.restricted)
+							restricted = true;
+						if (!childMerge.asked)
+							asked = false;
+					}
+					if ((parentRestricted && !restricted) || (!parentAsked && asked) || hook.whitelist() != null
+							|| !clear)
 						listPRestriction.add(new PRestriction(uid, rRestrictionName, hook.getName(), parentRestricted
 								&& restricted, parentAsked || asked));
 				}