moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 10:22:15 -05:00
Code Issues Releases Wiki Activity

Refactor FolderInfoHolder to remove copy-paste code

Browse Source
This commit is contained in:
Jesse Vincent 2010-11-13 03:09:23 +00:00
parent a8de2d0000
commit 27d3e6312b
1 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,12 +75,12 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
populate(context, folder, account); populate(context, folder, account);
} }
public FolderInfoHolder(Context context, Folder folder, Account mAccount, int unreadCount) public FolderInfoHolder(Context context, Folder folder, Account account, int unreadCount)
{ {
populate(context, folder, mAccount, unreadCount); populate(context, folder, account, unreadCount);
} }
public void populate(Context context, Folder folder, Account mAccount, int unreadCount) public void populate(Context context, Folder folder, Account account, int unreadCount)
{ {
try try
@ -93,53 +93,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
Log.e(K9.LOG_TAG, "Folder.getUnreadMessageCount() failed", me); Log.e(K9.LOG_TAG, "Folder.getUnreadMessageCount() failed", me);
} }
this.name = folder.getName(); populate(context,folder,account);
if (this.name.equalsIgnoreCase(K9.INBOX))
{
this.displayName = context.getString(R.string.special_mailbox_name_inbox);
}
else
{
this.displayName = folder.getName();
}
if (this.name.equals(mAccount.getOutboxFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_outbox_fmt), this.name);
this.outbox = true;
}
if (this.name.equals(mAccount.getDraftsFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_drafts_fmt), this.name);
}
if (this.name.equals(mAccount.getTrashFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_trash_fmt), this.name);
}
if (this.name.equals(mAccount.getSentFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_sent_fmt), this.name);
}
if (this.name.equals(mAccount.getArchiveFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_archive_fmt), this.name);
}
if (this.name.equals(mAccount.getSpamFolderName()))
{
this.displayName = String.format(context.getString(R.string.special_mailbox_name_spam_fmt), this.name);
}
this.lastChecked = folder.getLastUpdate();
String mess = truncateStatus(folder.getStatus());
this.status = mess;
this.unreadMessageCount = unreadCount; this.unreadMessageCount = unreadCount;
@ -161,6 +115,11 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
{ {
this.folder = folder; this.folder = folder;
this.name = folder.getName(); this.name = folder.getName();
this.lastChecked = folder.getLastUpdate();
String mess = truncateStatus(folder.getStatus());
this.status = mess;
if (this.name.equalsIgnoreCase(K9.INBOX)) if (this.name.equalsIgnoreCase(K9.INBOX))
{ {
@ -168,7 +127,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
} }
else else
{ {
this.displayName = this.name; this.displayName = folder.getName();
} }
if (this.name.equals(account.getOutboxFolderName())) if (this.name.equals(account.getOutboxFolderName()))