Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Added category merge/reset
Browse files Browse the repository at this point in the history
Fixes #1909
  • Loading branch information
M66B committed Aug 30, 2014
1 parent 8030a63 commit b459316
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Version 3.x will be available with a [pro license](http://www.xprivacy.eu/) only
* Improved database locking ([pull request](/../../issues/1939))
* Changed settings dialog to settings activity ([pull request](/../../issues/1938))
* Moved flush button to expert mode section ([issue](/../../issues/1934))
* Added category merge/reset ([issue](/../../issues/1909))
* Updated simplified Chinese translation

[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
Expand Down
9 changes: 7 additions & 2 deletions src/biz/bokhorst/xprivacy/PrivacyManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,13 @@ public static void applyTemplate(int uid, String templateName, String restrictio

// Apply
if (canRestrict(uid, Process.myUid(), rRestrictionName, null, true))
listPRestriction.add(new PRestriction(uid, rRestrictionName, null, parentMerge.restricted
|| parentRestricted, parentMerge.asked && parentAsked));
if (invert && ((parentRestricted && parentMerge.restricted) || (!parentAsked && !parentMerge.asked))) {
listPRestriction.add(new PRestriction(uid, rRestrictionName, null, parentRestricted ? false
: parentMerge.restricted, !parentAsked ? true : parentMerge.asked));
continue; // leave functions
} else
listPRestriction.add(new PRestriction(uid, rRestrictionName, null, parentMerge.restricted
|| parentRestricted, parentMerge.asked && parentAsked));

// Childs
if (methods)
Expand Down

0 comments on commit b459316

Please sign in to comment.