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

Avoid NullPointerException in Accounts.onCreateDialog()

Browse Source 
Also cleaned up code formatting of onCreateDialog() and
onPrepareDialog().
This commit is contained in:
cketti 2012-03-17 20:12:33 +01:00
parent ef01dc906b
commit 69ee6a4818
1 changed files with 108 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/com/fsck/k9/activity/Accounts.java
View File

@ -918,8 +918,14 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
@Override @Override
public Dialog onCreateDialog(int id) { public Dialog onCreateDialog(int id) {
// Android recreates our dialogs on configuration changes even when they have been
// dismissed. Make sure we have all information necessary before creating a new dialog.
switch (id) { switch (id) {
case DIALOG_REMOVE_ACCOUNT: case DIALOG_REMOVE_ACCOUNT: {
if (mSelectedContextAccount == null) {
return null;
}
return ConfirmationDialog.create(this, id, return ConfirmationDialog.create(this, id,
R.string.account_delete_dlg_title, R.string.account_delete_dlg_title,
getString(R.string.account_delete_dlg_instructions_fmt, getString(R.string.account_delete_dlg_instructions_fmt,
@ -930,23 +936,28 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
@Override @Override
public void run() { public void run() {
if (mSelectedContextAccount instanceof Account) { if (mSelectedContextAccount instanceof Account) {
Account realAccount = (Account)mSelectedContextAccount; Account realAccount = (Account) mSelectedContextAccount;
try { try {
realAccount.getLocalStore().delete(); realAccount.getLocalStore().delete();
} catch (Exception e) { } catch (Exception e) {
// Ignore, this may lead to localStores on sd-cards that are // Ignore, this may lead to localStores on sd-cards that
// currently not inserted to be left // are currently not inserted to be left
} }
MessagingController.getInstance(getApplication()) MessagingController.getInstance(getApplication())
.notifyAccountCancel(Accounts.this, realAccount); .notifyAccountCancel(Accounts.this, realAccount);
Preferences.getPreferences(Accounts.this).deleteAccount(realAccount); Preferences.getPreferences(Accounts.this)
.deleteAccount(realAccount);
K9.setServicesEnabled(Accounts.this); K9.setServicesEnabled(Accounts.this);
refresh(); refresh();
} }
} }
}); });
}
case DIALOG_CLEAR_ACCOUNT: {
if (mSelectedContextAccount == null) {
return null;
}
case DIALOG_CLEAR_ACCOUNT:
return ConfirmationDialog.create(this, id, return ConfirmationDialog.create(this, id,
R.string.account_clear_dlg_title, R.string.account_clear_dlg_title,
getString(R.string.account_clear_dlg_instructions_fmt, getString(R.string.account_clear_dlg_instructions_fmt,
@ -957,14 +968,20 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
@Override @Override
public void run() { public void run() {
if (mSelectedContextAccount instanceof Account) { if (mSelectedContextAccount instanceof Account) {
Account realAccount = (Account)mSelectedContextAccount; Account realAccount = (Account) mSelectedContextAccount;
mHandler.workingAccount(realAccount, R.string.clearing_account); mHandler.workingAccount(realAccount,
MessagingController.getInstance(getApplication()).clear(realAccount, null); R.string.clearing_account);
MessagingController.getInstance(getApplication())
.clear(realAccount, null);
} }
} }
}); });
}
case DIALOG_RECREATE_ACCOUNT: {
if (mSelectedContextAccount == null) {
return null;
}
case DIALOG_RECREATE_ACCOUNT:
return ConfirmationDialog.create(this, id, return ConfirmationDialog.create(this, id,
R.string.account_recreate_dlg_title, R.string.account_recreate_dlg_title,
getString(R.string.account_recreate_dlg_instructions_fmt, getString(R.string.account_recreate_dlg_instructions_fmt,
@ -975,13 +992,16 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
@Override @Override
public void run() { public void run() {
if (mSelectedContextAccount instanceof Account) { if (mSelectedContextAccount instanceof Account) {
Account realAccount = (Account)mSelectedContextAccount; Account realAccount = (Account) mSelectedContextAccount;
mHandler.workingAccount(realAccount, R.string.recreating_account); mHandler.workingAccount(realAccount,
MessagingController.getInstance(getApplication()).recreate(realAccount, null); R.string.recreating_account);
MessagingController.getInstance(getApplication())
.recreate(realAccount, null);
} }
} }
}); });
case DIALOG_NO_FILE_MANAGER: }
case DIALOG_NO_FILE_MANAGER: {
return ConfirmationDialog.create(this, id, return ConfirmationDialog.create(this, id,
R.string.import_dialog_error_title, R.string.import_dialog_error_title,
getString(R.string.import_dialog_error_message), getString(R.string.import_dialog_error_message),
@ -996,29 +1016,30 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
} }
}); });
} }
}
return super.onCreateDialog(id); return super.onCreateDialog(id);
} }
@Override @Override
public void onPrepareDialog(int id, Dialog d) { public void onPrepareDialog(int id, Dialog d) {
AlertDialog alert = (AlertDialog) d; AlertDialog alert = (AlertDialog) d;
switch (id) { switch (id) {
case DIALOG_REMOVE_ACCOUNT: case DIALOG_REMOVE_ACCOUNT: {
alert.setMessage(getString(R.string.account_delete_dlg_instructions_fmt, alert.setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
mSelectedContextAccount.getDescription())); mSelectedContextAccount.getDescription()));
break; break;
case DIALOG_CLEAR_ACCOUNT: }
case DIALOG_CLEAR_ACCOUNT: {
alert.setMessage(getString(R.string.account_clear_dlg_instructions_fmt, alert.setMessage(getString(R.string.account_clear_dlg_instructions_fmt,
mSelectedContextAccount.getDescription())); mSelectedContextAccount.getDescription()));
break; break;
case DIALOG_RECREATE_ACCOUNT: }
case DIALOG_RECREATE_ACCOUNT: {
alert.setMessage(getString(R.string.account_recreate_dlg_instructions_fmt, alert.setMessage(getString(R.string.account_recreate_dlg_instructions_fmt,
mSelectedContextAccount.getDescription())); mSelectedContextAccount.getDescription()));
break; break;
case DIALOG_NO_FILE_MANAGER: }
alert.setMessage(getString(R.string.import_dialog_error_message));
break;
} }
super.onPrepareDialog(id, d); super.onPrepareDialog(id, d);