moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 07:01:50 -05:00
Code Issues Releases Wiki Activity

Allow the user to continue setup, even if their server settings don't work

Browse Source
This commit is contained in:
Jesse Vincent 2009-04-19 07:20:38 +00:00
parent 3ea142d60d
commit e24b3429dc
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -336,6 +336,7 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
<string name="account_setup_failed_dlg_certificate_message_fmt">Cannot safely connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) --> <string name="account_setup_failed_dlg_certificate_message_fmt">Cannot safely connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) -->
<string name="account_setup_failed_dlg_server_message_fmt">Cannot connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) --> <string name="account_setup_failed_dlg_server_message_fmt">Cannot connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) -->
<string name="account_setup_failed_dlg_edit_details_action">Edit details</string> <string name="account_setup_failed_dlg_edit_details_action">Edit details</string>
<string name="account_setup_failed_dlg_continue_action">Continue</string>
<string name="account_settings_title_fmt">General settings</string> <string name="account_settings_title_fmt">General settings</string>
<string name="account_settings_default">Default account</string> <string name="account_settings_default">Default account</string>

10
src/com/android/email/activity/setup/AccountSetupCheckSettings.java
View File

@ -177,6 +177,16 @@ public class AccountSetupCheckSettings extends Activity implements OnClickListen
.setTitle(getString(R.string.account_setup_failed_dlg_title)) .setTitle(getString(R.string.account_setup_failed_dlg_title))
.setMessage(getString(msgResId, args)) .setMessage(getString(msgResId, args))
.setCancelable(true) .setCancelable(true)
.setNegativeButton(
getString(R.string.account_setup_failed_dlg_continue_action),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mCanceled=false;
setResult(RESULT_OK);
finish();
}
})
.setPositiveButton( .setPositiveButton(
getString(R.string.account_setup_failed_dlg_edit_details_action), getString(R.string.account_setup_failed_dlg_edit_details_action),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {