wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes Issue 868

Browse source 
When connected to a server that does not automatically send an
untagged UIDNEXT with the responses to SELECT, explicitly SEARCH for
the currently highest UID in the folder on the server and then add 1
to it to get the UIDNEXT.
This commit is contained in:
Daniel Applebaum 2010-04-27 04:06:26 +00:00
parent 3f771474c1
commit 0459be3bb8
1 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/com/fsck/k9/mail/store/ImapStore.java
View file

@ -890,6 +890,31 @@ public class ImapStore extends Store
throw ioExceptionHandler(mConnection, ioe);
}
}
protected int getHighestUid()
{
try
{
ImapSearcher searcher = new ImapSearcher()
{
public List<ImapResponse> search() throws IOException, MessagingException
{
return executeSimpleCommand(String.format("UID SEARCH *:* "));
}
};
Message[] messages = search(searcher, null);
if (messages.length > 0)
{
return Integer.parseInt(messages[0].getUid());
}
}
catch (Exception e)
{
Log.e(K9.LOG_TAG, "Unable to find highest UID in folder " + getName(), e);
}
return -1;
}
@Override
public void delete(boolean recurse) throws MessagingException
@ -2643,21 +2668,42 @@ public class ImapStore extends Store
receiver.syncFolder(ImapFolderPusher.this);
}
int startUid = oldUidNext;
if (startUid < uidNext - mAccount.getDisplayCount())
int newUidNext = uidNext;
if (newUidNext == -1)
{
startUid = uidNext - mAccount.getDisplayCount();
if (K9.DEBUG)
{
Log.d(K9.LOG_TAG, "uidNext is -1, using search to find highest UID");
}
int highestUid = getHighestUid();
if (highestUid != -1)
{
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "highest UID = " + highestUid);
newUidNext = highestUid + 1;
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "highest UID = " + highestUid
+ ", set newUidNext to " + newUidNext);
}
}
if (startUid < newUidNext - mAccount.getDisplayCount())
{
startUid = newUidNext - mAccount.getDisplayCount();
}
if (startUid < 1)
{
startUid = 1;
}
if (uidNext > startUid)
if (newUidNext > startUid)
{
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Needs sync from uid " + startUid + " to " + uidNext + " for " + getLogId());
Log.i(K9.LOG_TAG, "Needs sync from uid " + startUid + " to " + newUidNext + " for " + getLogId());
List<Message> messages = new ArrayList<Message>();
for (int uid = startUid; uid < uidNext; uid++)
for (int uid = startUid; uid < newUidNext; uid++)
{
ImapMessage message = new ImapMessage("" + uid, ImapFolderPusher.this);
messages.add(message);