ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 694fe3b0: Merge "Safer error handling in AccountNames" into froyo

Browse Source 
Merge commit '694fe3b0c7a1dd8759795edc3ffa440bdfd5ce37' into froyo-plus-aosp

* commit '694fe3b0c7a1dd8759795edc3ffa440bdfd5ce37':
  Safer error handling in AccountNames
This commit is contained in:
Andrew Stadler 2010-04-14 17:45:49 -07:00 committed by Android Git Automerger
commit 1ec609e99e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/email/activity/setup/AccountSetupNames.java
View File

@ -19,6 +19,7 @@ package com.android.email.activity.setup;
import com.android.email.AccountBackupRestore; import com.android.email.AccountBackupRestore;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.activity.Welcome;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
@ -93,7 +94,11 @@ public class AccountSetupNames extends Activity implements OnClickListener {
mAccount = EmailContent.Account.restoreAccountWithId(this, accountId); mAccount = EmailContent.Account.restoreAccountWithId(this, accountId);
// Shouldn't happen, but it could // Shouldn't happen, but it could
if (mAccount == null) { if (mAccount == null) {
onBackPressed(); // The safe thing to do here is to rewind all the way to the entry activity,
// which can handle any configuration of accounts (0, 1, or 2+)
Welcome.actionStart(this);
finish();
return;
} }
// Get the hostAuth for receiving // Get the hostAuth for receiving
HostAuth hostAuth = HostAuth.restoreHostAuthWithId(this, mAccount.mHostAuthKeyRecv); HostAuth hostAuth = HostAuth.restoreHostAuthWithId(this, mAccount.mHostAuthKeyRecv);