diff options
| author | schwabe <devnull@localhost> | 2012-04-29 16:05:44 +0200 |
|---|---|---|
| committer | schwabe <devnull@localhost> | 2012-04-29 16:05:44 +0200 |
| commit | ec65a38af4edc986f7f1a90e446cc8713c9ca05e (patch) | |
| tree | e3c5d76eb4b2b10cdeefbadedb6e524e369e79f6 /src/de/blinkt/openvpn/BasicSettings.java | |
| parent | 97609f39a5ec3a4f332bd7eec79aae91cd7dd56a (diff) | |
Version 0.4 had a User/password and static keys options that will not work. Fix that
Diffstat (limited to 'src/de/blinkt/openvpn/BasicSettings.java')
| -rw-r--r-- | src/de/blinkt/openvpn/BasicSettings.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/BasicSettings.java b/src/de/blinkt/openvpn/BasicSettings.java index 7c39eb94..51a4c2bc 100644 --- a/src/de/blinkt/openvpn/BasicSettings.java +++ b/src/de/blinkt/openvpn/BasicSettings.java @@ -173,10 +173,12 @@ public class BasicSettings extends Fragment implements View.OnClickListener, OnI mView.findViewById(R.id.certs).setVisibility(View.GONE); mView.findViewById(R.id.statickeys).setVisibility(View.GONE); mView.findViewById(R.id.keystore).setVisibility(View.GONE); + mView.findViewById(R.id.cacert).setVisibility(View.GONE); switch(type) { case VpnProfile.TYPE_CERTIFICATES: mView.findViewById(R.id.certs).setVisibility(View.VISIBLE); + mView.findViewById(R.id.cacert).setVisibility(View.VISIBLE); break; case VpnProfile.TYPE_PKCS12: mView.findViewById(R.id.pkcs12).setVisibility(View.VISIBLE); @@ -190,6 +192,8 @@ public class BasicSettings extends Fragment implements View.OnClickListener, OnI case VpnProfile.TYPE_USERPASS: mView.findViewById(R.id.userpassword).setVisibility(View.VISIBLE); + mView.findViewById(R.id.cacert).setVisibility(View.VISIBLE); + break; } @@ -208,7 +212,9 @@ public class BasicSettings extends Fragment implements View.OnClickListener, OnI mType.setSelection(mProfile.mAuthenticationType); mpkcs12.setData(mProfile.mPKCS12Filename); mPKCS12Password.setText(mProfile.mPKCS12Password); - + mUserName.setText(mProfile.mUsername); + mPassword.setText(mProfile.mPassword); + setAlias(); } @@ -229,6 +235,8 @@ public class BasicSettings extends Fragment implements View.OnClickListener, OnI mProfile.mPKCS12Filename = mpkcs12.getData(); mProfile.mPKCS12Password = mPKCS12Password.getText().toString(); + mProfile.mPassword = mPassword.getText().toString(); + mProfile.mUsername = mUserName.getText().toString(); } |