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

Strip RE/FW from the MessageList subject line for thread subjects.

Browse Source 
"Be like Outlook."
This commit is contained in:
Andrew Chen 2012-12-06 17:41:09 -08:00
parent c81f68af33
commit 9a380c69ad
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -662,9 +662,11 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
String folderName = getFolderNameById(account, folderId); String folderName = getFolderNameById(account, folderId);
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) { if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
// If threading is enabled and this item represents a thread, display the thread contents.
long rootId = cursor.getLong(THREAD_ROOT_COLUMN); long rootId = cursor.getLong(THREAD_ROOT_COLUMN);
mFragmentListener.showThread(account, folderName, rootId); mFragmentListener.showThread(account, folderName, rootId);
} else { } else {
// This item represents a message; just display the message.
MessageReference ref = new MessageReference(); MessageReference ref = new MessageReference();
ref.accountUuid = account.getUuid(); ref.accountUuid = account.getUuid();
ref.folderName = folderName; ref.folderName = folderName;
@ -1633,13 +1635,16 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
preview = ""; preview = "";
} }
int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
String subject = cursor.getString(SUBJECT_COLUMN); String subject = cursor.getString(SUBJECT_COLUMN);
if (StringUtils.isNullOrEmpty(subject)) { if (StringUtils.isNullOrEmpty(subject)) {
subject = getString(R.string.general_no_subject); subject = getString(R.string.general_no_subject);
} else if (threadCount > 1) {
// If this is a thread, strip the RE/FW from the subject. "Be like Outlook."
subject = Utility.stripSubject(subject);
} }
int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
boolean read = (cursor.getInt(READ_COLUMN) == 1); boolean read = (cursor.getInt(READ_COLUMN) == 1);
boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1); boolean flagged = (cursor.getInt(FLAGGED_COLUMN) == 1);
boolean answered = (cursor.getInt(ANSWERED_COLUMN) == 1); boolean answered = (cursor.getInt(ANSWERED_COLUMN) == 1);