Refactor initialization

Author: aurimasc

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

@@ -570,11 +570,9 @@ public static bool Initialize()
 #elif UNITY_ANDROID
             var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
             s_CurrentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
-            var context = s_CurrentActivity.Call<AndroidJavaObject>("getApplicationContext");
 
             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;

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

@@ -71,14 +71,15 @@ public class UnityNotificationManager extends BroadcastReceiver {
     static final String NOTIFICATION_IDS_SHARED_PREFS = "UNITY_STORED_NOTIFICATION_IDS";
     static final String NOTIFICATION_IDS_SHARED_PREFS_KEY = "UNITY_NOTIFICATION_IDS";
 
-    private void initialize(Activity activity) {
+    private void initialize(Activity activity, NotificationCallback notificationCallback) {
         if (mContext == null)
             mContext = activity.getApplicationContext();
         mActivity = activity;
         if (mBackgroundThread == null)
             mBackgroundThread = new UnityNotificationBackgroundThread(mContext, mScheduledNotifications);
         if (mRandom == null)
             mRandom = new Random();
+        mNotificationCallback = notificationCallback;
 
         try {
             ApplicationInfo ai = activity.getPackageManager().getApplicationInfo(activity.getPackageName(), PackageManager.GET_META_DATA);
@@ -117,12 +118,12 @@ public static synchronized UnityNotificationManager getNotificationManagerImpl(C
     }
 
     // Called from managed code.
-    public static synchronized UnityNotificationManager getNotificationManagerImpl(Context context, Activity activity) {
+    public static synchronized UnityNotificationManager getNotificationManagerImpl(Activity activity, NotificationCallback notificationCallback) {
         if (mUnityNotificationManager == null) {
             mUnityNotificationManager = new UnityNotificationManager();
         }
 
-        mUnityNotificationManager.initialize(activity);
+        mUnityNotificationManager.initialize(activity, notificationCallback);
         return mUnityNotificationManager;
     }
 
@@ -135,11 +136,6 @@ public static NotificationManager getNotificationManager(Context context) {
         return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
     }
 
-    // Called from managed code.
-    public void setNotificationCallback(NotificationCallback notificationCallback) {
-        UnityNotificationManager.mNotificationCallback = notificationCallback;
-    }
-
     public void registerNotificationChannel(
             String id,
             String name,