diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-04-08 13:20:14 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-04-08 13:20:14 +0200 |
| commit | 35d3413308c842eb2f13da3c6d01478d6da16f6c (patch) | |
| tree | ab04b5ade8725268eb8a79f71b27e73c503ee848 | |
| parent | 92432b6f64bc56fcb9f59eb40b65032eae18177b (diff) | |
Remove tls-remote conversion. Let Heiko's patches handle this stuff
| -rw-r--r-- | res/layout/config_converter.xml | 8 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigConverter.java | 19 |
2 files changed, 0 insertions, 27 deletions
diff --git a/res/layout/config_converter.xml b/res/layout/config_converter.xml index ea60c076..e1231a27 100644 --- a/res/layout/config_converter.xml +++ b/res/layout/config_converter.xml @@ -12,14 +12,6 @@ android:text="@string/importpkcs12fromconfig" android:visibility="gone" /> - <CheckBox - android:id="@+id/correcttls" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:checked="true" - android:text="@string/correcttls" - android:visibility="gone" /> - <ListView android:id="@android:id/list" android:layout_width="fill_parent" diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java index ec56c73f..ae0385da 100644 --- a/src/de/blinkt/openvpn/ConfigConverter.java +++ b/src/de/blinkt/openvpn/ConfigConverter.java @@ -94,10 +94,6 @@ public class ConfigConverter extends ListActivity { Intent result = new Intent(); ProfileManager vpl = ProfileManager.getInstance(this); - if(((CheckBox)findViewById(R.id.correcttls)).isChecked() && isOldCNFormat()) { - convertTLSRemote(); - } - setUniqueProfileName(vpl); vpl.addProfile(mResult); vpl.saveProfile(this, mResult); @@ -107,15 +103,6 @@ public class ConfigConverter extends ListActivity { finish(); } - - - private void convertTLSRemote() { - if(mResult.mRemoteCN.startsWith("/")) - mResult.mRemoteCN = mResult.mRemoteCN.substring(1); - mResult.mRemoteCN = mResult.mRemoteCN.replace("/", ", "); - mResult.mX509AuthType = VpnProfile.X509_VERIFY_TLSREMOTE_DN; - } - public void showCertDialog () { try { KeyChain.choosePrivateKeyAlias(this, @@ -445,12 +432,6 @@ public class ConfigConverter extends ListActivity { findViewById(R.id.importpkcs12).setVisibility(View.VISIBLE); } - if (isOldCNFormat()) - findViewById(R.id.correcttls).setVisibility(View.VISIBLE); - } - - private boolean isOldCNFormat() { - return mResult.mCheckRemoteCN && mResult.mRemoteCN.contains("/") && ! mResult.mRemoteCN.contains("_"); } private void log(int ressourceId, Object... formatArgs) { |