Skip to content

Commit 8ba0657

Browse files
committed
Use UserInfo for tracking UTC
1 parent fe70ebd commit 8ba0657

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ typedef struct iOSNotificationData
4949
int minute;
5050
int second;
5151
unsigned char repeats;
52-
unsigned char originalUtc;
5352
} calendar;
5453

5554
struct

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ iOSNotificationData UNNotificationRequestToiOSNotificationData(UNNotificationReq
152152
notificationData.trigger.calendar.minute = (int)date.minute;
153153
notificationData.trigger.calendar.second = (int)date.second;
154154
notificationData.trigger.calendar.repeats = (int)calendarTrigger.repeats;
155-
notificationData.trigger.calendar.originalUtc = 1;
156155
}
157156
else if ([request.trigger isKindOfClass: [UNLocationNotificationTrigger class]])
158157
{

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ internal struct CalendarTriggerData
4949
public Int32 minute;
5050
public Int32 second;
5151
public Byte repeats;
52-
public Byte originalUtc;
5352
}
5453

5554
[StructLayout(LayoutKind.Sequential)]
@@ -275,13 +274,11 @@ public iOSNotificationTrigger Trigger
275274
case iOSNotificationTriggerType.Calendar:
276275
{
277276
var trigger = ((iOSNotificationCalendarTrigger)value);
278-
if (trigger.UtcTime)
279-
data.trigger.calendar.originalUtc = 1;
280-
else
281-
{
282-
data.trigger.calendar.originalUtc = 0;
277+
if (userInfo == null)
278+
userInfo = new Dictionary<string, string>();
279+
userInfo["OriginalUtc"] = trigger.UtcTime ? "1" : "0";
280+
if (!trigger.UtcTime)
283281
trigger = trigger.ToUtc();
284-
}
285282
data.trigger.calendar.year = trigger.Year != null ? trigger.Year.Value : -1;
286283
data.trigger.calendar.month = trigger.Month != null ? trigger.Month.Value : -1;
287284
data.trigger.calendar.day = trigger.Day != null ? trigger.Day.Value : -1;
@@ -333,7 +330,7 @@ public iOSNotificationTrigger Trigger
333330
UtcTime = true,
334331
Repeats = data.trigger.calendar.repeats != 0
335332
};
336-
if (data.trigger.calendar.originalUtc == 0)
333+
if (userInfo != null && userInfo["OriginalUtc"] == "0")
337334
trigger = trigger.ToLocal();
338335
return trigger;
339336
}

0 commit comments

Comments
 (0)