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

VpnSettings: IPSec Hybrid RSA does not need user certificate.

Browse Source 
Apparently I was confused...

Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d
This commit is contained in:
Chia-chi Yeh
2011-07-02 17:18:37 -07:00
parent 1f43b33474
commit 0082d17ce7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/vpn2/VpnDialog.java
View File

@@ -218,10 +218,10 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE); mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE);
// fall through // fall through
case VpnProfile.TYPE_IPSEC_XAUTH_RSA: 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 // fall through
case VpnProfile.TYPE_IPSEC_HYBRID_RSA: 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; break;
} }
} }
@@ -243,7 +243,6 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
case VpnProfile.TYPE_L2TP_IPSEC_RSA: case VpnProfile.TYPE_L2TP_IPSEC_RSA:
case VpnProfile.TYPE_IPSEC_XAUTH_RSA: case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
return mIpsecUserCert.getSelectedItemPosition() != 0; return mIpsecUserCert.getSelectedItemPosition() != 0;
} }
return false; return false;
@@ -308,13 +307,13 @@ class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListen
profile.l2tpSecret = getSecret(mProfile.l2tpSecret, mL2tpSecret); profile.l2tpSecret = getSecret(mProfile.l2tpSecret, mL2tpSecret);
// fall through // fall through
case VpnProfile.TYPE_IPSEC_XAUTH_RSA: case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
if (mIpsecCaCert.getSelectedItemPosition() != 0) { if (mIpsecUserCert.getSelectedItemPosition() != 0) {
profile.ipsecCaCert = (String) mIpsecCaCert.getSelectedItem(); profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();
} }
// fall through // fall through
case VpnProfile.TYPE_IPSEC_HYBRID_RSA: case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
if (mIpsecUserCert.getSelectedItemPosition() != 0) { if (mIpsecCaCert.getSelectedItemPosition() != 0) {
profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem(); profile.ipsecCaCert = (String) mIpsecCaCert.getSelectedItem();
} }
break; break;
} }