moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

fix potential NPE

This commit is contained in:
Art O Cathain 2015-06-13 15:29:58 +01:00
parent e01b1b189f
commit 2d45e53739
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k9mail/src/main/java/com/fsck/k9/activity/Accounts.java
View File

@ -1183,10 +1183,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
if (menuInfo != null) { if (menuInfo != null) {
mSelectedContextAccount = (BaseAccount)getListView().getItemAtPosition(menuInfo.position); mSelectedContextAccount = (BaseAccount)getListView().getItemAtPosition(menuInfo.position);
} }
Account realAccount = null;
if (mSelectedContextAccount instanceof Account) { if (mSelectedContextAccount instanceof Account) {
realAccount = (Account)mSelectedContextAccount; Account realAccount = (Account)mSelectedContextAccount;
}
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.delete_account: case R.id.delete_account:
onDeleteAccount(realAccount); onDeleteAccount(realAccount);
@ -1219,6 +1217,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
onMove(realAccount, false); onMove(realAccount, false);
break; break;
} }
}
return true; return true;
} }