Changeset 692 for trunk/LogicMail/src/org/logicprobe

Timestamp:

08/21/10 18:42:39 (18 months ago)

Author:

octorian

Message:

Fix for fetch-update bug

File:

• trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java (modified) (7 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

@@ -481 +481 @@
                 Integer.toString(firstIndex) + CHAR_COLON +
                 Integer.toString(lastIndex) + " (FLAGS UID)",
-                new ExecuteCallback() { public void processResponse(byte[] rawLine) {
-                    FetchFlagsResponse response = prepareFetchFlagsResponse(rawLine);
-                    if(response != null) {
-                        result.addElement(response);
-                    }
-                }},
-                progressHandler);
+                new ExecuteCallback() {
+            public void processResponse(byte[] rawLine) {
+                FetchFlagsResponse response = prepareFetchFlagsResponse(rawLine);
+                if(response != null) {
+                    result.addElement(response);
+                }
+            }
+            public void executeComplete() { }},
+            progressHandler);
 
         FetchFlagsResponse[] resultArray = new FetchFlagsResponse[result.size()];
@@ -513 +515 @@
                 Integer.toString(uidNext) + CHAR_COLON_ASTERISK +
                 " (FLAGS UID)",
-                new ExecuteCallback() { public void processResponse(byte[] rawLine) {
-                    FetchFlagsResponse response = prepareFetchFlagsResponse(rawLine);
-                    if(response != null) {
-                        result.addElement(response);
-                    }
-                }},
-                progressHandler);
+                new ExecuteCallback() {
+            public void processResponse(byte[] rawLine) {
+                FetchFlagsResponse response = prepareFetchFlagsResponse(rawLine);
+                if(response != null) {
+                    result.addElement(response);
+                }
+            }
+            public void executeComplete() { }},
+            progressHandler);
 
         FetchFlagsResponse[] resultArray = new FetchFlagsResponse[result.size()];
@@ -610 +614 @@
                 Integer.toString(lastIndex) +
                 " (FLAGS UID ENVELOPE BODYSTRUCTURE)",
-                new ExecuteCallback() { public void processResponse(byte[] rawLine) {
-                    prepareFetchEnvelopeResponse(rawLine, callback);
-                }},
-                progressHandler);
+                new ExecuteCallback() {
+            public void processResponse(byte[] rawLine) {
+                prepareFetchEnvelopeResponse(rawLine, callback);
+            }
+            public void executeComplete() {
+                if(callback != null) {
+                    callback.responseAvailable(null);
+                }
+            }
+        },
+        progressHandler);
     }
 
@@ -634 +645 @@
                 Integer.toString(uidNext) + CHAR_COLON_ASTERISK +
                 " (FLAGS UID ENVELOPE BODYSTRUCTURE)",
-                new ExecuteCallback() { public void processResponse(byte[] rawLine) {
-                    prepareFetchEnvelopeResponse(rawLine, callback);
-                }},
-                progressHandler);
+                new ExecuteCallback() {
+            public void processResponse(byte[] rawLine) {
+                prepareFetchEnvelopeResponse(rawLine, callback);
+            }
+            public void executeComplete() {
+                if(callback != null) {
+                    callback.responseAvailable(null);
+                }
+            }
+        },
+        progressHandler);
     }
 
@@ -674 +692 @@
         executeResponse(UID_FETCH,
                 uidList + " (FLAGS UID ENVELOPE BODYSTRUCTURE)",
-                new ExecuteCallback() { public void processResponse(byte[] rawLine) {
-                    prepareFetchEnvelopeResponse(rawLine, callback);
-                }},
-                progressHandler);
+                new ExecuteCallback() {
+            public void processResponse(byte[] rawLine) {
+                prepareFetchEnvelopeResponse(rawLine, callback);
+            }
+            public void executeComplete() {
+                if(callback != null) {
+                    callback.responseAvailable(null);
+                }
+            }
+        },
+        progressHandler);
     }
 
@@ -1418 +1443 @@
         }
 
+        try {
+            callback.executeComplete();
+        } catch (Throwable t) {
+            EventLogger.logEvent(AppInfo.GUID,
+                    ("Unable to complete processing the response: " + t.getMessage()).getBytes(),
+                    EventLogger.ERROR);
+        }
+        
         if (StringArrays.startsWith(temp, BAD_PREFIX, tagBytes.length) ||
                 StringArrays.startsWith(temp, NO_PREFIX,
@@ -1430 +1463 @@
     protected interface ExecuteCallback {
         void processResponse(byte[] rawLine);
+        void executeComplete();
     }