wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't allow messages in Outbox to be starred or marked as read via message list

Browse source
This commit is contained in:
cketti 2020-10-22 17:36:13 +02:00
parent 741bbe9ca8
commit 8abcba90c0
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.java
View file

@ -1213,8 +1213,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
menu.findItem(R.id.set_sort).setVisible(true);
menu.findItem(R.id.select_all).setVisible(true);
menu.findItem(R.id.compose).setVisible(true);
menu.findItem(R.id.mark_all_as_read).setVisible(
messageListFragment.isMarkAllAsReadSupported());
menu.findItem(R.id.mark_all_as_read).setVisible(messageListFragment.isMarkAllAsReadSupported());
if (!messageListFragment.isSingleAccountMode()) {
menu.findItem(R.id.expunge).setVisible(false);

13
app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
View file

@ -491,10 +491,11 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
private MessageListAppearance getMessageListAppearance() {
boolean showAccountChip = !isSingleAccountMode();
boolean showStars = !isOutbox() && K9.isShowMessageListStars();
return new MessageListAppearance(
K9.getFontSizes(),
K9.getMessageListPreviewLines(),
K9.isShowMessageListStars(),
showStars,
K9.isMessageListSenderAboveSubject(),
K9.isShowContactPicture(),
showingThreadedList,
@ -1600,6 +1601,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
private MenuItem mMarkAsUnread;
private MenuItem mFlag;
private MenuItem mUnflag;
private boolean disableMarkAsRead;
private boolean disableFlag;
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
@ -1731,6 +1734,8 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
menu.findItem(R.id.unflag).setVisible(false);
menu.findItem(R.id.spam).setVisible(false);
menu.findItem(R.id.move).setVisible(false);
disableMarkAsRead = true;
disableFlag = true;
if (account.hasDraftsFolder()) {
menu.findItem(R.id.move_to_drafts).setVisible(true);
@ -1745,14 +1750,14 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
}
public void showMarkAsRead(boolean show) {
if (actionMode != null) {
if (actionMode != null && !disableMarkAsRead) {
mMarkAsRead.setVisible(show);
mMarkAsUnread.setVisible(!show);
}
}
public void showFlag(boolean show) {
if (actionMode != null) {
if (actionMode != null && !disableFlag) {
mFlag.setVisible(show);
mUnflag.setVisible(!show);
}
@ -2349,7 +2354,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
}
public boolean isMarkAllAsReadSupported() {
return (isSingleAccountMode() && isSingleFolderMode());
return isSingleAccountMode() && isSingleFolderMode() && !isOutbox();
}
public void confirmMarkAllAsRead() {