diff options
Diffstat (limited to 'src/com/android/settings/vpn2/VpnDialog.java')
| -rw-r--r-- | src/com/android/settings/vpn2/VpnDialog.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java index aaae887..ca85d99 100644 --- a/src/com/android/settings/vpn2/VpnDialog.java +++ b/src/com/android/settings/vpn2/VpnDialog.java @@ -102,8 +102,10 @@ class VpnDialog extends AlertDialog implements TextWatcher, mName.setText(mProfile.name); mType.setSelection(mProfile.type); mServer.setText(mProfile.server); - mUsername.setText(mProfile.username); - mPassword.setText(mProfile.password); + if (mProfile.saveLogin) { + mUsername.setText(mProfile.username); + mPassword.setText(mProfile.password); + } mSearchDomains.setText(mProfile.searchDomains); mDnsServers.setText(mProfile.dnsServers); mRoutes.setText(mProfile.routes); @@ -111,7 +113,7 @@ class VpnDialog extends AlertDialog implements TextWatcher, mL2tpSecret.setText(mProfile.l2tpSecret); mIpsecIdentifier.setText(mProfile.ipsecIdentifier); mIpsecSecret.setText(mProfile.ipsecSecret); - loadCertificates(mIpsecUserCert, Credentials.USER_CERTIFICATE, + loadCertificates(mIpsecUserCert, Credentials.USER_PRIVATE_KEY, 0, mProfile.ipsecUserCert); loadCertificates(mIpsecCaCert, Credentials.CA_CERTIFICATE, R.string.vpn_no_ca_cert, mProfile.ipsecCaCert); |