Fixed bug in WirelessSettings where it was asking users for a PIN when they weren't restricted. Did this by refactoring the preference level pin checking into the superclass, where it checks for the restricted mode first. Also pin protected changes to certificates for restricted users. Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
198 lines
6.9 KiB
Java
198 lines
6.9 KiB
Java
/*
|
|
* Copyright (C) 2013 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
import java.util.HashSet;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.os.UserManager;
|
|
import android.preference.Preference;
|
|
import android.preference.PreferenceScreen;
|
|
|
|
/**
|
|
* Base class for settings activities that should be pin protected when in restricted mode.
|
|
* The constructor for this class will take the restriction key that this screen should be
|
|
* locked by. If {@link UserManager.hasRestrictionsPin()} and
|
|
* {@link UserManager.hasUserRestriction(String)} returns true for the restriction key, then
|
|
* the user will have to enter the restrictions pin before seeing the Settings screen.
|
|
*
|
|
* If this settings screen should be pin protected whenever
|
|
* {@link UserManager.hasUserRestriction(String)} returns true, pass in
|
|
* {@link RESTRICTIONS_PIN_SET} to the constructor instead of a restrictions key.
|
|
*/
|
|
public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
|
|
protected static final String RESTRICTIONS_PIN_SET = "restrictions_pin_set";
|
|
|
|
// Should be unique across all settings screens that use this.
|
|
private static final int REQUEST_PIN_CHALLENGE = 12309;
|
|
|
|
private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
|
|
private static final String KEY_CHALLENGE_REQUESTED = "chrq";
|
|
|
|
// If the restriction PIN is entered correctly.
|
|
private boolean mChallengeSucceeded;
|
|
private boolean mChallengeRequested;
|
|
|
|
private UserManager mUserManager;
|
|
|
|
private final String mRestrictionKey;
|
|
|
|
private final HashSet<Preference> mProtectedByRestictionsPrefs = new HashSet<Preference>();
|
|
|
|
/**
|
|
* @param restrictionKey The restriction key to check before pin protecting
|
|
* this settings page. Pass in {@link RESTRICTIONS_PIN_SET} if it should
|
|
* be PIN protected whenever a restrictions pin is set. Pass in
|
|
* null if it should never be PIN protected.
|
|
*/
|
|
public RestrictedSettingsFragment(String restrictionKey) {
|
|
mRestrictionKey = restrictionKey;
|
|
}
|
|
|
|
@Override
|
|
public void onCreate(Bundle icicle) {
|
|
super.onCreate(icicle);
|
|
|
|
mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
|
|
|
|
if (icicle != null) {
|
|
mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
|
|
mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onSaveInstanceState(Bundle outState) {
|
|
super.onSaveInstanceState(outState);
|
|
|
|
outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
|
|
if (getActivity().isChangingConfigurations()) {
|
|
outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
super.onResume();
|
|
if (shouldBePinProtected(mRestrictionKey)) {
|
|
ensurePin();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
if (requestCode == REQUEST_PIN_CHALLENGE) {
|
|
mChallengeRequested = false;
|
|
if (resultCode == Activity.RESULT_OK) {
|
|
|
|
mChallengeSucceeded = true;
|
|
} else if (!isDetached()) {
|
|
finishFragment();
|
|
}
|
|
return;
|
|
}
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
}
|
|
|
|
private void ensurePin() {
|
|
if (!mChallengeSucceeded) {
|
|
final UserManager um = UserManager.get(getActivity());
|
|
if (!mChallengeRequested) {
|
|
if (um.hasRestrictionsPin()) {
|
|
Intent requestPin =
|
|
new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE);
|
|
startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
|
|
mChallengeRequested = true;
|
|
}
|
|
}
|
|
}
|
|
mChallengeSucceeded = false;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this activity is restricted, but no restriction pin has been set.
|
|
* Used to determine if the settings UI should disable UI.
|
|
*/
|
|
protected boolean isRestrictedAndNotPinProtected() {
|
|
if (mRestrictionKey == null || RESTRICTIONS_PIN_SET.equals(mRestrictionKey)) {
|
|
return false;
|
|
}
|
|
return mUserManager.hasUserRestriction(mRestrictionKey)
|
|
&& !mUserManager.hasRestrictionsPin();
|
|
}
|
|
|
|
/**
|
|
* Called to trigger the pin entry if the given restriction key is locked down.
|
|
* @param restrictionsKey The restriction key or {@link RESTRICTIONS_PIN_SET} if
|
|
* pin entry should get triggered if there is a pin set.
|
|
*/
|
|
protected boolean restrictionsPinCheck(String restrictionsKey) {
|
|
if (shouldBePinProtected(restrictionsKey) && !mChallengeSucceeded) {
|
|
ensurePin();
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
protected boolean hasChallengeSucceeded() {
|
|
return mChallengeSucceeded;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this restrictions key is locked down.
|
|
*/
|
|
protected boolean shouldBePinProtected(String restrictionKey) {
|
|
if (restrictionKey == null) {
|
|
return false;
|
|
}
|
|
boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey)
|
|
|| mUserManager.hasUserRestriction(restrictionKey);
|
|
return restricted && mUserManager.hasRestrictionsPin();
|
|
}
|
|
|
|
/**
|
|
* If the preference is one that was added by protectByRestrictions(), then it will
|
|
* prompt the user for the restrictions pin if they haven't entered it already.
|
|
* Intended to be called at the top of onPreferenceTreeClick. If this function returns
|
|
* true, then onPreferenceTreeClick should return true.
|
|
*/
|
|
boolean ensurePinRestrictedPreference(Preference preference) {
|
|
return mProtectedByRestictionsPrefs.contains(preference)
|
|
&& !restrictionsPinCheck(RESTRICTIONS_PIN_SET);
|
|
}
|
|
|
|
/**
|
|
* Call this with any preferences that should require the PIN to be entered
|
|
* before they are accessible.
|
|
*/
|
|
protected void protectByRestrictions(Preference pref) {
|
|
if (pref != null) {
|
|
mProtectedByRestictionsPrefs.add(pref);
|
|
}
|
|
}
|
|
|
|
protected void protectByRestrictions(String key) {
|
|
Preference pref = findPreference(key);
|
|
protectByRestrictions(pref);
|
|
}
|
|
}
|