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

Enabled manual setup button when autoconfiguration not possible. Also removed red cross and excess text in that case.

Browse Source
This commit is contained in:
Sander Bogaert 2012-04-30 15:07:23 +02:00 committed by Andrew Chen
parent 244d1319e9
commit ee523ca8fd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/setup_not_ok.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.0 KiB

8
src/com/fsck/k9/activity/setup/AccountSetupAutoConfiguration.java
View File

@ -560,7 +560,6 @@ public class AccountSetupAutoConfiguration extends K9Activity implements View.On
// out of options... manual configuration // out of options... manual configuration
}else{ }else{
bForceManual = true; 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 // 1. All good, continue
if( !bForceManual ){ if( !bForceManual ){
mStatusTitle.setText(R.string.account_setup_autoconfig_succesful_attempt); mStatusTitle.setText(R.string.account_setup_autoconfig_succesful_attempt);
mDoneMark.setImageResource(R.drawable.setup_ok); mDoneMark.setVisibility(View.VISIBLE);
mNextButton.setEnabled(true);
// 2. Nothing came up, must manually config.. + help? // 2. Nothing came up, must manually config.. + help?
}else{ }else{
mNextButton.setText(getString(R.string.account_setup_basics_manual_setup_action)); mNextButton.setText(getString(R.string.account_setup_basics_manual_setup_action));
mStatusTitle.setText(R.string.account_setup_autoconfig_forcemanual); 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 !!!!!! // 3. Data did not came over HTTPS this could be UNSAFE !!!!!!
if( bUnsafe ) mWarningMsg.setVisibility(View.VISIBLE); if( bUnsafe ) mWarningMsg.setVisibility(View.VISIBLE);