Small cleanup.
Check for null before comparing folder, before looking at conv list
context.
Change-Id: I254bda02cb4fdbc2878ff132b82feab13bb05647
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 4297fad..a64eb6a 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -216,7 +216,7 @@
getCursor().moveToPosition(position);
Folder folder = new Folder(getCursor());
folderItemView.bind(folder, null);
- if (TextUtils.equals(folder.id, mSelectedFolder.id)) {
+ if (mSelectedFolder != null && TextUtils.equals(folder.id, mSelectedFolder.id)) {
getListView().setItemChecked(position, true);
}
return folderItemView;
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 4d5fba0..7b9c8a4 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -211,7 +211,7 @@
protected void popView(boolean preventClose) {
// If the user is in search query entry mode, or the user is viewing search results, exit
// the mode.
- if (mConvListContext.isSearchResult()) {
+ if (mConvListContext != null && mConvListContext.isSearchResult()) {
mActivity.finish();
} else if (mViewMode.getMode() == ViewMode.CONVERSATION) {
// Go to conversation list.