Make getNotificationFromIntent instance method

Author: aurimasc

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)
@@ -839,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/UnityNotificationManager.java

@@ -840,11 +840,11 @@ private static boolean isInForeground() {
         return (appProcessInfo.importance == IMPORTANCE_FOREGROUND || appProcessInfo.importance == IMPORTANCE_VISIBLE);
     }
 
-    public static Notification getNotificationFromIntent(Context context, Intent intent) {
+    public Notification getNotificationFromIntent(Intent intent) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (intent.hasExtra(KEY_NOTIFICATION_ID)) {
                 int id = intent.getExtras().getInt(KEY_NOTIFICATION_ID);
-                StatusBarNotification[] shownNotifications = getNotificationManager(context).getActiveNotifications();
+                StatusBarNotification[] shownNotifications = getNotificationManager().getActiveNotifications();
                 for (StatusBarNotification n : shownNotifications) {
                     if (n.getId() == id) {
                         return n.getNotification();
@@ -853,7 +853,7 @@ public static Notification getNotificationFromIntent(Context context, Intent int
             }
         }
 
-        Object notification = getNotificationOrBuilderForIntent(context, intent);
+        Object notification = getNotificationOrBuilderForIntent(mContext, intent);
         if (notification == null)
             return null;
         if (notification instanceof Notification)