From 557936f7fd3008b1601f94bfc85dee0620952991 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 14 Sep 2016 09:19:30 -0400
Subject: [PATCH] (fix) EAS yearly rrule generation + small EAS MoveItems fix

---
 ActiveSync/SOGoActiveSyncDispatcher.m      | 3 +--
 ActiveSync/iCalRecurrenceRule+ActiveSync.m | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index a4b18aeb1..b9612c229 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2048,9 +2048,8 @@ void handle_eas_terminate(int signum)
           dstUidCache = [dstFolderMetadata objectForKey: @"UidCache"];
           dstSyncCache = [dstFolderMetadata objectForKey: @"SyncCache"];
 
-          if (srcUidCache)
+          if (srcUidCache && (srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0]))
             {
-              srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0];
               if (debugOn)
                 [self logWithFormat: @"EAS - Found serverId: %@ for easId: %@", srcMessageId, origSrcMessageId];
             }
diff --git a/ActiveSync/iCalRecurrenceRule+ActiveSync.m b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
index 225bbd90a..621d6f810 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.m
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
@@ -176,7 +176,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             }
         }
       else
-        type = 5;
+        {
+          type = 5;
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             (int)[[[self parent] startDate] dayOfMonth]];
+          [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%d</Recurrence_MonthOfYear>",
+             (int)[[[self parent] startDate] monthOfYear]];
+
+        }
     }
   
   [s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];