Merge branch 'master' into rework-serialization

Author: aurimasc

TestProjects/Main/Assets/Resources/iOSNotifications/TimeIntervalTrigger/Only Body.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4fc6c74f6df364b36b9afcbfd8cfbca3, type: 3}
   m_Name: Only Body
   m_EditorClassIdentifier: 
-  ButtonName: Empty notification + body
+  ButtonName: Empty notification + body (silent)
   Identifier: 
   CategoryIdentifier: 
   ThreadIdentifier: 
@@ -25,3 +25,4 @@ MonoBehaviour:
   Data: 
   TimeTriggerInterval: 1
   Repeats: 0
+  SoundType: 4

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

@@ -36,6 +36,7 @@ public class iOSNotificationTemplateTimeTrigger : ScriptableObject
         [Header("Time Trigger")]
         public Int32 TimeTriggerInterval;
         public bool Repeats = false;
+        public NotificationSoundType SoundType;
 
         [Serializable]
         public struct UserDataItem

TestProjects/Main/Assets/Scripts/iOSTest.cs

@@ -226,6 +226,7 @@ private void InstantiateAllTestButtons()
                         ForegroundPresentationOption = template.PresentationOptions,
                         Badge = template.Badge,
                         Data = template.Data,
+                        SoundType = template.SoundType,
                         Trigger = new iOSNotificationTimeIntervalTrigger()
                         {
                             TimeInterval = TimeSpan.FromSeconds(template.TimeTriggerInterval),

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

@@ -225,3 +225,9 @@ Sometimes, you might want to set custom data on the payload for a remote notific
 ```
 
 You have to use the exact `data` as the key of your custom data, because this is what the package looks for.
+
+#### Images, videos and sounds
+
+By default notifications use the default system sound. Sound can be disabled by changing the [iOSNotificationCenter.SoundType](../api/Unity.Notifications.iOS.iOSNotification.html#Unity_Notifications_iOS_iOSNotification_SoundType). A custom sound can be used by using Default sound type and assigning sound file name to [iOSNotificationCenter.SoundName](../api/Unity.Notifications.iOS.iOSNotification.html#Unity_Notifications_iOS_iOSNotification_SoundName). The sound file itself has to be manually added to XCode project. For more information regarding file placement and supported formats, see [Apple documentation](https://developer.apple.com/documentation/usernotifications/unnotificationsound?language=objc).
+
+Images or video can added to notifications by using [attachments](../api/Unity.Notifications.iOS.iOSNotificationAttachment.html).

com.unity.mobile.notifications/Runtime/Android/AndroidNotificationCenter.cs

@@ -106,7 +106,7 @@ public NotificationManagerJni(AndroidJavaClass clazz, AndroidJavaObject obj)
 
         void CollectMethods(AndroidJavaClass clazz)
         {
-            getNotificationFromIntent = JniApi.FindMethod(clazz, "getNotificationFromIntent", "(Landroid/content/Context;Landroid/content/Intent;)Landroid/app/Notification;", true);
+            getNotificationFromIntent = JniApi.FindMethod(clazz, "getNotificationFromIntent", "(Landroid/content/Intent;)Landroid/app/Notification;", false);
             setNotificationIcon = JniApi.FindMethod(clazz, "setNotificationIcon", "(Landroid/app/Notification$Builder;Ljava/lang/String;Ljava/lang/String;)V", true);
             setNotificationColor = JniApi.FindMethod(clazz, "setNotificationColor", "(Landroid/app/Notification$Builder;I)V", true);
             getNotificationColor = JniApi.FindMethod(clazz, "getNotificationColor", "(Landroid/app/Notification;)Ljava/lang/Integer;", true);
@@ -118,9 +118,9 @@ void CollectMethods(AndroidJavaClass clazz)
             createNotificationBuilder = JniApi.FindMethod(clazz, "createNotificationBuilder", "(Ljava/lang/String;)Landroid/app/Notification$Builder;", false);
         }
 
-        public AndroidJavaObject GetNotificationFromIntent(AndroidJavaObject activity, AndroidJavaObject intent)
+        public AndroidJavaObject GetNotificationFromIntent(AndroidJavaObject intent)
         {
-            return klass.CallStatic<AndroidJavaObject>(getNotificationFromIntent, activity, intent);
+            return self.Call<AndroidJavaObject>(getNotificationFromIntent, intent);
         }
 
         public void SetNotificationIcon(AndroidJavaObject builder, AndroidJavaObject keyName, string icon)
@@ -568,13 +568,11 @@ public static bool Initialize()
 #if UNITY_EDITOR || !UNITY_ANDROID
             s_CurrentActivity = null;
 #elif UNITY_ANDROID
-            var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
-            s_CurrentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
-            var context = s_CurrentActivity.Call<AndroidJavaObject>("getApplicationContext");
+            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
+                s_CurrentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
 
             var notificationManagerClass = new AndroidJavaClass("com.unity.androidnotifications.UnityNotificationManager");
-            var notificationManager = notificationManagerClass.CallStatic<AndroidJavaObject>("getNotificationManagerImpl", context, s_CurrentActivity);
-            notificationManager.Call("setNotificationCallback", new NotificationCallback());
+            var notificationManager = notificationManagerClass.CallStatic<AndroidJavaObject>("getNotificationManagerImpl", s_CurrentActivity, new NotificationCallback());
             s_Jni = new JniApi(notificationManagerClass, notificationManager);
 
             s_Initialized = true;
@@ -841,7 +839,7 @@ public static AndroidNotificationIntentData GetLastNotificationIntent()
                 return null;
 
             var intent = s_CurrentActivity.Call<AndroidJavaObject>("getIntent");
-            var notification = s_Jni.NotificationManager.GetNotificationFromIntent(s_CurrentActivity, intent);
+            var notification = s_Jni.NotificationManager.GetNotificationFromIntent(intent);
             if (notification == null)
                 return null;
             return GetNotificationData(notification);

com.unity.mobile.notifications/Runtime/Android/Plugins/com/unity/androidnotifications/UnityNotificationBackgroundThread.java

@@ -4,7 +4,6 @@
 import static com.unity.androidnotifications.UnityNotificationManager.TAG_UNITY;
 
 import android.app.Notification;
-import android.content.Context;
 import android.util.Log;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -17,7 +16,7 @@
 public class UnityNotificationBackgroundThread extends Thread {
     private static abstract class Task {
         // returns true if notificationIds was modified (needs to be saved)
-        public abstract boolean run(Context context, ConcurrentHashMap<Integer, Notification.Builder> notifications);
+        public abstract boolean run(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> notifications);
     }
 
     private static class ScheduleNotificationTask extends Task {
@@ -34,7 +33,7 @@ public ScheduleNotificationTask(int id, Notification.Builder builder, boolean cu
         }
 
         @Override
-        public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
+        public boolean run(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
             String id = String.valueOf(notificationId);
             Integer ID = Integer.valueOf(notificationId);
             boolean didSchedule = false;
@@ -45,8 +44,8 @@ public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Buil
                 // if failed to schedule or replace, remove
                 if (!didSchedule) {
                     notifications.remove(notificationId);
-                    UnityNotificationManager.cancelPendingNotificationIntent(context, notificationId);
-                    UnityNotificationManager.deleteExpiredNotificationIntent(context, id);
+                    manager.cancelPendingNotificationIntent(notificationId);
+                    manager.deleteExpiredNotificationIntent(id);
                 }
             }
 
@@ -62,10 +61,10 @@ public CancelNotificationTask(int id) {
         }
 
         @Override
-        public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
-            UnityNotificationManager.cancelPendingNotificationIntent(context, notificationId);
+        public boolean run(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
+            manager.cancelPendingNotificationIntent(notificationId);
             if (notifications.remove(notificationId) != null) {
-                UnityNotificationManager.deleteExpiredNotificationIntent(context, String.valueOf(notificationId));
+                manager.deleteExpiredNotificationIntent(String.valueOf(notificationId));
                 return true;
             }
 
@@ -75,15 +74,15 @@ public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Buil
 
     private static class CancelAllNotificationsTask extends Task {
         @Override
-        public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
+        public boolean run(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
             if (notifications.isEmpty())
                 return false;
 
             Enumeration<Integer> ids = notifications.keys();
             while (ids.hasMoreElements()) {
                 Integer notificationId = ids.nextElement();
-                UnityNotificationManager.cancelPendingNotificationIntent(context, notificationId);
-                UnityNotificationManager.deleteExpiredNotificationIntent(context, String.valueOf(notificationId));
+                manager.cancelPendingNotificationIntent(notificationId);
+                manager.deleteExpiredNotificationIntent(String.valueOf(notificationId));
             }
 
             notifications.clear();
@@ -99,25 +98,25 @@ public HousekeepingTask(UnityNotificationBackgroundThread th) {
         }
 
         @Override
-        public boolean run(Context context, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
+        public boolean run(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
             HashSet<String> notificationIds = new HashSet<>();
             Enumeration<Integer> ids = notifications.keys();
             while (ids.hasMoreElements()) {
                 notificationIds.add(String.valueOf(ids.nextElement()));
             }
-            thread.performHousekeeping(context, notificationIds);
+            thread.performHousekeeping(notificationIds);
             return false;
         }
     }
 
     private static final int TASKS_FOR_HOUSEKEEPING = 50;
     private LinkedTransferQueue<Task> mTasks = new LinkedTransferQueue();
     private ConcurrentHashMap<Integer, Notification.Builder> mScheduledNotifications;
-    private static Context mContext;
+    private UnityNotificationManager mManager;
     private int mTasksSinceHousekeeping = TASKS_FOR_HOUSEKEEPING;  // we want hoursekeeping at the start
 
-    public UnityNotificationBackgroundThread(Context context, ConcurrentHashMap<Integer, Notification.Builder> scheduledNotifications) {
-        mContext = context;
+    public UnityNotificationBackgroundThread(UnityNotificationManager manager, ConcurrentHashMap<Integer, Notification.Builder> scheduledNotifications) {
+        mManager = manager;
         mScheduledNotifications = scheduledNotifications;
         // rescheduling after reboot may have loaded, otherwise load here
         if (mScheduledNotifications.size() == 0)
@@ -146,7 +145,7 @@ public void run() {
         while (true) {
             try {
                 Task task = mTasks.take();
-                haveChanges |= executeTask(mContext, task, mScheduledNotifications);
+                haveChanges |= executeTask(mManager, task, mScheduledNotifications);
                 if (!(task instanceof HousekeepingTask))
                     ++mTasksSinceHousekeeping;
                 if (mTasks.size() == 0 && haveChanges) {
@@ -160,26 +159,26 @@ public void run() {
         }
     }
 
-    private boolean executeTask(Context context, Task task, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
+    private boolean executeTask(UnityNotificationManager manager, Task task, ConcurrentHashMap<Integer, Notification.Builder> notifications) {
         try {
-            return task.run(context, notifications);
+            return task.run(manager, notifications);
         } catch (Exception e) {
             Log.e(TAG_UNITY, "Exception executing notification task", e);
             return false;
         }
     }
 
-    private void performHousekeeping(Context context, Set<String> notificationIds) {
+    private void performHousekeeping(Set<String> notificationIds) {
         // don't do housekeeping if last task we did was housekeeping (other=1)
         boolean performHousekeeping = mTasksSinceHousekeeping >= TASKS_FOR_HOUSEKEEPING;
         mTasksSinceHousekeeping = 0;
         if (performHousekeeping)
-            UnityNotificationManager.performNotificationHousekeeping(context, notificationIds);
-        UnityNotificationManager.saveScheduledNotificationIDs(context, notificationIds);
+            mManager.performNotificationHousekeeping(notificationIds);
+        mManager.saveScheduledNotificationIDs(notificationIds);
     }
 
     private void loadNotifications() {
-        List<Notification.Builder> notifications = UnityNotificationManager.loadSavedNotifications(mContext);
+        List<Notification.Builder> notifications = mManager.loadSavedNotifications();
         for (Notification.Builder builder : notifications) {
             int id = builder.getExtras().getInt(KEY_ID, -1);
             mScheduledNotifications.put(id, builder);