From a3dc230855059ba31a188213ccf3b215b5ad30eb Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 12 Jun 2014 02:21:53 +0000 Subject: [PATCH] Outbox emails stay marked as unread until sent --- src/i2p/bote/android/EmailListFragment.java | 10 ++++++++-- src/i2p/bote/android/ViewEmailActivity.java | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/i2p/bote/android/EmailListFragment.java b/src/i2p/bote/android/EmailListFragment.java index 2b79d62..1faab81 100644 --- a/src/i2p/bote/android/EmailListFragment.java +++ b/src/i2p/bote/android/EmailListFragment.java @@ -321,6 +321,10 @@ public class EmailListFragment extends ListFragment implements // Inflate the menu for the CAB MenuInflater inflater = mode.getMenuInflater(); inflater.inflate(R.menu.email_list_context, menu); + if (BoteHelper.isOutbox(mFolder)) { + menu.findItem(R.id.action_mark_read).setVisible(false); + menu.findItem(R.id.action_mark_unread).setVisible(false); + } // Only allow moving from the trash // TODO change this when user folders are implemented if (!BoteHelper.isTrash(mFolder)) @@ -342,8 +346,10 @@ public class EmailListFragment extends ListFragment implements public boolean onPrepareActionMode(ActionMode mode, Menu menu) { // Here you can perform updates to the CAB due to // an invalidate() request - menu.findItem(R.id.action_mark_read).setVisible(areUnread); - menu.findItem(R.id.action_mark_unread).setVisible(!areUnread); + if (!BoteHelper.isOutbox(mFolder)) { + menu.findItem(R.id.action_mark_read).setVisible(areUnread); + menu.findItem(R.id.action_mark_unread).setVisible(!areUnread); + } return true; } } diff --git a/src/i2p/bote/android/ViewEmailActivity.java b/src/i2p/bote/android/ViewEmailActivity.java index 7e19c1d..db7e0e3 100644 --- a/src/i2p/bote/android/ViewEmailActivity.java +++ b/src/i2p/bote/android/ViewEmailActivity.java @@ -61,7 +61,8 @@ public class ViewEmailActivity extends ActionBarActivity implements // Mark the visible email as not new if (mMessageId != null) { try { - mFolder.setNew(mMessageId, false); + if (!BoteHelper.isOutbox(mFolder)) + mFolder.setNew(mMessageId, false); mFolder.setRecent(mMessageId, false); } catch (PasswordException e) { // TODO Auto-generated catch block @@ -189,7 +190,8 @@ public class ViewEmailActivity extends ActionBarActivity implements // Mark the current email as not new if (mMessageId != null) { try { - mFolder.setNew(mMessageId, false); + if (!BoteHelper.isOutbox(mFolder)) + mFolder.setNew(mMessageId, false); mFolder.setRecent(mMessageId, false); } catch (PasswordException e) { // TODO Auto-generated catch block