Merge pull request #3788 from k9mail/empty_trash (8b3d5168) · Commits · e / os / Mail

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -1003,6 +1003,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
		} else if (id == R.id.expunge) {
		messageListFragment.onExpunge();
		return true;
		} else if (id == R.id.empty_trash) {
		messageListFragment.onEmptyTrash();
		return true;
		} else {
		return super.onOptionsItemSelected(item);
		}
		@@ -1169,6 +1172,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
		menu.findItem(R.id.select_all).setVisible(false);
		menu.findItem(R.id.send_messages).setVisible(false);
		menu.findItem(R.id.expunge).setVisible(false);
		menu.findItem(R.id.empty_trash).setVisible(false);
		menu.findItem(R.id.mark_all_as_read).setVisible(false);
		menu.findItem(R.id.show_folder_list).setVisible(false);
		} else {
		@@ -1188,8 +1192,8 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
		messageListFragment.isAccountExpungeCapable());
		menu.findItem(R.id.show_folder_list).setVisible(true);
		}

		menu.findItem(R.id.check_mail).setVisible(messageListFragment.isCheckMailSupported());
		menu.findItem(R.id.empty_trash).setVisible(messageListFragment.isShowingTrashFolder());

		// If this is an explicit local search, show the option to search on the server
		if (!messageListFragment.isRemoteSearch() &&

+10 −0

Original line number	Diff line number	Diff line
		@@ -961,6 +961,16 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		messagingController.expunge(account, folderServerId);
		}

		public void onEmptyTrash() {
		if (isShowingTrashFolder()) {
		messagingController.emptyTrash(account, null);
		}
		}

		public boolean isShowingTrashFolder() {
		return singleFolderMode && currentFolder != null && currentFolder.serverId.equals(account.getTrashFolder());
		}

		private void showDialog(int dialogId) {
		DialogFragment fragment;
		if (dialogId == R.id.dialog_confirm_spam) {

+7 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,13 @@
		app:showAsAction="never"
		android:title="@string/send_messages_action"/>

		<!-- MessageList -->
		<item
		android:id="@+id/empty_trash"
		android:alphabeticShortcut="e"
		android:title="@string/empty_trash_action"
		app:showAsAction="never" />

		<!-- MessageList -->
		<item
		android:id="@+id/expunge"