moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

remove a special flag in FolderInfoHolder that we only use twice and

Browse Source 
appear to initialize unreliably in favor of some simple checks.
This commit is contained in:
Jesse Vincent 2010-11-13 03:09:27 +00:00
parent 27d3e6312b
commit 3779237eb8
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/fsck/k9/activity/FolderInfoHolder.java
View File

@ -22,11 +22,6 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
public Folder folder; public Folder folder;
public boolean pushActive; public boolean pushActive;
/**
* Outbox is handled differently from any other folder.
*/
public boolean outbox;
@Override @Override
public boolean equals(Object o) public boolean equals(Object o)
{ {
@ -133,7 +128,6 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
if (this.name.equals(account.getOutboxFolderName())) if (this.name.equals(account.getOutboxFolderName()))
{ {
this.displayName = String.format(context.getString(R.string.special_mailbox_name_outbox_fmt), this.name); this.displayName = String.format(context.getString(R.string.special_mailbox_name_outbox_fmt), this.name);
this.outbox = true;
} }
if (this.name.equals(account.getDraftsFolderName())) if (this.name.equals(account.getDraftsFolderName()))

2
src/com/fsck/k9/activity/FolderList.java
View File

@ -766,7 +766,7 @@ public class FolderList extends K9ListActivity
if (!folder.name.equals(mAccount.getTrashFolderName())) if (!folder.name.equals(mAccount.getTrashFolderName()))
menu.findItem(R.id.empty_trash).setVisible(false); menu.findItem(R.id.empty_trash).setVisible(false);
if (folder.outbox) if (folder.name.equals(mAccount.getOutboxFolderName()))
{ {
menu.findItem(R.id.check_mail).setVisible(false); menu.findItem(R.id.check_mail).setVisible(false);
} }

2
src/com/fsck/k9/activity/MessageList.java
View File

@ -1750,7 +1750,7 @@ public class MessageList
} }
else else
{ {
if (mCurrentFolder != null && mCurrentFolder.outbox) if (mCurrentFolder != null && mCurrentFolder.name.equals(mAccount.getOutboxFolderName()))
{ {
menu.findItem(R.id.check_mail).setVisible(false); menu.findItem(R.id.check_mail).setVisible(false);
} }