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

am 19e134e4: Use new Keystore APIs in vpn profile editor.

Browse Source 
Merge commit '19e134e494a561324394fcc030ee8e30bb41c614'

* commit '19e134e494a561324394fcc030ee8e30bb41c614':
  Use new Keystore APIs in vpn profile editor.
This commit is contained in:
Chung-yih Wang
2009-06-17 15:38:31 -07:00
committed by The Android Open Source Project
parent 420586fd90 19e134e494
commit 7ce42aeb72
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/vpn/L2tpIpsecEditor.java
View File

@@ -34,7 +34,6 @@ class L2tpIpsecEditor extends VpnProfileEditor {
private ListPreference mUserCertificate; private ListPreference mUserCertificate;
private ListPreference mCaCertificate; private ListPreference mCaCertificate;
private ListPreference mUserkey;
private L2tpIpsecProfile mProfile; private L2tpIpsecProfile mProfile;
@@ -46,7 +45,6 @@ class L2tpIpsecEditor extends VpnProfileEditor {
@Override @Override
protected void loadExtraPreferencesTo(PreferenceGroup subpanel) { protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
Context c = subpanel.getContext(); Context c = subpanel.getContext();
subpanel.addPreference(createUserkeyPreference(c));
subpanel.addPreference(createUserCertificatePreference(c)); subpanel.addPreference(createUserCertificatePreference(c));
subpanel.addPreference(createCaCertificatePreference(c)); subpanel.addPreference(createCaCertificatePreference(c));
} }
@@ -56,8 +54,6 @@ class L2tpIpsecEditor extends VpnProfileEditor {
String result = super.validate(c); String result = super.validate(c);
if (result != null) { if (result != null) {
return result; return result;
} else if (Util.isNullOrEmpty(mUserkey.getValue())) {
return c.getString(R.string.vpn_error_userkey_not_selected);
} else if (Util.isNullOrEmpty(mUserCertificate.getValue())) { } else if (Util.isNullOrEmpty(mUserCertificate.getValue())) {
return c.getString(R.string.vpn_error_user_certificate_not_selected); return c.getString(R.string.vpn_error_user_certificate_not_selected);
} else if (Util.isNullOrEmpty(mCaCertificate.getValue())) { } else if (Util.isNullOrEmpty(mCaCertificate.getValue())) {
@@ -71,7 +67,7 @@ class L2tpIpsecEditor extends VpnProfileEditor {
mUserCertificate = createListPreference(c, mUserCertificate = createListPreference(c,
R.string.vpn_user_certificate_title, R.string.vpn_user_certificate_title,
mProfile.getUserCertificate(), mProfile.getUserCertificate(),
Keystore.getInstance().getAllCertificateKeys(), Keystore.getInstance().getAllUserCertificateKeys(),
new Preference.OnPreferenceChangeListener() { new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange( public boolean onPreferenceChange(
Preference pref, Object newValue) { Preference pref, Object newValue) {
@@ -86,7 +82,7 @@ class L2tpIpsecEditor extends VpnProfileEditor {
mCaCertificate = createListPreference(c, mCaCertificate = createListPreference(c,
R.string.vpn_ca_certificate_title, R.string.vpn_ca_certificate_title,
mProfile.getCaCertificate(), mProfile.getCaCertificate(),
Keystore.getInstance().getAllCertificateKeys(), Keystore.getInstance().getAllCaCertificateKeys(),
new Preference.OnPreferenceChangeListener() { new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange( public boolean onPreferenceChange(
Preference pref, Object newValue) { Preference pref, Object newValue) {
@@ -97,21 +93,6 @@ class L2tpIpsecEditor extends VpnProfileEditor {
return mCaCertificate; return mCaCertificate;
} }
private Preference createUserkeyPreference(Context c) {
mUserkey = createListPreference(c,
R.string.vpn_userkey_title,
mProfile.getUserkey(),
Keystore.getInstance().getAllUserkeyKeys(),
new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange(
Preference pref, Object newValue) {
mProfile.setUserkey((String) newValue);
return onPreferenceChangeCommon(pref, newValue);
}
});
return mUserkey;
}
private ListPreference createListPreference(Context c, int titleResId, private ListPreference createListPreference(Context c, int titleResId,
String text, String[] keys, String text, String[] keys,
Preference.OnPreferenceChangeListener listener) { Preference.OnPreferenceChangeListener listener) {