PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)"

Browse Source
This commit is contained in:
Brian Carlstrom
2011-05-17 10:37:54 -07:00
committed by Android (Google) Code Review
parent 6019c7dcba 9815429821
commit 2c1e9c7846
2 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3053,6 +3053,8 @@ found in the list of installed applications.</string>
<!-- Toast message [CHAR LIMIT=30] -->
<string name="credentials_erased">Credential storage is erased.</string>
<!-- Toast message [CHAR LIMIT=30] -->
<string name="credentials_not_erased">Credential could not be erased.</string>
<!-- Toast message [CHAR LIMIT=30] -->
<string name="credentials_enabled">Credential storage is enabled.</string>
<!-- Sound settings screen, setting check box label -->

78
src/com/android/settings/CredentialStorage.java
View File

@@ -18,9 +18,16 @@ package com.android.settings;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.security.IKeyChainService;
import android.security.KeyStore;
import android.text.Editable;
import android.text.TextWatcher;
@@ -30,6 +37,8 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.io.UnsupportedEncodingException;
public class CredentialStorage extends Activity implements TextWatcher,
@@ -43,7 +52,8 @@ public class CredentialStorage extends Activity implements TextWatcher,
private static final String TAG = "CredentialStorage";
private KeyStore mKeyStore = KeyStore.getInstance();
private boolean mSubmit = false;
private boolean mPositive = false;
private boolean mNeutral = false;
private Bundle mBundle;
private TextView mOldPassword;
@@ -177,16 +187,13 @@ public class CredentialStorage extends Activity implements TextWatcher,
}
public void onClick(DialogInterface dialog, int button) {
mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
if (button == DialogInterface.BUTTON_NEUTRAL) {
mKeyStore.reset();
Toast.makeText(this, R.string.credentials_erased, Toast.LENGTH_SHORT).show();
}
mPositive = (button == DialogInterface.BUTTON_POSITIVE);
mNeutral = (button == DialogInterface.BUTTON_NEUTRAL);
}
public void onDismiss(DialogInterface dialog) {
if (mSubmit) {
mSubmit = false;
if (mPositive) {
mPositive = false;
mError.setVisibility(View.VISIBLE);
if (mNewPassword == null) {
@@ -225,6 +232,61 @@ public class CredentialStorage extends Activity implements TextWatcher,
return;
}
}
if (mNeutral) {
mNeutral = false;
new ResetKeyStoreAndKeyChain().execute();
return;
}
finish();
}
private class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
@Override protected Boolean doInBackground(Void... unused) {
mKeyStore.reset();
final BlockingQueue<IKeyChainService> q = new LinkedBlockingQueue<IKeyChainService>(1);
ServiceConnection keyChainServiceConnection = new ServiceConnection() {
@Override public void onServiceConnected(ComponentName name, IBinder service) {
try {
q.put(IKeyChainService.Stub.asInterface(service));
} catch (InterruptedException e) {
throw new AssertionError(e);
}
}
@Override public void onServiceDisconnected(ComponentName name) {}
};
boolean isBound = bindService(new Intent(IKeyChainService.class.getName()),
keyChainServiceConnection,
Context.BIND_AUTO_CREATE);
if (!isBound) {
Log.w(TAG, "could not bind to KeyChainService");
return false;
}
IKeyChainService keyChainService;
try {
keyChainService = q.take();
return keyChainService.reset();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return false;
} catch (RemoteException e) {
return false;
} finally {
unbindService(keyChainServiceConnection);
}
}
@Override protected void onPostExecute(Boolean success) {
if (success) {
Toast.makeText(CredentialStorage.this,
R.string.credentials_erased, Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(CredentialStorage.this,
R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
}
finish();
}
}
}