summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/vpn2
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-07-02 17:18:37 -0700
committerChia-chi Yeh <chiachi@android.com>2011-07-02 17:24:15 -0700
commit0082d17ce7ad2f8b3601068e62eda92aa8670a0f (patch)
tree80256aca241e11cd073035cb4a24b7646f044d41 /src/com/android/settings/vpn2
parent1f43b33474dd011411456dbf35e1b34d54b76826 (diff)
downloadpackages_apps_settings-0082d17ce7ad2f8b3601068e62eda92aa8670a0f.zip
packages_apps_settings-0082d17ce7ad2f8b3601068e62eda92aa8670a0f.tar.gz
packages_apps_settings-0082d17ce7ad2f8b3601068e62eda92aa8670a0f.tar.bz2
VpnSettings: IPSec Hybrid RSA does not need user certificate.
Apparently I was confused... Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r--src/com/android/settings/vpn2/VpnDialog.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index 2914b1b..b3609a6 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -218,10 +218,10 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE);
// fall through
case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
- mView.findViewById(R.id.ipsec_ca).setVisibility(View.VISIBLE);
+ mView.findViewById(R.id.ipsec_user).setVisibility(View.VISIBLE);
// fall through
case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
- mView.findViewById(R.id.ipsec_user).setVisibility(View.VISIBLE);
+ mView.findViewById(R.id.ipsec_ca).setVisibility(View.VISIBLE);
break;
}
}
@@ -243,7 +243,6 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
case VpnProfile.TYPE_L2TP_IPSEC_RSA:
case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
- case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
return mIpsecUserCert.getSelectedItemPosition() != 0;
}
return false;
@@ -308,13 +307,13 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
profile.l2tpSecret = getSecret(mProfile.l2tpSecret, mL2tpSecret);
// fall through
case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
- if (mIpsecCaCert.getSelectedItemPosition() != 0) {
- profile.ipsecCaCert = (String) mIpsecCaCert.getSelectedItem();
+ if (mIpsecUserCert.getSelectedItemPosition() != 0) {
+ profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();
}
// fall through
case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
- if (mIpsecUserCert.getSelectedItemPosition() != 0) {
- profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();
+ if (mIpsecCaCert.getSelectedItemPosition() != 0) {
+ profile.ipsecCaCert = (String) mIpsecCaCert.getSelectedItem();
}
break;
}