am 86637edf: Merge change 8183 into donut (7402052a) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2004,6 +2004,9 @@ found in the list of installed applications.</string>
		<string name="cstor_name_empty_error">Please enter a name.</string>
		<string name="cstor_name_char_error">Please enter a name that contains only letters and numbers.</string>
		<string name="cstor_storage_error">Unable to save the certificate. Click OK to retry.</string>
		<string name="cstor_unable_to_save_cert">Unable to save the certificate. The credential storage is not enabled or properly initialized.</string>
		<string name="cstor_cert_not_saved">The certificate is not saved.</string>
		<string name="cstor_is_reset">The credential storage is erased.</string>

		<!-- toast message -->
		<string name="cstor_is_enabled">Credential storage is enabled.</string>

src/com/android/settings/SecuritySettings.java

+81 −36

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import android.security.Keystore;
		import android.text.Html;
		import android.text.TextUtils;
		import android.text.method.LinkMovementMethod;
		import android.util.Log;
		import android.view.View;
		import android.widget.TextView;
		import android.widget.Toast;
		@@ -476,15 +477,26 @@ public class SecuritySettings extends PreferenceActivity implements

		if (ACTION_ADD_CREDENTIAL.equals(action)) {
		mCstorAddCredentialHelper = new CstorAddCredentialHelper(intent);
		showDialog(CSTOR_NAME_CREDENTIAL_DIALOG);
		showCstorDialog(CSTOR_NAME_CREDENTIAL_DIALOG);
		} else if (ACTION_UNLOCK_CREDENTIAL_STORAGE.equals(action)) {
		mSpecialIntent = intent;
		showDialog(mCstorHelper.isCstorInitialized()
		showCstorDialog(mCstorHelper.isCstorInitialized()
		? CSTOR_UNLOCK_DIALOG
		: CSTOR_INIT_DIALOG);
		}
		}

		private void showCstorDialog(int dialogId) {
		mDialogId = dialogId;
		showDialog(dialogId);

		if (dialogId == CSTOR_NAME_CREDENTIAL_DIALOG) {
		// set mView back as mView may be replaced by CSTOR_INIT_DIALOG
		// or CSTOR_UNLOCK_DIALOG
		mView = mCstorAddCredentialHelper.mView;
		}
		}

		private boolean isCstorUnlocked() {
		return (mKeystore.getState() == Keystore.UNLOCKED);
		}
		@@ -526,16 +538,54 @@ public class SecuritySettings extends PreferenceActivity implements
		mKeystore.reset();
		enablePreferences(false);
		mAccessCheckBox.setChecked(false);
		Toast.makeText(SecuritySettings.this, R.string.cstor_is_reset,
		Toast.LENGTH_LONG).show();
		}

		private boolean addCredential() {
		if (mCstorAddCredentialHelper.saveToStorage() != 0) {
		// set mView back as mView may be replaced by CSTOR_INIT_DIALOG
		// or CSTOR_UNLOCK_DIALOG
		mView = mCstorAddCredentialHelper.mView;
		if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
		showError(R.string.cstor_password_error);
		} else {
		showError(R.string.cstor_storage_error);
		}
		Log.d("CSTOR", "failed to add credential");
		return false;
		}
		Log.d("CSTOR", "credential is added: "
		+ mCstorAddCredentialHelper.getName());
		String formatString =
		getString(R.string.cstor_is_added);
		String message = String.format(formatString,
		mCstorAddCredentialHelper.getName());
		Toast.makeText(SecuritySettings.this, message,
		Toast.LENGTH_LONG).show();
		return true;
		}

		public void onCancel(DialogInterface dialog) {
		if (mCstorAddCredentialHelper != null) {
		// release the object here so that it doesn't get triggerred in
		// onDismiss()
		if (mCstorAddCredentialHelper == null) return;

		switch (mDialogId) {
		case CSTOR_INIT_DIALOG:
		case CSTOR_UNLOCK_DIALOG:
		Toast.makeText(SecuritySettings.this,
		R.string.cstor_unable_to_save_cert,
		Toast.LENGTH_LONG).show();
		break;

		case CSTOR_NAME_CREDENTIAL_DIALOG:
		Toast.makeText(SecuritySettings.this,
		R.string.cstor_cert_not_saved,
		Toast.LENGTH_LONG).show();
		break;
		}
		mCstorAddCredentialHelper = null;
		finish();
		}
		}

		public void onClick(DialogInterface dialog, int which) {
		if (which == DialogInterface.BUTTON_NEGATIVE) {
		@@ -566,31 +616,34 @@ public class SecuritySettings extends PreferenceActivity implements
		public void onDismiss(DialogInterface dialog) {
		if (!mConfirm) {
		mConfirm = true;
		showDialog(mDialogId);
		showCstorDialog(mDialogId);
		} else {
		removeDialog(mDialogId);

		if (mDialogId == CSTOR_UNLOCK_DIALOG) {
		mAccessCheckBox.setChecked(isCstorUnlocked());
		}

		if (mCstorAddCredentialHelper != null) {
		if (!isCstorInitialized()) {
		showDialog(CSTOR_INIT_DIALOG);
		showCstorDialog(CSTOR_INIT_DIALOG);
		} else if (!isCstorUnlocked()) {
		showDialog(CSTOR_UNLOCK_DIALOG);
		showCstorDialog(CSTOR_UNLOCK_DIALOG);
		} else {
		String formatString =
		getString(R.string.cstor_is_added);
		String message = String.format(formatString,
		mCstorAddCredentialHelper.getName());
		Toast.makeText(SecuritySettings.this, message,
		Toast.LENGTH_SHORT).show();
		if (addCredential()) {
		// succeeded
		finish();
		} else {
		// failed
		if (mDialogId != CSTOR_NAME_CREDENTIAL_DIALOG) {
		removeDialog(mDialogId);
		}
		showCstorDialog(CSTOR_NAME_CREDENTIAL_DIALOG);
		}
		}
		return;
		} else if (mSpecialIntent != null) {
		finish();
		}
		removeDialog(mDialogId);
		}
		}

		@@ -637,15 +690,6 @@ public class SecuritySettings extends PreferenceActivity implements
		mCstorAddCredentialHelper.setPassword(password);
		}

		if (mCstorAddCredentialHelper.saveToStorage() < 0) {
		if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
		showError(R.string.cstor_password_error);
		} else {
		showError(R.string.cstor_storage_error);
		}
		return false;
		}

		return true;
		}

		@@ -772,7 +816,7 @@ public class SecuritySettings extends PreferenceActivity implements
		public boolean onPreferenceChange(
		Preference pref, Object value) {
		if (((Boolean) value)) {
		showDialog(isCstorInitialized()
		showCstorDialog(isCstorInitialized()
		? CSTOR_UNLOCK_DIALOG
		: CSTOR_INIT_DIALOG);
		} else {
		@@ -793,7 +837,7 @@ public class SecuritySettings extends PreferenceActivity implements
		pref.setOnPreferenceClickListener(
		new Preference.OnPreferenceClickListener() {
		public boolean onPreferenceClick(Preference pref) {
		showDialog(isCstorInitialized()
		showCstorDialog(isCstorInitialized()
		? CSTOR_CHANGE_PASSWORD_DIALOG
		: CSTOR_INIT_DIALOG);
		return true;
		@@ -809,7 +853,7 @@ public class SecuritySettings extends PreferenceActivity implements
		pref.setOnPreferenceClickListener(
		new Preference.OnPreferenceClickListener() {
		public boolean onPreferenceClick(Preference pref) {
		showDialog(CSTOR_RESET_DIALOG);
		showCstorDialog(CSTOR_RESET_DIALOG);
		return true;
		}
		});
		@@ -819,7 +863,6 @@ public class SecuritySettings extends PreferenceActivity implements
		}

		private Dialog createUnlockDialog() {
		mDialogId = CSTOR_UNLOCK_DIALOG;
		mView = View.inflate(SecuritySettings.this,
		R.layout.cstor_unlock_dialog_view, null);
		hideError();
		@@ -842,7 +885,6 @@ public class SecuritySettings extends PreferenceActivity implements
		}

		private Dialog createSetPasswordDialog(int id) {
		mDialogId = id;
		mView = View.inflate(SecuritySettings.this,
		R.layout.cstor_set_password_dialog_view, null);
		hideError();
		@@ -882,7 +924,6 @@ public class SecuritySettings extends PreferenceActivity implements
		}

		private Dialog createResetDialog() {
		mDialogId = CSTOR_RESET_DIALOG;
		return new AlertDialog.Builder(SecuritySettings.this)
		.setTitle(android.R.string.dialog_alert_title)
		.setIcon(android.R.drawable.ic_dialog_alert)
		@@ -893,9 +934,12 @@ public class SecuritySettings extends PreferenceActivity implements
		}

		private Dialog createNameCredentialDialog() {
		mDialogId = CSTOR_NAME_CREDENTIAL_DIALOG;
		mView = View.inflate(SecuritySettings.this,
		R.layout.cstor_name_credential_dialog_view, null);
		if (mCstorAddCredentialHelper != null) {
		mCstorAddCredentialHelper.mView = mView;
		}

		hideError();
		if (!mCstorAddCredentialHelper.isPkcs12Keystore()) {
		hide(R.id.cstor_credential_password_container);
		@@ -927,6 +971,7 @@ public class SecuritySettings extends PreferenceActivity implements
		private String mDescription;
		private String mName;
		private String mPassword;
		private View mView;

		CstorAddCredentialHelper(Intent intent) {
		parse(intent);
		@@ -970,7 +1015,7 @@ public class SecuritySettings extends PreferenceActivity implements
		byte[] blob = mItemList.get(i);
		int ret = ks.put(mNamespaceList.get(i), mName,
		new String(blob));
		if (ret < 0) return ret;
		if (ret != 0) return ret;
		}
		}
		return 0;