From 2c78d60e4abeb972ecc86e3d3ecd43ca376a5c84 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 12 May 2015 10:12:57 -0400
Subject: [PATCH] (fix) now correct handle external invitations using EAS

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 20 +++++++++++++++++++-
 NEWS                                  |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index e2e301565..36e38bb2b 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1454,6 +1454,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           appointmentObject = [collection lookupName: [NSString stringWithFormat: @"%@.ics", [event uid]]
                                            inContext: context
                                              acquire: NO];
+
+          // Create the appointment if it is not added to calendar yet
+          if ([appointmentObject isKindOfClass: [NSException class]])
+            {
+              appointmentObject = [[SOGoAppointmentObject alloc] initWithName: [NSString stringWithFormat: @"%@.ics", [event uid]]
+                                                                  inContainer: collection];
+              [appointmentObject saveComponent: event];
+           }
         }
     }
      
@@ -1489,7 +1497,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     }
   else
     {
-      [theResponse setStatus: 500];
+      [s appendString: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
+      [s appendString: @"<!DOCTYPE ActiveSync PUBLIC \"-//MICROSOFT//DTD ActiveSync//EN\" \"http://www.microsoft.com/\">"];
+      [s appendString: @"<MeetingResponse xmlns=\"MeetingResponse:\">"];
+      [s appendString: @"<Result>"];
+      [s appendFormat: @"<RequestId>%@</RequestId>", requestId];
+      [s appendFormat: @"<Status>%d</Status>", 2];
+      [s appendString: @"</Result>"];
+      [s appendString: @"</MeetingResponse>"];
+      d = [[s dataUsingEncoding: NSUTF8StringEncoding] xml2wbxml];
+
+      [theResponse setContent: d];
     }
 }
 
diff --git a/NEWS b/NEWS
index 1806f1cb5..9dd1820c1 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ Bug fixes
  - optional attendes on events are now shown properly (Zentyal)
  - fixed the EAS maximum response size being per-folder, and not global
  - now set MeetingMessageType only for EAS 14.1
+ - now correct handle external invitations using EAS
 
 2.2.17a (2015-03-15)
 --------------------