Merge pull request #3740 from morckx/fix-uninitialized-drawer-use (f3686a3f) · Commits · e / os / Mail

app/ui/src/main/java/com/fsck/k9/activity/MessageList.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -1698,15 +1698,18 @@ public class MessageList extends K9Activity implements MessageListFragmentListen

		List<String> folderServerIds = search.getFolderServerIds();
		singleFolderMode = singleAccountMode && folderServerIds.size() == 1;
		if (singleFolderMode) {

		// now we know if we are in single account mode and need a subtitle
		actionBarSubTitle.setVisibility((!singleFolderMode) ? View.GONE : View.VISIBLE);

		if (drawer == null) {
		return;
		} else if (singleFolderMode) {
		drawer.selectFolder(folderServerIds.get(0));
		} else if (search.getId().equals(SearchAccount.UNIFIED_INBOX)) {
		drawer.selectUnifiedInbox();
		} else {
		drawer.selectFolder(null);
		}

		// now we know if we are in single account mode and need a subtitle
		actionBarSubTitle.setVisibility((!singleFolderMode) ? View.GONE : View.VISIBLE);
		}
		}