Fixed exporting of on demand restricting function settings

Closes #1508
M66B · Mar 6, 2014 · 6da6c2f · 6da6c2f
1 parent 9d219f8
commit 6da6c2f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Changelog
 **Next release**
 
 * Fixed exporting of template ([issue](/../../issues/1506))
+* Fixed exporting of on demand restricting function settings ([issue](/../../issues/1508))
 * Added *uid* to *restricted by* dialog (requested on XDA)
 * On demand restricting for dangerous functions with a whitelist always enabled
 * Updated Italian translation

diff --git a/src/biz/bokhorst/xprivacy/ActivityShare.java b/src/biz/bokhorst/xprivacy/ActivityShare.java
@@ -759,28 +759,27 @@ protected Throwable doInBackground(File... params) {
 								// Category
 								// TODO: use getRestrictionList
 								PRestriction crestricted = PrivacyManager.getRestrictionEx(uid, restrictionName, null);
-								if (crestricted.restricted || crestricted.asked) {
-									serializer.startTag(null, "Restriction");
-									serializer.attribute(null, "Id", Integer.toString(uid));
-									serializer.attribute(null, "Name", restrictionName);
-									serializer.attribute(null, "Restricted", Boolean.toString(crestricted.restricted));
-									serializer.attribute(null, "Asked", Boolean.toString(crestricted.asked));
-									serializer.endTag(null, "Restriction");
-
-									// Methods
-									for (Hook md : PrivacyManager.getHooks(restrictionName)) {
-										PRestriction mrestricted = PrivacyManager.getRestrictionEx(uid,
-												restrictionName, md.getName());
-										if (!mrestricted.restricted || !mrestricted.asked || md.isDangerous()) {
-											serializer.startTag(null, "Restriction");
-											serializer.attribute(null, "Id", Integer.toString(uid));
-											serializer.attribute(null, "Name", restrictionName);
-											serializer.attribute(null, "Method", md.getName());
-											serializer.attribute(null, "Restricted",
-													Boolean.toString(mrestricted.restricted));
-											serializer.attribute(null, "Asked", Boolean.toString(mrestricted.asked));
-											serializer.endTag(null, "Restriction");
-										}
+								serializer.startTag(null, "Restriction");
+								serializer.attribute(null, "Id", Integer.toString(uid));
+								serializer.attribute(null, "Name", restrictionName);
+								serializer.attribute(null, "Restricted", Boolean.toString(crestricted.restricted));
+								serializer.attribute(null, "Asked", Boolean.toString(crestricted.asked));
+								serializer.endTag(null, "Restriction");
+
+								// Methods
+								for (Hook md : PrivacyManager.getHooks(restrictionName)) {
+									PRestriction mrestricted = PrivacyManager.getRestrictionEx(uid, restrictionName,
+											md.getName());
+									if ((crestricted.restricted && !mrestricted.restricted)
+											|| (!crestricted.asked && mrestricted.asked) || md.isDangerous()) {
+										serializer.startTag(null, "Restriction");
+										serializer.attribute(null, "Id", Integer.toString(uid));
+										serializer.attribute(null, "Name", restrictionName);
+										serializer.attribute(null, "Method", md.getName());
+										serializer.attribute(null, "Restricted",
+												Boolean.toString(mrestricted.restricted));
+										serializer.attribute(null, "Asked", Boolean.toString(mrestricted.asked));
+										serializer.endTag(null, "Restriction");
 									}
 								}
 							}