Merge branch 'bugfix/issue-2047/g-offset-localtime' into release

Resolves #2047
phw198 · Jan 23, 2025 · 2a2ba80 · 2a2ba80
2 parents ce891ee + 50440b4
commit 2a2ba80
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/OutlookGoogleCalendarSync/Extensions/DateTime.cs b/src/OutlookGoogleCalendarSync/Extensions/DateTime.cs
@@ -60,7 +60,7 @@ public static System.DateTime SafeDateTime(this EventDateTime evDt) {
         /// </summary>
         /// <returns>DateTimeOffset</returns>
         public static System.DateTimeOffset SafeDateTimeOffset(this EventDateTime evDt) {
-            return evDt.DateTimeDateTimeOffset ?? System.DateTimeOffset.Parse(evDt.Date);
+            return evDt.DateTimeDateTimeOffset?.ToLocalTime() ?? System.DateTimeOffset.Parse(evDt.Date);
         }
 
         /// <summary>
@@ -73,7 +73,8 @@ public static Boolean AllDayEvent(this Event ev, Boolean logicallyEquivalent = f
             if (ev.Start?.Date != null)
                 return true;
             if (logicallyEquivalent)
-                return (ev.Start?.DateTimeDateTimeOffset?.TimeOfDay == new TimeSpan(0, 0, 0) && ev.Start?.DateTimeDateTimeOffset?.TimeOfDay == ev.End?.DateTimeDateTimeOffset?.TimeOfDay);
+                return (ev.Start?.DateTimeDateTimeOffset?.ToLocalTime().TimeOfDay == new TimeSpan(0, 0, 0) && 
+                    ev.Start?.DateTimeDateTimeOffset?.ToLocalTime().TimeOfDay == ev.End?.DateTimeDateTimeOffset?.ToLocalTime().TimeOfDay);
             else
                 return false;
         }