Bug 1083355 - [email/IMAP] Fix message sequence number off-by-one ord…

…inal/count error. r=mcav land mozilla-b2g/gaia-email-libs-and-more#373
mozilla-b2g · Feb 27, 2015 · 0fc6d4c · 0fc6d4c
1 parent 6d71590
commit 0fc6d4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/email/js/ext/imap/jobs.js b/apps/email/js/ext/imap/jobs.js
@@ -690,7 +690,10 @@ ImapJobDriver.prototype = {
             nextId = targetConn.box.uidNext;
           } else {
             usingUid = false;
-            nextId = targetConn.box.exists;
+            // Message sequence numbers are 1-based, so if 0 exist, then 1 is
+            // the sequence number of the next message.  If 1 exists, its
+            // number is 1, and the next number is 2.  And so on.
+            nextId = targetConn.box.exists + 1;
           }
 
           folderConn._conn.copyMessages(serverIds.join(','),
@@ -744,7 +747,6 @@ ImapJobDriver.prototype = {
                     }
                     var namer = guidToNamer[guid];
                     stateDelta.serverIdMap[namer.suid] = msg.uid;
-                    uidnext = msg.uid + 1;
                     var newSuid = state.moveMap[namer.suid];
                     var newId =
                           parseInt(newSuid.substring(newSuid.lastIndexOf('/') + 1));

diff --git a/apps/email/js/ext/worker-config.js b/apps/email/js/ext/worker-config.js
@@ -65,7 +65,6 @@
       'stringencoding': 'ext/stringencoding',
       'tcp-socket': 'ext/tcp-socket',
       'utf7': 'ext/utf7',
-      'wmsy': 'ext/wmsy',
       'wo-utf7': 'ext/wo-utf7'
       // </gelam-ext>
     },