moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Trigger certificate chooser when check box checked

Browse Source 
For convenience.  Implemented in onCheckChanged().

As a consequence, onCheckChanged() must not be triggered when the instance
state is restored (would occur if the check box state was checked when
saved), otherwise the certificate chooser would pop up once the state was
restored.  Therefore, all listeners have been moved into
initializeViewListeners() which is invoked after the state has been
restored.

Because onCheckChanged() is no longer triggered in
onRestoreInstanceState(), updateViewVisibility() was implemented to
restore the view visibility.
This commit is contained in:
Joe Steele 2014-07-27 00:59:28 -04:00
parent 301ac48a38
commit cf3561da5c
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/fsck/k9/activity/setup/AccountSetupBasics.java
View File

@ -87,18 +87,19 @@ public class AccountSetupBasics extends K9Activity
mNextButton.setOnClickListener(this); mNextButton.setOnClickListener(this);
mManualSetupButton.setOnClickListener(this); mManualSetupButton.setOnClickListener(this);
if (savedInstanceState == null) {
initializeViewListeners();
validateFields();
}
}
private void initializeViewListeners() {
mEmailView.addTextChangedListener(this); mEmailView.addTextChangedListener(this);
mPasswordView.addTextChangedListener(this); mPasswordView.addTextChangedListener(this);
mClientCertificateCheckBox.setOnCheckedChangeListener(this); mClientCertificateCheckBox.setOnCheckedChangeListener(this);
mClientCertificateSpinner.setOnClientCertificateChangedListener(this); mClientCertificateSpinner.setOnClientCertificateChangedListener(this);
} }
@Override
public void onResume() {
super.onResume();
validateFields();
}
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
@ -125,6 +126,18 @@ public class AccountSetupBasics extends K9Activity
} }
mCheckedIncoming = savedInstanceState.getBoolean(STATE_KEY_CHECKED_INCOMING); mCheckedIncoming = savedInstanceState.getBoolean(STATE_KEY_CHECKED_INCOMING);
updateViewVisibility(mClientCertificateCheckBox.isChecked());
/*
* We wait until now to initialize the listeners because we didn't want
* the OnCheckedChangeListener active while the
* mClientCertificateCheckBox state was being restored because it could
* trigger the pop-up of a ClientCertificateSpinner.chooseCertificate()
* dialog.
*/
initializeViewListeners();
validateFields();
} }
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
@ -147,7 +160,17 @@ public class AccountSetupBasics extends K9Activity
*/ */
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
updateViewVisibility(isChecked);
validateFields();
// Have the user select (or confirm) the client certificate
if (isChecked) { if (isChecked) {
mClientCertificateSpinner.chooseCertificate();
}
}
private void updateViewVisibility(boolean usingCertificates) {
if (usingCertificates) {
// hide password fields, show client certificate spinner // hide password fields, show client certificate spinner
mPasswordView.setVisibility(View.GONE); mPasswordView.setVisibility(View.GONE);
mClientCertificateSpinner.setVisibility(View.VISIBLE); mClientCertificateSpinner.setVisibility(View.VISIBLE);
@ -156,7 +179,6 @@ public class AccountSetupBasics extends K9Activity
mPasswordView.setVisibility(View.VISIBLE); mPasswordView.setVisibility(View.VISIBLE);
mClientCertificateSpinner.setVisibility(View.GONE); mClientCertificateSpinner.setVisibility(View.GONE);
} }
validateFields();
} }
private void validateFields() { private void validateFields() {