Merge branch 'master' of github.com:Unity-Technologies/com.unity.mobile.notifications into android-exact-scheduling

Author: aurimasc

.yamato/promotion.yml

@@ -1,12 +1,13 @@
 test_editors:
   - version: trunk
+  - version: 2022.2
   - version: 2022.1
   - version: 2021.3
   - version: 2020.3
-  - version: 2019.4
 
 test_players:
   - version: trunk
+  - version: 2022.2
   - version: 2022.1
   - version: 2021.3
   - version: 2020.3

.yamato/upm-ci.yml

@@ -13,18 +13,19 @@ MonoBehaviour:
   m_Name: Location Triggered
   m_EditorClassIdentifier: 
   ButtonName: Send A Notification (Location Trigger)
-  Identifier: 
+  Identifier: loc_not
   CategoryIdentifier: category_indentifier
   ThreadIdentifier: thread_identifier
   Title: Location Notification Title
   Subtitle: This is a subtitle
   Body: And this is the body of this notification
-  ShowInForeground: 0
+  ShowInForeground: 1
   PresentationOptions: 6
   Badge: -1
   Data: This notification also includes some data
-  CenterX: 22.2847
-  CenterY: 114.1582
+  Latitude: 22.2847
+  Longitude: 114.1582
   Radius: 5000
   NotifyOnEntry: 1
   NotifyOnExit: 1
+  Repeats: 1

TestProjects/Main/Assets/Resources/iOSNotifications/LocationTrigger/Location Triggered.asset

@@ -93,6 +93,8 @@ void Start()
             ((Action)m_groups["Channels"]["Create Secondary Simple Channel"]).Invoke();
             ((Action)m_groups["Channels"]["Create Fancy Channel"]).Invoke();
             m_LOGGER.Clear().White("Welcome!");
+
+            HandleNotificationPermission();
             HandleLastNotificationIntent();
         }
 
@@ -103,10 +105,25 @@ void OnApplicationPause(bool isPaused)
                 .Gray($"isPaused = {isPaused}", 1);
             if (isPaused == false)
             {
+                HandleNotificationPermission();
                 HandleLastNotificationIntent();
             }
         }
 
+        private void HandleNotificationPermission()
+        {
+            var permission = AndroidNotificationCenter.UserPermissionToPost;
+            switch (permission)
+            {
+                case PermissionStatus.Allowed:
+                    m_LOGGER.Green("Permission granted to post notifications");
+                    break;
+                default:
+                    m_LOGGER.Red("No permission to post notifications: " + permission);
+                    break;
+            }
+        }
+
         private void HandleLastNotificationIntent()
         {
             AndroidNotificationIntentData notificationIntentData = AndroidNotificationCenter.GetLastNotificationIntent();
@@ -159,6 +176,7 @@ private void InstantiateAllTestButtons()
             m_groups["General"]["Open Settings"] = new Action(() => { AndroidNotificationCenter.OpenNotificationSettings(); });
             m_groups["General"]["Notification batch size: "+NotificationBatchSizes[_CurrentNotificationBatchSizeIndex]] = new Action(() => { ChangeNotificationBatchSize(NotificationBatchSizes); });
             m_groups["General"]["Reset notification counter"] = new Action(() => { NotificationCounter = 0; });
+            m_groups["General"]["Request permission"] = new Action(() => { RequestNotificationPermission(); });
 
             m_groups["Modify"] = new OrderedDictionary();
             //m_groups["Modify"]["Create notification preset"] = new Action(() => {  });
@@ -270,6 +288,31 @@ private void InstantiateAllTestButtons()
             m_gameObjectReferences.ButtonGroupTemplate.gameObject.SetActive(false);
         }
 
