Merge pull request #3942 from ByteHamster/confirm-empty-trash (34c20ce3) · Commits · e / os / Mail

app/ui/src/main/java/com/fsck/k9/fragment/MessageListFragment.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -950,7 +950,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener

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

		@@ -993,6 +993,15 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		String cancelText = getString(R.string.dialog_confirm_mark_all_as_read_cancel_button);

		fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message, confirmText, cancelText);
		} else if (dialogId == R.id.dialog_confirm_empty_trash) {
		String title = getString(R.string.dialog_confirm_empty_trash_title);
		String message = getString(R.string.dialog_confirm_empty_trash_message);

		String confirmText = getString(R.string.dialog_confirm_delete_confirm_button);
		String cancelText = getString(R.string.dialog_confirm_delete_cancel_button);

		fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
		confirmText, cancelText);
		} else {
		throw new RuntimeException("Called showDialog(int) with unknown dialog id.");
		}
		@@ -2098,6 +2107,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		activeMessage = null;
		} else if (dialogId == R.id.dialog_confirm_mark_all_as_read) {
		markAllAsRead();
		} else if (dialogId == R.id.dialog_confirm_empty_trash) {
		messagingController.emptyTrash(account, null);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<resources>

		<item type="id" name="dialog_confirm_mark_all_as_read"/>
		<item type="id" name="dialog_confirm_empty_trash"/>
		<item type="id" name="dialog_confirm_delete"/>
		<item type="id" name="dialog_confirm_spam"/>
		<item type="id" name="dialog_attachment_progress"/>

+3 −0

Original line number	Diff line number	Diff line
		@@ -974,6 +974,9 @@ Please submit bug reports, contribute new features and ask questions at
		<string name="dialog_confirm_mark_all_as_read_title">Confirm mark all as read</string>
		<string name="dialog_confirm_mark_all_as_read_message">Do you want to mark all messages as read?</string>

		<string name="dialog_confirm_empty_trash_title">Confirm empty trash</string>
		<string name="dialog_confirm_empty_trash_message">Do you want to empty the trash folder?</string>

		<string name="dialog_confirm_mark_all_as_read_confirm_button">Yes</string>
		<string name="dialog_confirm_mark_all_as_read_cancel_button">No</string>