Revert "Revert "Prevent an NPE""
This reverts commit 40197db4f04b759bbee976f83a7b32e559f45292.
Change-Id: If0c53c84fbdf6a54552f189752ab5bd4d8e8d8cf
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 425f112..9a22a60 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -4271,19 +4271,23 @@
// Now try to load our parent
final Folder folder;
- final Cursor cursor = mContext.getContentResolver().query(mFolder.parent,
- UIProvider.FOLDERS_PROJECTION, null, null, null);
+ if (mFolder != null) {
+ final Cursor cursor = mContext.getContentResolver().query(mFolder.parent,
+ UIProvider.FOLDERS_PROJECTION, null, null, null);
- if (cursor == null) {
- // We couldn't load the parent, so use the inbox
- folder = mInbox;
- } else {
- try {
- cursor.moveToFirst();
- folder = new Folder(cursor);
- } finally {
- cursor.close();
+ if (cursor == null) {
+ // We couldn't load the parent, so use the inbox
+ folder = mInbox;
+ } else {
+ try {
+ cursor.moveToFirst();
+ folder = new Folder(cursor);
+ } finally {
+ cursor.close();
+ }
}
+ } else {
+ folder = mInbox;
}
return folder;