Fix for #1, #37, #38

andyedinborough · Feb 29, 2012 · 471b64c · 471b64c
1 parent 942d51a
commit 471b64c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/ImapClient.cs b/ImapClient.cs
@@ -205,8 +205,6 @@ private void Noop(bool pauseIdle) {
       var tag = GetTag();
       var response = SendCommandGetResponse(tag + "NOOP");
       while (!response.StartsWith(tag)) {
-        //if (_IdleEvents != null && _IdleQueue != null)    //NK: I'm not sure how to deal with this... Add to the _Responses queue?
-        //    _IdleQueue.Enqueue(response);
         response = GetResponse();
       }
 
@@ -356,11 +354,11 @@ public MailMessage[] GetMessages(string start, string end, bool uid, bool header
       if (uid)
         UID = "UID ";
       if (headersonly)
-        HEADERS = "[HEADER]";
+        HEADERS = "HEADER";
       if (!setseen)
         SETSEEN = ".PEEK";
       string tag = GetTag();
-      string command = tag + UID + "FETCH " + start + ":" + end + " (" + _FetchHeaders + "UID RFC822.SIZE FLAGS BODY" + SETSEEN + HEADERS + ")";
+      string command = tag + UID + "FETCH " + start + ":" + end + " (" + _FetchHeaders + "UID RFC822.SIZE FLAGS BODY" + SETSEEN + "[" + HEADERS + "])";
       string response;
       var x = new List<MailMessage>();
 
@@ -506,11 +504,12 @@ internal override void OnLogin(string login, string password) {
         throw new Exception(result);
       }
 
-      if (Supports("COMPRESS=DEFLATE")) {
-        //SendCommandCheckOK(GetTag() + "compress deflate");
-        //_Reader = new System.IO.StreamReader(new System.IO.Compression.DeflateStream(_Stream, System.IO.Compression.CompressionMode.Decompress));
-        //_Writer = new System.IO.StreamWriter(new System.IO.Compression.DeflateStream(_Stream, System.IO.Compression.CompressionMode.Compress));
-      }
+      //if (Supports("COMPRESS=DEFLATE")) {
+      //  SendCommandCheckOK(GetTag() + "compress deflate");
+      //  _Stream0 = _Stream;
+      // // _Reader = new System.IO.StreamReader(new System.IO.Compression.DeflateStream(_Stream0, System.IO.Compression.CompressionMode.Decompress, true), System.Text.Encoding.Default);
+      // // _Stream = new System.IO.Compression.DeflateStream(_Stream0, System.IO.Compression.CompressionMode.Compress, true);
+      //}
 
       if (Supports("X-GM-EXT-1")) {
         _FetchHeaders = "X-GM-MSGID X-GM-THRID X-GM-LABELS ";

diff --git a/Tests/Clients.cs b/Tests/Clients.cs
@@ -127,6 +127,13 @@ public void TestGetSeveralMessages() {
         msgs.Count(x => string.IsNullOrEmpty(x.Subject)).Should().Equal(0);
         msgs.GroupBy(x => x.Subject).Count().Should().Equal(10);
       }
+      using (var imap = GetClient<ImapClient>()) {
+        var msgs = imap.GetMessages(0, 9, false);
+        msgs.Length.Should().Equal(10);
+        msgs.Count(x => string.IsNullOrEmpty(x.Subject)).Should().Equal(0);
+        msgs.GroupBy(x => x.Subject).Count().Should().Equal(10);
+        msgs.GroupBy(x => x.Body).Count().Should().Equal(10);
+      }
     }
 
     [TestMethod]

diff --git a/TextClient.cs b/TextClient.cs
@@ -7,7 +7,6 @@ public abstract class TextClient : IDisposable {
     protected TcpClient _Connection;
     protected Stream _Stream;
     protected StreamReader _Reader;
-    //protected StreamWriter _Writer;
 
     public string Host { get; private set; }
 
@@ -57,7 +56,6 @@ public void Connect(string hostname, int port, bool ssl) {
         }
 
         _Reader = new StreamReader(_Stream);
-        //_Writer = new StreamWriter(_Stream);
         string info = _Reader.ReadLine();
         OnConnected(info);
 
@@ -66,7 +64,6 @@ public void Connect(string hostname, int port, bool ssl) {
       } catch (Exception) {
         IsConnected = false;
         Utilities.TryDispose(ref _Reader);
-        //Utilities.TryDispose(ref _Writer);
         Utilities.TryDispose(ref _Stream);
         throw;
       }
@@ -103,7 +100,6 @@ public void Disconnect() {
       Logout();
 
       Utilities.TryDispose(ref _Reader);
-      //Utilities.TryDispose(ref _Writer);
       Utilities.TryDispose(ref _Stream);
       Utilities.TryDispose(ref _Connection);
     }