Clear will also clear usage data and settings

M66B · Aug 25, 2014 · 7df4022 · 7df4022
1 parent 15ff088
commit 7df4022
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www
 
 **Next release**
 
+* Clear will also clear usage data and settings
 * Updated Arabic translation
 * Updated Italian translation
 * Updated Japanese translation
@@ -230,6 +231,7 @@ XPrivacy 2
 * Added help texts
 * Updated in application documentation
 * Added option to merge template to reset functions (not categories)
+* Clear will also clear usage data and settings
 * Updated Arabic translation
 * Updated Dutch translation
 * Updated French translation

diff --git a/src/biz/bokhorst/xprivacy/ActivityShare.java b/src/biz/bokhorst/xprivacy/ActivityShare.java
@@ -690,8 +690,13 @@ protected Throwable doInBackground(String... params) {
 
 						List<Boolean> oldState = PrivacyManager.getRestartStates(uid, restrictionName);
 
-						if (actionId == R.id.rbClear)
+						if (actionId == R.id.rbClear) {
 							PrivacyManager.deleteRestrictions(uid, restrictionName, (restrictionName == null));
+							if (restrictionName == null) {
+								PrivacyManager.deleteUsage(uid);
+								PrivacyManager.deleteSettings(uid);
+							}
+						}
 
 						else if (actionId == R.id.rbRestrict) {
 							PrivacyManager.setRestriction(uid, restrictionName, null, true, false);