From ee523ca8fd590cb19ef60f316f68bd428f8bd605 Mon Sep 17 00:00:00 2001 From: Sander Bogaert Date: Mon, 30 Apr 2012 15:07:23 +0200 Subject: [PATCH] Enabled manual setup button when autoconfiguration not possible. Also removed red cross and excess text in that case. --- res/drawable/setup_not_ok.png | Bin 8219 -> 0 bytes .../setup/AccountSetupAutoConfiguration.java | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 res/drawable/setup_not_ok.png diff --git a/res/drawable/setup_not_ok.png b/res/drawable/setup_not_ok.png deleted file mode 100644 index 78bf50728d6ee62e587f7ab26ad0a3b68640afaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8219 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 N002ovPDHLkV1g{}avT5v diff --git a/src/com/fsck/k9/activity/setup/AccountSetupAutoConfiguration.java b/src/com/fsck/k9/activity/setup/AccountSetupAutoConfiguration.java index 671d7b917..1365697df 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupAutoConfiguration.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupAutoConfiguration.java @@ -560,7 +560,6 @@ public class AccountSetupAutoConfiguration extends K9Activity implements View.On // out of options... manual configuration }else{ bForceManual = true; - setMessage(R.string.account_setup_autoconfig_forcemanual, true); } } @@ -579,15 +578,14 @@ public class AccountSetupAutoConfiguration extends K9Activity implements View.On // 1. All good, continue if( !bForceManual ){ mStatusTitle.setText(R.string.account_setup_autoconfig_succesful_attempt); - mDoneMark.setImageResource(R.drawable.setup_ok); - mNextButton.setEnabled(true); + mDoneMark.setVisibility(View.VISIBLE); // 2. Nothing came up, must manually config.. + help? }else{ mNextButton.setText(getString(R.string.account_setup_basics_manual_setup_action)); mStatusTitle.setText(R.string.account_setup_autoconfig_forcemanual); - mDoneMark.setImageResource(R.drawable.setup_not_ok); } - mDoneMark.setVisibility(View.VISIBLE); + + mNextButton.setEnabled(true); // 3. Data did not came over HTTPS this could be UNSAFE !!!!!! if( bUnsafe ) mWarningMsg.setVisibility(View.VISIBLE);