Merge pull request #3 from CoderGamester/develop

Release 0.1.3

Author: CoderGamester

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.1.3] - 2020-08-03
+
+**Fixed**:
+- Fixed saved notifications serialization on iOS
+
 ## [0.1.2] - 2020-07-29
 
 **Fixed**:

Runtime/GameLovers.NotificationService.asmdef

@@ -7,7 +7,7 @@
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
+    "overrideReferences": true,
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],

Runtime/GameNotificationsMonoBehaviour.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using UnityEngine;
 
@@ -67,9 +66,8 @@ public enum OperatingMode
     /// </summary>
     public sealed class GameNotificationsMonoBehaviour : MonoBehaviour
     {
-        // Default filename for notifications serializer
-        private const string _DEFAULT_FILENAME = "notifications.bin";
-
+        
+        
         // Minimum amount of time that a notification should be into the future before it's queued when we background.
         private static readonly TimeSpan _minimumNotificationTime = new TimeSpan(0, 0, 2);
 
@@ -87,23 +85,22 @@ public sealed class GameNotificationsMonoBehaviour : MonoBehaviour
         /// <summary>
         /// Event fired when a scheduled local notification is delivered while the app is in the foreground.
         /// </summary>
-        public Action<PendingNotification> LocalNotificationDelivered;
+        public Action<PendingNotification> OnLocalNotificationDelivered;
 
         /// <summary>
         /// Event fired when a queued local notification is cancelled because the application is in the foreground
         /// when it was meant to be displayed.
         /// </summary>
         /// <seealso cref="OperatingMode.Queue"/>
-        public Action<PendingNotification> LocalNotificationExpired;
+        public Action<PendingNotification> OnLocalNotificationExpired;
 
         private IGameNotificationsPlatform _platform;
-        private IPendingNotificationsSerializer _serializer;
         private bool _inForeground = true;
 
         /// <summary>
         /// Gets a collection of notifications that are scheduled or queued.
         /// </summary>
-        public List<PendingNotification> PendingNotifications { get; private set; }
+        public List<PendingNotification> PendingNotifications { get; private set; } = new List<PendingNotification>();
 
         /// <summary>
         /// Gets whether this manager has been initialized.
@@ -147,7 +144,7 @@ private void Update()
                 if (time != null && time < DateTime.Now)
                 {
                     PendingNotifications.RemoveAt(i);
-                    LocalNotificationExpired?.Invoke(queuedNotification);
+                    OnLocalNotificationExpired?.Invoke(queuedNotification);
                 }
             }
         }
@@ -255,7 +252,7 @@ private void OnApplicationFocus(bool hasFocus)
             }
 
             // Calculate notifications to save
-            var notificationsToSave = new List<PendingNotification>(PendingNotifications.Count);
+            var notificationsToSave = new List<SerializableNotification>(PendingNotifications.Count);
             foreach (var pendingNotification in PendingNotifications)
             {
                 // If we're in clear mode, add nothing unless we're in rescheduling mode
@@ -273,21 +270,21 @@ private void OnApplicationFocus(bool hasFocus)
                         pendingNotification.Notification.Scheduled &&
                         pendingNotification.Notification.DeliveryTime.HasValue)
                     {
-                        notificationsToSave.Add(pendingNotification);
+                        notificationsToSave.Add(pendingNotification.AsSerializableNotification());
                     }
                 }
                 else
                 {
                     // In non-clear mode, just add all scheduled notifications
                     if (pendingNotification.Notification.Scheduled)
                     {
-                        notificationsToSave.Add(pendingNotification);
+                        notificationsToSave.Add(pendingNotification.AsSerializableNotification());
                     }
                 }
             }
 
             // Save to disk
-            _serializer.Serialize(notificationsToSave);
+            PlayerPrefs.SetString("notifications", JsonUtility.ToJson(notificationsToSave));
         }
 
         /// <summary>
@@ -330,15 +327,8 @@ public void Initialize(params GameNotificationChannel[] channels)
                 return;
             }
 
-            PendingNotifications = new List<PendingNotification>();
             _platform.NotificationReceived += OnNotificationReceived;
 
-            // Check serializer
-            if (_serializer == null)
-            {
-                _serializer = new DefaultSerializer(Path.Combine(Application.persistentDataPath, _DEFAULT_FILENAME));
-            }
-
             OnForegrounding();
         }
 
@@ -488,7 +478,7 @@ private void OnNotificationReceived(IGameNotification deliveredNotification)
 
             if (deliveredIndex >= 0)
             {
-                LocalNotificationDelivered?.Invoke(PendingNotifications[deliveredIndex]);
+                OnLocalNotificationDelivered?.Invoke(PendingNotifications[deliveredIndex]);
                 PendingNotifications.RemoveAt(deliveredIndex);
             }
         }
@@ -500,7 +490,7 @@ private void OnForegrounding()
             _platform.OnForeground();
 
             // Deserialize saved items
-            var loaded = _serializer?.Deserialize(_platform);
+            var notifications = JsonUtility.FromJson<List<SerializableNotification>>(PlayerPrefs.GetString("notifications"));
 
             // Foregrounding
             if ((Mode & OperatingMode.ClearOnForegrounding) == OperatingMode.ClearOnForegrounding)
@@ -509,17 +499,18 @@ private void OnForegrounding()
                 _platform.CancelAllScheduledNotifications();
 
                 // Only reschedule in reschedule mode, and if we loaded any items
-                if (loaded == null || (Mode & OperatingMode.RescheduleAfterClearing) != OperatingMode.RescheduleAfterClearing)
+                if (notifications == null || (Mode & OperatingMode.RescheduleAfterClearing) != OperatingMode.RescheduleAfterClearing)
                 {
                     return;
                 }
 
                 // Reschedule notifications from deserialization
-                foreach (var savedNotification in loaded)
+                foreach (var savedNotification in notifications)
                 {
                     if (savedNotification.DeliveryTime > DateTime.Now)
                     {
-                        var pendingNotification = ScheduleNotification(savedNotification);
+                        var pendingNotification = ScheduleNotification(savedNotification.AsGameNotification(_platform));
+                        
                         pendingNotification.Reschedule = true;
                     }
                 }
@@ -528,16 +519,16 @@ private void OnForegrounding()
             {
                 // Just create PendingNotification wrappers for all deserialized items.
                 // We're not rescheduling them because they were not cleared
-                if (loaded == null)
+                if (notifications == null)
                 {
                     return;
                 }
 
-                foreach (var savedNotification in loaded)
+                foreach (var savedNotification in notifications)
                 {
                     if (savedNotification.DeliveryTime > DateTime.Now)
                     {
-                        PendingNotifications.Add(new PendingNotification(savedNotification));
+                        PendingNotifications.Add(new PendingNotification(savedNotification.AsGameNotification(_platform)));
                     }
                 }
             }

Runtime/IGameNotification.cs

@@ -41,10 +41,10 @@ public interface IGameNotification
         string Subtitle { get; set; }
 
         /// <summary>
-        /// Gets or sets group to which this notification belongs.
+        /// Gets or sets channel to which this notification belongs.
         /// </summary>
-        /// <value>A platform specific string identifier for the notification's group.</value>
-        string Group { get; set; }
+        /// <value>A platform specific string identifier for the notification's channel.</value>
+        string Channel { get; set; }
 
         /// <summary>
         /// Gets or sets the badge number for this notification. No badge number will be shown if null.