Merge pull request #204 from Unity-Technologies/maintain-time-type

Maintain time type when querying

Author: aurimasc

com.unity.mobile.notifications/Runtime/iOS/Plugins/UnityNotificationData.m

@@ -151,6 +151,7 @@ iOSNotificationData UNNotificationRequestToiOSNotificationData(UNNotificationReq
         notificationData.trigger.calendar.hour = (int)date.hour;
         notificationData.trigger.calendar.minute = (int)date.minute;
         notificationData.trigger.calendar.second = (int)date.second;
+        notificationData.trigger.calendar.repeats = (int)calendarTrigger.repeats;
     }
     else if ([request.trigger isKindOfClass: [UNLocationNotificationTrigger class]])
     {

com.unity.mobile.notifications/Runtime/iOS/iOSNotification.cs

@@ -273,7 +273,12 @@ public iOSNotificationTrigger Trigger
                         }
                     case iOSNotificationTriggerType.Calendar:
                         {
-                            var trigger = ((iOSNotificationCalendarTrigger)value).ToUtc();
+                            var trigger = ((iOSNotificationCalendarTrigger)value);
+                            if (userInfo == null)
+                                userInfo = new Dictionary<string, string>();
+                            userInfo["OriginalUtc"] = trigger.UtcTime ? "1" : "0";
+                            if (!trigger.UtcTime)
+                                trigger = trigger.ToUtc();
                             data.trigger.calendar.year = trigger.Year != null ? trigger.Year.Value : -1;
                             data.trigger.calendar.month = trigger.Month != null ? trigger.Month.Value : -1;
                             data.trigger.calendar.day = trigger.Day != null ? trigger.Day.Value : -1;
@@ -313,17 +318,22 @@ public iOSNotificationTrigger Trigger
                             Repeats = data.trigger.timeInterval.repeats != 0,
                         };
                     case iOSNotificationTriggerType.Calendar:
-                        return new iOSNotificationCalendarTrigger()
                         {
-                            Year = (data.trigger.calendar.year > 0) ? (int?)data.trigger.calendar.year : null,
-                            Month = (data.trigger.calendar.month > 0) ? (int?)data.trigger.calendar.month : null,
-                            Day = (data.trigger.calendar.day > 0) ? (int?)data.trigger.calendar.day : null,
-                            Hour = (data.trigger.calendar.hour >= 0) ? (int?)data.trigger.calendar.hour : null,
-                            Minute = (data.trigger.calendar.minute >= 0) ? (int?)data.trigger.calendar.minute : null,
-                            Second = (data.trigger.calendar.second >= 0) ? (int?)data.trigger.calendar.second : null,
-                            UtcTime = true,
-                            Repeats = data.trigger.calendar.repeats != 0
-                        };
+                            var trigger = new iOSNotificationCalendarTrigger()
+                            {
+                                Year = (data.trigger.calendar.year > 0) ? (int?)data.trigger.calendar.year : null,
+                                Month = (data.trigger.calendar.month > 0) ? (int?)data.trigger.calendar.month : null,
+                                Day = (data.trigger.calendar.day > 0) ? (int?)data.trigger.calendar.day : null,
+                                Hour = (data.trigger.calendar.hour >= 0) ? (int?)data.trigger.calendar.hour : null,
+                                Minute = (data.trigger.calendar.minute >= 0) ? (int?)data.trigger.calendar.minute : null,
+                                Second = (data.trigger.calendar.second >= 0) ? (int?)data.trigger.calendar.second : null,
+                                UtcTime = true,
+                                Repeats = data.trigger.calendar.repeats != 0
+                            };
+                            if (userInfo != null && userInfo["OriginalUtc"] == "0")
+                                trigger = trigger.ToLocal();
+                            return trigger;
+                        }
                     case iOSNotificationTriggerType.Location:
                         return new iOSNotificationLocationTrigger()
                         {

com.unity.mobile.notifications/Tests/Runtime/iOS/iOSNotificationTests.cs

@@ -187,6 +187,8 @@ IEnumerator SendNotificationUsingCalendarTrigger_NotificationIsReceived(string t
         Assert.AreEqual(1, receivedNotificationCount);
         Assert.IsNotNull(lastReceivedNotification);
         Assert.AreEqual(text, lastReceivedNotification.Title);
+        var retTrigger = (iOSNotificationCalendarTrigger)lastReceivedNotification.Trigger;
+        Assert.AreEqual(useUtc, retTrigger.UtcTime);
     }
 
     [UnityTest]
@@ -314,7 +316,7 @@ public void iOSNotificationCalendarTrigger_AssignDateTimeComponents_OnlyChangesN
     }
 
     [Test]
-    public void OSNotificationCalendarTrigger_AssignNonEmptyComponents_Works()
+    public void iOSNotificationCalendarTrigger_AssignNonEmptyComponents_Works()
     {
         var dt = new DateTime(2025, 1, 2, 3, 4, 5);
 
@@ -348,4 +350,42 @@ public void OSNotificationCalendarTrigger_AssignNonEmptyComponents_Works()
         Assert.AreEqual(4, trigger.Minute);
         Assert.AreEqual(5, trigger.Second);
     }
+
+    [Test]
+    public void iOSNotification_CalendarTrigger_ReturnsSameKindDateTime()
+    {
+        var trigger1 = new iOSNotificationCalendarTrigger()
+        {
+            Hour = 8,
+            Minute = 30,
+            UtcTime = false,
+        };
+
+        var trigger2 = new iOSNotificationCalendarTrigger()
+        {
+            Hour = 8,
+            Minute = 30,
+            UtcTime = false,
+        };
+
+        var notification = new iOSNotification()
+        {
+            Title = "text",
+            Body = "text",
+            Trigger = trigger1,
+        };
+
+        var retTrigger = (iOSNotificationCalendarTrigger)notification.Trigger;
+
+        Assert.AreEqual(trigger1.Hour, retTrigger.Hour);
+        Assert.AreEqual(trigger1.Minute, retTrigger.Minute);
+        Assert.AreEqual(trigger1.UtcTime, retTrigger.UtcTime);
+
+        notification.Trigger = trigger2;
+        retTrigger = (iOSNotificationCalendarTrigger)notification.Trigger;
+
+        Assert.AreEqual(trigger2.Hour, retTrigger.Hour);
+        Assert.AreEqual(trigger2.Minute, retTrigger.Minute);
+        Assert.AreEqual(trigger2.UtcTime, retTrigger.UtcTime);
+    }
 }