Merge branch 'issue-1035' of https://github.com/phw198/OutlookGoogleC…

…alendarSync into release Resolves #1035
phw198 · Oct 10, 2020 · 8429cd9 · 8429cd9
2 parents c3d206f + 341021b
commit 8429cd9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/OutlookGoogleCalendarSync/Recurrence.cs b/src/OutlookGoogleCalendarSync/Recurrence.cs
@@ -33,7 +33,7 @@ public List<String> BuildGooglePattern(AppointmentItem ai, Event ev) {
             RecurrencePattern rp = null;
             try {
                 rp = ai.GetRecurrencePattern();
-                gPattern.Add("RRULE:" + buildRrule(rp));
+                gPattern.Add("RRULE:" + buildRrule(rp, ai.Start.TimeOfDay));
             } finally {
                 rp = (RecurrencePattern)OutlookOgcs.Calendar.ReleaseObject(rp);
             }
@@ -212,7 +212,7 @@ public void CompareOutlookPattern(Event ev, ref RecurrencePattern aiOpattern, Sy
             }
         }
 
-        private String buildRrule(RecurrencePattern oPattern) {
+        private String buildRrule(RecurrencePattern oPattern, TimeSpan startTime) {
             log.Fine("Building RRULE");
             rrule = new Dictionary<String, String>();
             #region RECURRENCE PATTERN
@@ -290,7 +290,8 @@ private String buildRrule(RecurrencePattern oPattern) {
             #region RECURRENCE RANGE
             if (!oPattern.NoEndDate) {
                 log.Fine("Checking end date.");
-                addRule(rrule, "UNTIL", Recurrence.IANAdate(oPattern.PatternEndDate + oPattern.StartTime.TimeOfDay));
+                //oPattern.StartTime is for the organisers timezone, not the recipient - unlike ai.Start;
+                addRule(rrule, "UNTIL", Recurrence.IANAdate(oPattern.PatternEndDate + startTime));
             }
             #endregion
             return string.Join(";", rrule.Select(x => x.Key + "=" + x.Value).ToArray());