Not filtering on restricted will filter on not restricted

Fixes #682
M66B · Nov 13, 2013 · 9f3aae1 · 9f3aae1
1 parent 9f024c6
commit 9f3aae1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Changelog
 * Require Android 4.0.3 (minimum for Xposed)
 * Added settings for Advertisement ID (including randomization) ([issue](https://github.com/M66B/XPrivacy/issues/738))
 * Added settings for SSID (including randomization) ([issue](https://github.com/M66B/XPrivacy/issues/652))
+* Not filtering on restricted will filter on not restricted ([issue](https://github.com/M66B/XPrivacy/issues/682))
 * Option to randomize subscriber ID (IMSI) ([issue](https://github.com/M66B/XPrivacy/issues/690))
 * Added traditional Chinese translation
 * Updated German translation

diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -906,17 +906,16 @@ protected FilterResults performFiltering(CharSequence constraint) {
 
 					// Get some restricted
 					boolean someRestricted = false;
-					if (fRestricted)
-						if (mRestrictionName == null) {
-							for (boolean restricted : PrivacyManager.getRestricted(getApplicationContext(),
-									xAppInfo.getUid(), true))
-								if (restricted) {
-									someRestricted = true;
-									break;
-								}
-						} else
-							someRestricted = PrivacyManager.getRestricted(null, getApplicationContext(),
-									xAppInfo.getUid(), mRestrictionName, null, false, false);
+					if (mRestrictionName == null) {
+						for (boolean restricted : PrivacyManager.getRestricted(getApplicationContext(),
+								xAppInfo.getUid(), true))
+							if (restricted) {
+								someRestricted = true;
+								break;
+							}
+					} else
+						someRestricted = PrivacyManager.getRestricted(null, getApplicationContext(), xAppInfo.getUid(),
+								mRestrictionName, null, false, false);
 
 					// Get Android permission
 					boolean permission = false;
@@ -939,7 +938,7 @@ else if (PrivacyManager.hasPermission(mContext, xAppInfo.getPackageName(), mRest
 
 					// Match application
 					if ((fName.equals("") ? true : contains) && (fUsed ? used : true) && (fInternet ? internet : true)
-							&& (fRestricted ? someRestricted : true) && (fPermission ? permission : true)
+							&& (fRestricted ? someRestricted : !someRestricted) && (fPermission ? permission : true)
 							&& (fUser ? user : true) && (fSystem ? system : true))
 						lstApp.add(xAppInfo);
 				}