+        void RequestNotificationPermission()
+        {
+            var permission = AndroidNotificationCenter.UserPermissionToPost;
+            if (permission == PermissionStatus.Allowed)
+                m_LOGGER.Green("Already authorized");
+            if (permission == PermissionStatus.DeniedDontAskAgain)
+                m_LOGGER.Red("Denied, don't ask again");
+            else
+            {
+                m_LOGGER.Blue("Requesting permission");
+                permission = AndroidNotificationCenter.RequestPermissionToPost();
+                switch (permission)
+                {
+                    case PermissionStatus.Allowed:
+                        m_LOGGER.Green("Permission granted");
+                        break;
+                    case PermissionStatus.RequestPending:
+                        return;
+                    default:
+                        m_LOGGER.Red(permission.ToString());
+                        break;
+                }
+            }
+        }
+
 
         public void ChangeNotificationBatchSize(int[] notificationBatchSizes)
         {

TestProjects/Main/Assets/Scripts/AndroidTest.cs

@@ -34,11 +34,12 @@ public class iOSNotificationTemplateLocationTrigger : ScriptableObject
 
         [Space(10)]
         [Header("Location Trigger")]
-        public float CenterX = 0f;
-        public float CenterY = 0f;
+        public double Latitude = 0f;
+        public double Longitude = 0f;
         public float Radius = 2f;
         public bool NotifyOnEntry = true;
         public bool NotifyOnExit = false;
+        public bool Repeats = false;
 #endif
     }
 }

TestProjects/Main/Assets/Scripts/ScriptableObjects/iOSNotificationTemplateLocationTrigger.cs

@@ -321,10 +321,12 @@ private void InstantiateAllTestButtons()
                             Data = template.Data,
                             Trigger = new iOSNotificationLocationTrigger()
                             {
-                                Center = new Vector2(template.CenterX, template.CenterY),
+                                Latitude = template.Latitude,
+                                Longitude = template.Longitude,
                                 Radius = template.Radius,
                                 NotifyOnEntry = template.NotifyOnEntry,
-                                NotifyOnExit = template.NotifyOnExit
+                                NotifyOnExit = template.NotifyOnExit,
+                                Repeats = template.Repeats,
                             }
                         }
                     );
@@ -344,13 +346,13 @@ private void InstantiateAllTestButtons()
                 Transform buttonGroup =
                     GameObject.Instantiate(m_gameObjectReferences.ButtonGroupTemplate, m_gameObjectReferences.ButtonScrollViewContent);
                 Transform buttonGroupName = buttonGroup.GetChild(0).transform;
-                Transform buttonGameObject = buttonGroup.GetChild(1).transform;
+                Transform buttonGameObject = buttonGroup.GetChild(1).GetChild(0).transform;
                 // Set group name
                 buttonGroupName.GetComponentInChildren<Text>().text = group.Key.ToString();
                 // Instantiate buttons
                 foreach (DictionaryEntry test in group.Value)
                 {
-                    Transform button = GameObject.Instantiate(buttonGameObject, buttonGroup);
+                    Transform button = GameObject.Instantiate(buttonGameObject, buttonGroup.GetChild(1));
                     button.gameObject.GetComponentInChildren<Text>().text = test.Key.ToString();
                     button.GetComponent<Button>().onClick.AddListener(delegate
                     {

TestProjects/Main/Assets/Scripts/iOSTest.cs

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<gpx version="1.1" creator="Xcode">
+    <!-- A location used by location trigger button -->
+    <wpt lat="22.2847" lon="114.1582">
+        <name>Somewhere</name>
+    </wpt>
+</gpx>

TestProjects/Main/SimulateLocation.gpx

@@ -2,6 +2,10 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.1.0] - 2022-09-01
+
+TODO
+
 ## [2.0.2] - 2022-05-13
 
 ### Changes & Improvements:

com.unity.mobile.notifications/CHANGELOG.md

@@ -123,7 +123,8 @@ In the example below, the center coordinate is defined using the WGS 84 system.
 ```c#
 var locationTrigger = new iOSNotificationLocationTrigger()
 {
-    Center = new Vector2(2.294498f, 48.858263f),
+    Latitude = 48.858263,
+    Longitude = 2.294498,
     Radius = 250f,
     NotifyOnEntry = true,
     NotifyOnExit = false,

com.unity.mobile.notifications/Documentation~/iOS.md

@@ -83,6 +83,8 @@ private void InjectAndroidManifest(string projectPath)
                 AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.RECEIVE_BOOT_COMPLETED");
             }
 
+            AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.POST_NOTIFICATIONS");
+
             var exactScheduling = GetSetting<AndroidExactSchedulingOption>(settings, NotificationSettings.AndroidSettings.EXACT_ALARM);
             bool enableExact = (exactScheduling & AndroidExactSchedulingOption.ExactWhenAvailable) != 0;
             AppendAndroidMetadataField(manifestPath, manifestDoc, "com.unity.androidnotifications.exact_scheduling", enableExact ? "1" : "0");