From ec5b15c2bb2be4e1ff58f4944b8eaff805ab0cdb Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 25 Oct 2007 15:25:39 +0000
Subject: [PATCH] Monotone-Parent: f6dcf8a9dfda51ed37550dae7830efbd1d417317
 Monotone-Revision: a0db3f538581c7b491b49f0e21b754544b33477b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-25T15:25:39
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                          |  6 ++++
 SoObjects/Mailer/SOGoDraftObject.m | 51 +++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42ab637ac..ee6cebee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
+	-fetchMailForEditing:sourceMail]): work-around a bug in SOPE-mime
+	where only the body part of the first of the keys fetched was
+	returned. Also decodes the body parts properly following their
+	encoding.
+
 	* SoObjects/Mailer/NSData+Mail.[hm]: new extension module that
 	extends the NSData class with utility methods useful for handling
 	mail.
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 3aa25f15e..2cc71010e 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -56,6 +56,8 @@
 #import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoUser.h>
+
+#import "NSData+Mail.h"
 #import "SOGoMailAccount.h"
 #import "SOGoMailFolder.h"
 #import "SOGoMailObject.h"
@@ -411,30 +413,49 @@ static BOOL        showTextAttachmentsInline  = NO;
     }
 }
 
+- (NSArray *) _attachmentBodiesFromPaths: (NSArray *) paths
+		       fromResponseFetch: (NSDictionary *) fetch;
+{
+  NSEnumerator *attachmentKeys;
+  NSMutableArray *bodies;
+  NSString *currentKey;
+  NSDictionary *body;
+
+  bodies = [NSMutableArray array];
+
+  attachmentKeys = [paths objectEnumerator];
+  while ((currentKey = [attachmentKeys nextObject]))
+    {
+      body = [fetch objectForKey: [currentKey lowercaseString]];
+      [bodies addObject: [body objectForKey: @"data"]];
+    }
+
+  return bodies;
+}
+
 - (void) _fetchAttachments: (NSArray *) parts
                   fromMail: (SOGoMailObject *) sourceMail
 {
   unsigned int count, max;
-  NSDictionary *currentPart, *attachment, *body;
-  NSArray *paths, *result;
+  NSArray *paths, *bodies;
+  NSData *body;
+  NSDictionary *currentInfo;
+  NGHashMap *response;
 
   max = [parts count];
   if (max > 0)
     {
       paths = [parts keysWithFormat: @"BODY[%{path}]"];
-      result = [[sourceMail fetchParts: paths] objectForKey: @"fetch"];
+      response = [[sourceMail fetchParts: paths] objectForKey: @"RawResponse"];
+      bodies = [self _attachmentBodiesFromPaths: paths
+		     fromResponseFetch: [response objectForKey: @"fetch"]];
       for (count = 0; count < max; count++)
 	{
-	  currentPart = [parts objectAtIndex: count];
-	  body = [[result objectAtIndex: count] objectForKey: @"body"];
-	  attachment = [NSDictionary dictionaryWithObjectsAndKeys:
-				       [currentPart objectForKey: @"filename"],
-				     @"filename",
-				     [currentPart objectForKey: @"mimetype"],
-				     @"mime-type",
-				     nil];
-	  [self saveAttachment: [body objectForKey: @"data"]
-		withMetadata: attachment];
+	  currentInfo = [parts objectAtIndex: count];
+	  body = [[bodies objectAtIndex: count]
+		   bodyDataFromEncoding: [currentInfo
+					   objectForKey: @"encoding"]];
+	  [self saveAttachment: body withMetadata: currentInfo];
 	}
     }
 }
@@ -529,7 +550,7 @@ static BOOL        showTextAttachmentsInline  = NO;
 //   error = [newDraft saveAttachment:content withName:@"forward.mail"];
       attachment = [NSDictionary dictionaryWithObjectsAndKeys:
 				   [sourceMail filenameForForward], @"filename",
-				 @"message/rfc822", @"mime-type",
+				 @"message/rfc822", @"mimetype",
 				 nil];
       [self saveAttachment: [sourceMail content]
 	    withMetadata: attachment];
@@ -639,7 +660,7 @@ static BOOL        showTextAttachmentsInline  = NO;
 			  reason: @"Could not write attachment to draft!"];
     }
 
-  mimeType = [metadata objectForKey: @"mime-type"];
+  mimeType = [metadata objectForKey: @"mimetype"];
   if ([mimeType length] > 0)
     {
       p = [self pathToAttachmentWithName: