From: Tobias Brunner Date: Tue, 14 Aug 2012 07:12:29 +0000 (+0200) Subject: Remove certificate spinner from edit view X-Git-Tag: 5.0.1~201 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af46e950b173a682d46cacf17e6dcb37720ecafa;p=thirdparty%2Fstrongswan.git Remove certificate spinner from edit view --- diff --git a/src/frontends/android/res/layout/profile_detail_view.xml b/src/frontends/android/res/layout/profile_detail_view.xml index 4952ebaa5d..a9302659aa 100644 --- a/src/frontends/android/res/layout/profile_detail_view.xml +++ b/src/frontends/android/res/layout/profile_detail_view.xml @@ -91,19 +91,6 @@ android:layout_height="wrap_content" android:text="@string/profile_ca_auto_label" /> - - - - \ No newline at end of file diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/res/values-de/strings.xml index 0e0ddd583d..bc426e6ea8 100644 --- a/src/frontends/android/res/values-de/strings.xml +++ b/src/frontends/android/res/values-de/strings.xml @@ -51,7 +51,6 @@ (anfordern wenn benötigt) CA-Zertifikat: Automatisch wählen - Alle Zertifikate anzeigen Bitte geben Sie hier die Gateway-Adresse ein Bitte geben Sie hier Ihren Benutzernamen ein diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml index a83e219a77..855914015a 100644 --- a/src/frontends/android/res/values/strings.xml +++ b/src/frontends/android/res/values/strings.xml @@ -51,7 +51,6 @@ (prompt when needed) CA certificate: Select automatically - Show all certificates Please enter the gateway address here Please enter your username here diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java index 05ba5e8b3c..5c87ba6a24 100644 --- a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java +++ b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java @@ -17,14 +17,10 @@ package org.strongswan.android.ui; -import java.security.cert.X509Certificate; -import java.util.Hashtable; - import org.strongswan.android.R; import org.strongswan.android.data.VpnProfile; import org.strongswan.android.data.VpnProfileDataSource; import org.strongswan.android.logic.TrustedCertificateManager; -import org.strongswan.android.ui.adapter.TrustedCertificateAdapter; import android.app.Activity; import android.app.AlertDialog; @@ -38,13 +34,10 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.Window; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemSelectedListener; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; -import android.widget.Spinner; public class VpnProfileDetailActivity extends Activity { @@ -53,13 +46,10 @@ public class VpnProfileDetailActivity extends Activity private VpnProfile mProfile; private boolean mCertsLoaded; private String mCertAlias; - private Spinner mCertSpinner; - private TrustedCertificateAdapter.CertEntry mSelectedCert; private EditText mName; private EditText mGateway; private EditText mUsername; private EditText mPassword; - private CheckBox mCheckAll; private CheckBox mCheckAuto; @Override @@ -81,42 +71,13 @@ public class VpnProfileDetailActivity extends Activity mGateway = (EditText)findViewById(R.id.gateway); mUsername = (EditText)findViewById(R.id.username); - mCheckAll = (CheckBox)findViewById(R.id.ca_show_all); mCheckAuto = (CheckBox)findViewById(R.id.ca_auto); - mCertSpinner = (Spinner)findViewById(R.id.ca_spinner); mCheckAuto.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - updateCertSpinner(); - } - }); - mCheckAll.setOnCheckedChangeListener(new OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) - { - Hashtable certs; - certs = isChecked ? TrustedCertificateManager.getInstance().getAllCACertificates() - : TrustedCertificateManager.getInstance().getUserCACertificates(); - mCertSpinner.setAdapter(new TrustedCertificateAdapter(VpnProfileDetailActivity.this, certs)); - mSelectedCert = (TrustedCertificateAdapter.CertEntry)mCertSpinner.getSelectedItem(); - } - }); - - mCertSpinner.setOnItemSelectedListener(new OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView parent, View view, - int pos, long id) - { - mSelectedCert = (TrustedCertificateAdapter.CertEntry)parent.getSelectedItem(); - } - - @Override - public void onNothingSelected(AdapterView arg0) - { - mSelectedCert = null; } }); @@ -215,64 +176,8 @@ public class VpnProfileDetailActivity extends Activity @Override protected void onPostExecute(TrustedCertificateManager result) { - TrustedCertificateAdapter adapter; - if (mCertAlias != null && mCertAlias.startsWith("system:")) - { - mCheckAll.setChecked(true); - adapter = new TrustedCertificateAdapter(VpnProfileDetailActivity.this, - result.getAllCACertificates()); - } - else - { - mCheckAll.setChecked(false); - adapter = new TrustedCertificateAdapter(VpnProfileDetailActivity.this, - result.getUserCACertificates()); - } - mCertSpinner.setAdapter(adapter); - - if (mCertAlias != null) - { - int position = adapter.getItemPosition(mCertAlias); - if (position == -1) - { /* previously selected certificate is not here anymore */ - showCertificateAlert(); - } - else - { - mCertSpinner.setSelection(position); - } - } - - mSelectedCert = (TrustedCertificateAdapter.CertEntry)mCertSpinner.getSelectedItem(); - setProgressBarIndeterminateVisibility(false); mCertsLoaded = true; - updateCertSpinner(); - } - } - - /** - * Update the CA certificate selection UI depending on whether the - * certificate should be automatically selected or not. - */ - private void updateCertSpinner() - { - if (!mCheckAuto.isChecked()) - { - if (mCertsLoaded) - { - mCertSpinner.setEnabled(true); - mCertSpinner.setVisibility(View.VISIBLE); - mCheckAll.setEnabled(true); - mCheckAll.setVisibility(View.VISIBLE); - } - } - else - { - mCertSpinner.setEnabled(false); - mCertSpinner.setVisibility(View.GONE); - mCheckAll.setEnabled(false); - mCheckAll.setVisibility(View.GONE); } } @@ -317,7 +222,7 @@ public class VpnProfileDetailActivity extends Activity mUsername.setError(getString(R.string.alert_text_no_input_username)); valid = false; } - if (!mCheckAuto.isChecked() && mSelectedCert == null) + if (!mCheckAuto.isChecked()) { showCertificateAlert(); valid = false; @@ -339,8 +244,6 @@ public class VpnProfileDetailActivity extends Activity String password = mPassword.getText().toString().trim(); password = password.isEmpty() ? null : password; mProfile.setPassword(password); - String certAlias = mCheckAuto.isChecked() ? null : mSelectedCert.mAlias; - mProfile.setCertificateAlias(certAlias); } /** @@ -368,8 +271,6 @@ public class VpnProfileDetailActivity extends Activity finish(); } } - mCheckAll.setChecked(false); mCheckAuto.setChecked(mCertAlias == null); - updateCertSpinner(); } }