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

Merge branch 'pullreq153'

Browse Source
This commit is contained in:
cketti 2012-07-07 15:06:41 +02:00
commit 08c6c63b31
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/fsck/k9/mail/store/ImapResponseParser.java
View File

@ -384,6 +384,10 @@ public class ImapResponseParser {
return (String)get(index); return (String)get(index);
} }
public long getLong(int index) {
return Long.parseLong(getString(index));
}
public int getNumber(int index) { public int getNumber(int index) {
return Integer.parseInt(getString(index)); return Integer.parseInt(getString(index));
} }

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

@ -811,12 +811,12 @@ public class ImapStore extends Store {
class ImapFolder extends Folder { class ImapFolder extends Folder {
private String mName; private String mName;
protected volatile int mMessageCount = -1; protected volatile int mMessageCount = -1;
protected volatile int uidNext = -1; protected volatile long uidNext = -1L;
protected volatile ImapConnection mConnection; protected volatile ImapConnection mConnection;
private OpenMode mMode; private OpenMode mMode;
private volatile boolean mExists; private volatile boolean mExists;
private ImapStore store = null; private ImapStore store = null;
Map<Integer, String> msgSeqUidMap = new ConcurrentHashMap<Integer, String>(); Map<Long, String> msgSeqUidMap = new ConcurrentHashMap<Long, String>();
public ImapFolder(ImapStore nStore, String name) { public ImapFolder(ImapStore nStore, String name) {
@ -1305,7 +1305,7 @@ public class ImapStore extends Store {
return search(searcher, listener); return search(searcher, listener);
} }
protected Message[] getMessages(final List<Integer> mesgSeqs, final boolean includeDeleted, final MessageRetrievalListener listener) protected Message[] getMessages(final List<Long> mesgSeqs, final boolean includeDeleted, final MessageRetrievalListener listener)
throws MessagingException { throws MessagingException {
ImapSearcher searcher = new ImapSearcher() { ImapSearcher searcher = new ImapSearcher() {
public List<ImapResponse> search() throws IOException, MessagingException { public List<ImapResponse> search() throws IOException, MessagingException {
@ -1472,7 +1472,7 @@ public class ImapStore extends Store {
if (response.mTag == null && ImapResponseParser.equalsIgnoreCase(response.get(1), "FETCH")) { if (response.mTag == null && ImapResponseParser.equalsIgnoreCase(response.get(1), "FETCH")) {
ImapList fetchList = (ImapList)response.getKeyedValue("FETCH"); ImapList fetchList = (ImapList)response.getKeyedValue("FETCH");
String uid = fetchList.getKeyedString("UID"); String uid = fetchList.getKeyedString("UID");
int msgSeq = response.getNumber(0); long msgSeq = response.getLong(0);
if (uid != null) { if (uid != null) {
try { try {
msgSeqUidMap.put(msgSeq, uid); msgSeqUidMap.put(msgSeq, uid);
@ -1699,7 +1699,7 @@ public class ImapStore extends Store {
if (keyObj instanceof String) { if (keyObj instanceof String) {
String key = (String)keyObj; String key = (String)keyObj;
if ("UIDNEXT".equalsIgnoreCase(key)) { if ("UIDNEXT".equalsIgnoreCase(key)) {
uidNext = bracketed.getNumber(1); uidNext = bracketed.getLong(1);
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Got UidNext = " + uidNext + " for " + getLogId()); Log.d(K9.LOG_TAG, "Got UidNext = " + uidNext + " for " + getLogId());
} }
@ -2826,9 +2826,9 @@ public class ImapStore extends Store {
if (stop.get()) { if (stop.get()) {
continue; continue;
} }
int startUid = oldUidNext; long startUid = oldUidNext;
int newUidNext = uidNext; long newUidNext = uidNext;
if (newUidNext == -1) { if (newUidNext == -1) {
if (K9.DEBUG) { if (K9.DEBUG) {
@ -2856,7 +2856,7 @@ public class ImapStore extends Store {
if (K9.DEBUG) if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Needs sync from uid " + startUid + " to " + newUidNext + " for " + getLogId()); Log.i(K9.LOG_TAG, "Needs sync from uid " + startUid + " to " + newUidNext + " for " + getLogId());
List<Message> messages = new ArrayList<Message>(); List<Message> messages = new ArrayList<Message>();
for (int uid = startUid; uid < newUidNext; uid++) { for (long uid = startUid; uid < newUidNext; uid++) {
ImapMessage message = new ImapMessage("" + uid, ImapFolderPusher.this); ImapMessage message = new ImapMessage("" + uid, ImapFolderPusher.this);
messages.add(message); messages.add(message);
} }
@ -2956,7 +2956,7 @@ public class ImapStore extends Store {
if (oldMessageCount == -1) { if (oldMessageCount == -1) {
skipSync = true; skipSync = true;
} }
List<Integer> flagSyncMsgSeqs = new ArrayList<Integer>(); List<Long> flagSyncMsgSeqs = new ArrayList<Long>();
List<String> removeMsgUids = new LinkedList<String>(); List<String> removeMsgUids = new LinkedList<String>();
for (ImapResponse response : responses) { for (ImapResponse response : responses) {
@ -3021,7 +3021,7 @@ public class ImapStore extends Store {
} }
} }
private void syncMessages(List<Integer> flagSyncMsgSeqs) { private void syncMessages(List<Long> flagSyncMsgSeqs) {
try { try {
Message[] messageArray = null; Message[] messageArray = null;
@ -3064,7 +3064,7 @@ public class ImapStore extends Store {
} }
protected int processUntaggedResponse(int oldMessageCount, ImapResponse response, List<Integer> flagSyncMsgSeqs, List<String> removeMsgUids) { protected int processUntaggedResponse(long oldMessageCount, ImapResponse response, List<Long> flagSyncMsgSeqs, List<String> removeMsgUids) {
super.handleUntaggedResponse(response); super.handleUntaggedResponse(response);
int messageCountDelta = 0; int messageCountDelta = 0;
if (response.mTag == null && response.size() > 1) { if (response.mTag == null && response.size() > 1) {
@ -3072,7 +3072,7 @@ public class ImapStore extends Store {
Object responseType = response.get(1); Object responseType = response.get(1);
if (ImapResponseParser.equalsIgnoreCase(responseType, "FETCH")) { if (ImapResponseParser.equalsIgnoreCase(responseType, "FETCH")) {
Log.i(K9.LOG_TAG, "Got FETCH " + response); Log.i(K9.LOG_TAG, "Got FETCH " + response);
int msgSeq = response.getNumber(0); long msgSeq = response.getLong(0);
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Got untagged FETCH for msgseq " + msgSeq + " for " + getLogId()); Log.d(K9.LOG_TAG, "Got untagged FETCH for msgseq " + msgSeq + " for " + getLogId());
@ -3082,17 +3082,17 @@ public class ImapStore extends Store {
} }
} }
if (ImapResponseParser.equalsIgnoreCase(responseType, "EXPUNGE")) { if (ImapResponseParser.equalsIgnoreCase(responseType, "EXPUNGE")) {
int msgSeq = response.getNumber(0); long msgSeq = response.getLong(0);
if (msgSeq <= oldMessageCount) { if (msgSeq <= oldMessageCount) {
messageCountDelta = -1; messageCountDelta = -1;
} }
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Got untagged EXPUNGE for msgseq " + msgSeq + " for " + getLogId()); Log.d(K9.LOG_TAG, "Got untagged EXPUNGE for msgseq " + msgSeq + " for " + getLogId());
List<Integer> newSeqs = new ArrayList<Integer>(); List<Long> newSeqs = new ArrayList<Long>();
Iterator<Integer> flagIter = flagSyncMsgSeqs.iterator(); Iterator<Long> flagIter = flagSyncMsgSeqs.iterator();
while (flagIter.hasNext()) { while (flagIter.hasNext()) {
Integer flagMsg = flagIter.next(); Long flagMsg = flagIter.next();
if (flagMsg >= msgSeq) { if (flagMsg >= msgSeq) {
flagIter.remove(); flagIter.remove();
if (flagMsg > msgSeq) { if (flagMsg > msgSeq) {
@ -3103,14 +3103,14 @@ public class ImapStore extends Store {
flagSyncMsgSeqs.addAll(newSeqs); flagSyncMsgSeqs.addAll(newSeqs);
List<Integer> msgSeqs = new ArrayList<Integer>(msgSeqUidMap.keySet()); List<Long> msgSeqs = new ArrayList<Long>(msgSeqUidMap.keySet());
Collections.sort(msgSeqs); // Have to do comparisons in order because of msgSeq reductions Collections.sort(msgSeqs); // Have to do comparisons in order because of msgSeq reductions
for (Integer msgSeqNumI : msgSeqs) { for (long msgSeqNumI : msgSeqs) {
if (K9.DEBUG) { if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Comparing EXPUNGEd msgSeq " + msgSeq + " to " + msgSeqNumI); Log.v(K9.LOG_TAG, "Comparing EXPUNGEd msgSeq " + msgSeq + " to " + msgSeqNumI);
} }
int msgSeqNum = msgSeqNumI; long msgSeqNum = msgSeqNumI;
if (msgSeqNum == msgSeq) { if (msgSeqNum == msgSeq) {
String uid = msgSeqUidMap.get(msgSeqNum); String uid = msgSeqUidMap.get(msgSeqNum);
if (K9.DEBUG) { if (K9.DEBUG) {