From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 6 Aug 2017 10:27:32 -0400 Subject: [PATCH] fix toggling off current permissions in review The confirmPermissionsReview function currently only takes into account changes to the new permissions section. Since permissions review shows toggles for the current permissions, those should work too. It doesn't necessarily need to show toggles for the current permissions but since they're present the toggles should work to avoid misleading users into thinking they've toggled off a permission that they haven't. Change-Id: I84310a1c20981a239169069a881dbb79267d784f --- .../ui/ReviewPermissionsActivity.java | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java index 6bc251aed..b6fd0c161 100644 --- a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java @@ -48,6 +48,7 @@ import com.android.packageinstaller.permission.model.AppPermissions; import com.android.packageinstaller.permission.utils.Utils; import com.android.packageinstaller.permission.ui.ConfirmActionDialogFragment.OnActionConfirmedListener; +import java.util.ArrayList; import java.util.List; public final class ReviewPermissionsActivity extends Activity @@ -103,6 +104,7 @@ public final class ReviewPermissionsActivity extends Activity private Button mCancelButton; private PreferenceCategory mNewPermissionsCategory; + private PreferenceCategory mCurrentPermissionsCategory; private boolean mHasConfirmedRevoke; @@ -218,22 +220,29 @@ public final class ReviewPermissionsActivity extends Activity } private void confirmPermissionsReview() { - PreferenceGroup preferenceGroup = mNewPermissionsCategory != null - ? mNewPermissionsCategory : getPreferenceScreen(); - - final int preferenceCount = preferenceGroup.getPreferenceCount(); - for (int i = 0; i < preferenceCount; i++) { - Preference preference = preferenceGroup.getPreference(i); - if (preference instanceof TwoStatePreference) { - TwoStatePreference twoStatePreference = (TwoStatePreference) preference; - String groupName = preference.getKey(); - AppPermissionGroup group = mAppPermissions.getPermissionGroup(groupName); - if (twoStatePreference.isChecked()) { - group.grantRuntimePermissions(false); - } else { - group.revokeRuntimePermissions(false); + final List preferenceGroups = new ArrayList(); + if (mNewPermissionsCategory != null) { + preferenceGroups.add(mNewPermissionsCategory); + preferenceGroups.add(mCurrentPermissionsCategory); + } else { + preferenceGroups.add(getPreferenceScreen()); + } + + for (PreferenceGroup preferenceGroup : preferenceGroups) { + final int preferenceCount = preferenceGroup.getPreferenceCount(); + for (int i = 0; i < preferenceCount; i++) { + Preference preference = preferenceGroup.getPreference(i); + if (preference instanceof TwoStatePreference) { + TwoStatePreference twoStatePreference = (TwoStatePreference) preference; + String groupName = preference.getKey(); + AppPermissionGroup group = mAppPermissions.getPermissionGroup(groupName); + if (twoStatePreference.isChecked()) { + group.grantRuntimePermissions(false); + } else { + group.revokeRuntimePermissions(false); + } + group.resetReviewRequired(); } - group.resetReviewRequired(); } } } @@ -295,7 +304,7 @@ public final class ReviewPermissionsActivity extends Activity screen.removeAll(); } - PreferenceGroup currentPermissionsCategory = null; + mCurrentPermissionsCategory = null; PreferenceGroup oldNewPermissionsCategory = mNewPermissionsCategory; mNewPermissionsCategory = null; @@ -353,13 +362,13 @@ public final class ReviewPermissionsActivity extends Activity mNewPermissionsCategory.addPreference(preference); } } else { - if (currentPermissionsCategory == null) { - currentPermissionsCategory = new PreferenceCategory(activity); - currentPermissionsCategory.setTitle(R.string.current_permissions_category); - currentPermissionsCategory.setOrder(2); - screen.addPreference(currentPermissionsCategory); + if (mCurrentPermissionsCategory == null) { + mCurrentPermissionsCategory = new PreferenceCategory(activity); + mCurrentPermissionsCategory.setTitle(R.string.current_permissions_category); + mCurrentPermissionsCategory.setOrder(2); + screen.addPreference(mCurrentPermissionsCategory); } - currentPermissionsCategory.addPreference(preference); + mCurrentPermissionsCategory.addPreference(preference); } } } -- 2.31.1