1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -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);