Always hide the batch archive button in a search view, consistent with the batch ops menu. (50b20564) · Commits · e / os / Mail

src/com/fsck/k9/activity/MessageList.java

+3 −22

Original line number	Diff line number	Diff line
		@@ -827,12 +827,11 @@ public class MessageList

		mController.addListener(mAdapter.mListener);

		final Preferences preferences = Preferences.getPreferences(this);

		Account[] accountsWithNotification;
		if (mAccount != null) {
		accountsWithNotification = new Account[] { mAccount };
		} else {
		Preferences preferences = Preferences.getPreferences(this);
		accountsWithNotification = preferences.getAccounts();
		}

		@@ -849,27 +848,9 @@ public class MessageList
		}
		} else if (mQueryString != null) {
		mController.searchLocalMessages(mAccountUuids, mFolderNames, null, mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, mAdapter.mListener);
		boolean hasArchiveFolder = false;
		if(mAccountUuids == null) {
		for (final Account acct : preferences.getAccounts()) {
		if (acct != null && acct.hasArchiveFolder()) {
		hasArchiveFolder = true;
		break;
		}
		}
		} else {
		for (final String accountUuid : mAccountUuids) {
		final Account acct = preferences.getAccount(accountUuid);
		if (acct != null && acct.hasArchiveFolder()) {
		hasArchiveFolder = true;
		break;
		}
		}
		}
		if (!hasArchiveFolder) {
		// Don't show the archive button if this is a search.
		mBatchArchiveButton.setVisibility(View.GONE);
		}
		}

		} else {
		// reread the selected date format preference in case it has changed