moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Fixes Issue 1219

Browse Source 
At cketti's suggestion, change the methodology for counting
server-side unread messages on an IMAP server from STATUS (UNSEEN) to
SEARCH UNSEEN NOT DELETED.  STATUS (UNSEEN) does not ignore DELETED
but unexpunged messages and leads to incorrect results.

http://www.mail-archive.com/c-client@u.washington.edu/msg00929.html
http://www.mail-archive.com/c-client@u.washington.edu/msg00931.html

This variant only checks for unread messages in the last 300 messages
in the folder, so will be wrong if there are unread messages earlier
in the folder.  However, it'll be more often correct than the old
version for the marjority of users.

Also, change the opening of folders for IMAP IDLE purposes to
read-only using EXAMINE instead of SELECT.
This commit is contained in:
Daniel Applebaum 2010-02-13 17:02:27 +00:00
parent 645ce28e18
commit 2c3da067c3
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -350,7 +350,7 @@ public class ImapStore extends Store
private void releaseConnection(ImapConnection connection)
{
if (connection.isOpen())
if (connection != null && connection.isOpen())
{
synchronized (mConnections)
{
@ -488,6 +488,7 @@ public class ImapStore extends Store
ioExceptionHandler(mConnection, ioe);
}
}
releaseConnection(mConnection);
synchronized (this)
{
mConnection = getConnection();
@ -521,7 +522,7 @@ public class ImapStore extends Store
// executeSimpleCommand("CLOSE");
String command = String.format("SELECT \"%s\"",
String command = String.format((mode == OpenMode.READ_WRITE ? "SELECT" : "EXAMINE") + " \"%s\"",
encodeFolderName(getPrefixedName()));
List<ImapResponse> responses = executeSimpleCommand(command);
@ -530,7 +531,7 @@ public class ImapStore extends Store
* If the command succeeds we expect the folder has been opened read-write
* unless we are notified otherwise in the responses.
*/
mMode = OpenMode.READ_WRITE;
mMode = mode;
for (ImapResponse response : responses)
{
@ -833,19 +834,21 @@ public class ImapStore extends Store
checkOpen();
try
{
int unreadMessageCount = 0;
List<ImapResponse> responses = executeSimpleCommand(
String.format("STATUS \"%s\" (UNSEEN)",
encodeFolderName(getPrefixedName())));
int count = 0;
int start = mMessageCount - 299;
if (start < 1)
{
start = 1;
}
List<ImapResponse> responses = executeSimpleCommand(String.format("SEARCH %d:* UNSEEN NOT DELETED", start));
for (ImapResponse response : responses)
{
if (response.mTag == null && response.get(0).equals("STATUS"))
if (response.get(0).equals("SEARCH"))
{
ImapList status = response.getList(2);
unreadMessageCount = status.getKeyedNumber("UNSEEN");
count += response.size() - 1;
}
}
return unreadMessageCount;
return count;
}
catch (IOException ioe)
{
@ -873,8 +876,6 @@ public class ImapStore extends Store
return getMessages(start, end, false, listener);
}
protected Message[] getMessages(final int start, final int end, final boolean includeDeleted, final MessageRetrievalListener listener)
throws MessagingException
{
@ -906,7 +907,7 @@ public class ImapStore extends Store
};
return search(searcher, listener);
}
private Message[] search(ImapSearcher searcher, MessageRetrievalListener listener) throws MessagingException
{
@ -1197,7 +1198,6 @@ public class ImapStore extends Store
}
}
}
if (!partFound)
{
InputStream bodyStream = fetchList.getLiteral(index);
@ -2461,7 +2461,7 @@ public class ImapStore extends Store
Log.e(K9.LOG_TAG, "Unable to get oldUidNext for " + getLogId(), e);
}
List<ImapResponse> responses = internalOpen(OpenMode.READ_WRITE);
List<ImapResponse> responses = internalOpen(OpenMode.READ_ONLY);
if (mConnection == null)
{
receiver.pushError("Could not establish connection for IDLE", null);