Merge pull request #221 from Unity-Technologies/android-api33-support

Android API 33 support

Author: aurimasc

TestProjects/Main/Assets/Scripts/AndroidTest.cs

@@ -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)
         {

com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs

@@ -82,6 +82,8 @@ private void InjectAndroidManifest(string projectPath)
                 AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.RECEIVE_BOOT_COMPLETED");
             }
 
+            AppendAndroidPermissionField(manifestPath, manifestDoc, "android.permission.POST_NOTIFICATIONS");
+
             manifestDoc.Save(manifestPath);
         }
 

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Android;
 
 #if UNITY_2022_2_OR_NEWER
 using JniMethodID = System.IntPtr;
@@ -13,6 +14,37 @@
 
 namespace Unity.Notifications.Android
 {
+    /// <summary>
+    /// Represents a status of the Android runtime permission.
+    /// </summary>
+    public enum PermissionStatus
+    {
+        /// <summary>
+        /// No permission as user was not prompted for it.
+        /// </summary>
+        NotRequested = 0,
+
+        /// <summary>
+        /// User gave permission.
+        /// </summary>
+        Allowed = 1,
+
+        /// <summary>
+        /// User denied permission.
+        /// </summary>
+        Denied = 2,
+
+        /// <summary>
+        /// User denied permission and expressed intent to not be prompted again.
+        /// </summary>
+        DeniedDontAskAgain = 3,
+
+        /// <summary>
+        /// A request for permission was made and user hasn't responded yet.
+        /// </summary>
+        RequestPending = 4,
+    }
+
     /// <summary>
     /// Current status of a scheduled notification, can be queried using CheckScheduledNotificationStatus.
     /// </summary>
@@ -535,6 +567,15 @@ public static JniMethodID FindMethod(AndroidJavaClass clazz, string name, string
     /// </summary>
     public class AndroidNotificationCenter
     {
+        private static int API_POST_NOTIFICATIONS_PERMISSION_REQUIRED = 33;
+        private static string PERMISSION_POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";
+
+        /// <summary>
+        /// A PlayerPrefs key used to save users reply to POST_NOTIFICATIONS request (integer value of the PermissionStatus).
+        /// </summary>
+        /// <see cref="PermissionStatus"/>
+        public static string SETTING_POST_NOTIFICATIONS_PERMISSION = "com.unity.androidnotifications.PostNotificationsPermission";
+
         /// <summary>
         /// The delegate type for the notification received callbacks.
         /// </summary>
@@ -547,6 +588,8 @@ public class AndroidNotificationCenter
 
         private static AndroidJavaObject s_CurrentActivity;
         private static JniApi s_Jni;
+        private static int s_DeviceApiLevel;
+        private static int s_TargetApiLevel;
         private static bool s_Initialized = false;
 
         /// <summary>
@@ -575,11 +618,86 @@ public static bool Initialize()
             var notificationManager = notificationManagerClass.CallStatic<AndroidJavaObject>("getNotificationManagerImpl", s_CurrentActivity, new NotificationCallback());
             s_Jni = new JniApi(notificationManagerClass, notificationManager);
 
+            using (var version = new AndroidJavaClass("android/os/Build$VERSION"))
+                s_DeviceApiLevel = version.GetStatic<int>("SDK_INT");
+            s_TargetApiLevel = notificationManager.Call<int>("getTargetSdk");
+
             s_Initialized = true;
 #endif
             return s_Initialized;
         }
 
+        static void SetPostPermissionStting(PermissionStatus status)
+        {
+            PlayerPrefs.SetInt(SETTING_POST_NOTIFICATIONS_PERMISSION, (int)status);
+        }
+
+        /// <summary>
+        /// Has user given permission to post notifications.
+        /// Before Android 13 (API 33) no permission is required.
+        /// </summary>
+        public static PermissionStatus UserPermissionToPost
+        {
+            get
+            {
+                if (!Initialize())
+                    return PermissionStatus.Denied;
+                if (s_DeviceApiLevel < API_POST_NOTIFICATIONS_PERMISSION_REQUIRED)
+                    return PermissionStatus.Allowed;
+
+                var permissionStatus = (PermissionStatus)PlayerPrefs.GetInt(SETTING_POST_NOTIFICATIONS_PERMISSION, (int)PermissionStatus.NotRequested);
+                var allowed = Permission.HasUserAuthorizedPermission(PERMISSION_POST_NOTIFICATIONS);
+                if (allowed)
+                {
+                    if (permissionStatus != PermissionStatus.Allowed)
+                        SetPostPermissionStting(PermissionStatus.Allowed);
+                    return PermissionStatus.Allowed;
+                }
+
+                switch (permissionStatus)
+                {
+                    case PermissionStatus.NotRequested:
+                        break;
+                    case PermissionStatus.Allowed:
+                        permissionStatus = PermissionStatus.Denied;
+                        SetPostPermissionStting(permissionStatus);
+                        break;
+                }
+
+                return permissionStatus;
+            }
+        }
+
+        /// <summary>
+        /// Request user permission to post notifications.
+        /// Before Android 13 (API 33) will allow immediately.
+        /// May succeed or fail immediately. Users response is saved to PlayerPrefs.
+        /// Respects users wish to not be asked again.
+        /// </summary>
+        /// <returns>PermissionStatus.RequestPending if user is prompted for permission or immediately known reply.</returns>
+        /// <seealso cref="SETTING_POST_NOTIFICATIONS_PERMISSION"/>
+        public static PermissionStatus RequestPermissionToPost()
+        {
+            var permissionStatus = UserPermissionToPost;
+            if (permissionStatus == PermissionStatus.Allowed)
+                return permissionStatus;
+            if (permissionStatus == PermissionStatus.DeniedDontAskAgain)
+                return permissionStatus;
+            // Can only request permission if applications target SDK is 33, not actual device SDK
+            if (s_TargetApiLevel < API_POST_NOTIFICATIONS_PERMISSION_REQUIRED)
+            {
+                SetPostPermissionStting(PermissionStatus.DeniedDontAskAgain);
+                return PermissionStatus.DeniedDontAskAgain;
+            }
+
+            var callbacks = new PermissionCallbacks();
+            callbacks.PermissionGranted += (unused) => SetPostPermissionStting(PermissionStatus.Allowed);
+            callbacks.PermissionDenied += (unused) => SetPostPermissionStting(PermissionStatus.Denied);
+            callbacks.PermissionDeniedAndDontAskAgain += (unused) => SetPostPermissionStting(PermissionStatus.DeniedDontAskAgain);
+            Permission.RequestUserPermission(PERMISSION_POST_NOTIFICATIONS, callbacks);
+            return PermissionStatus.RequestPending;
+        }
+
         /// <summary>
         ///  Creates a notification channel that notifications can be posted to.
         ///  Notification channel settings can be changed by users on devices running Android 8.0 and above.

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

@@ -77,7 +77,7 @@ private void initialize(Activity activity, NotificationCallback notificationCall
         mNotificationCallback = notificationCallback;
         if (mScheduledNotifications == null)
             mScheduledNotifications = new ConcurrentHashMap();
-        if (mBackgroundThread == null)
+        if (mBackgroundThread == null || !mBackgroundThread.isAlive())
             mBackgroundThread = new UnityNotificationBackgroundThread(this, mScheduledNotifications);
         if (mRandom == null)
             mRandom = new Random();
@@ -108,7 +108,8 @@ private void initialize(Activity activity, NotificationCallback notificationCall
             Log.e(TAG_UNITY, "Failed to load meta-data, NullPointer: " + e.getMessage());
         }
 
-        mBackgroundThread.start();
+        if (!mBackgroundThread.isAlive())
+            mBackgroundThread.start();
     }
 
     static synchronized UnityNotificationManager getNotificationManagerImpl(Context context) {
@@ -137,6 +138,10 @@ public NotificationManager getNotificationManager() {
         return (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
     }
 
+    public int getTargetSdk() {
+        return mContext.getApplicationInfo().targetSdkVersion;
+    }
+
     public void registerNotificationChannel(
             String id,
             String name,