Merge pull request #207 from Unity-Technologies/fix-recovering-builder

Fix recovering builder

Author: aurimasc

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

@@ -524,18 +524,23 @@ protected static Class<?> getOpenAppActivity(Context context, boolean fallbackTo
     }
 
     protected static Notification.Builder recoverBuilder(Context context, Notification notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Notification.Builder builder = Notification.Builder.recoverBuilder(context, notification);
-            // extras not recovered, transfer manually
-            builder.setExtras(notification.extras);
-            return builder;
-        }
-        else {
-            return recoverBuilderPreNougat(context, notification);
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                Notification.Builder builder = Notification.Builder.recoverBuilder(context, notification);
+                // extras not recovered, transfer manually
+                builder.setExtras(notification.extras);
+                return builder;
+            }
+        } catch (Exception e) {
+            Log.e(TAG_UNITY, "Failed to recover builder for notification!", e);
+        } catch (OutOfMemoryError e) {
+            Log.e(TAG_UNITY, "Failed to recover builder for notification!", e);
         }
+
+        return recoverBuilderCustom(context, notification);
     }
 
-    private static Notification.Builder recoverBuilderPreNougat(Context context, Notification notification) {
+    private static Notification.Builder recoverBuilderCustom(Context context, Notification notification) {
         String channelID = notification.extras.getString(KEY_CHANNEL_ID);
         Notification.Builder builder = UnityNotificationManager.createNotificationBuilder(context, channelID);
         UnityNotificationManager.setNotificationIcon(builder, KEY_SMALL_ICON, notification.extras.getString(KEY_SMALL_ICON));

com.unity.mobile.notifications/Tests/Runtime/Android/AndroidNotificationSimpleTests.cs

@@ -472,7 +472,7 @@ public void LegacyRecoverBuilderProducesTheSameNotification()
         var manager = managerClass.GetStatic<AndroidJavaObject>("mUnityNotificationManager");
         var context = manager.Get<AndroidJavaObject>("mContext");
         var utils = new AndroidJavaClass("com.unity.androidnotifications.UnityNotificationUtilities");
-        var recoveredBuilder = utils.CallStatic<AndroidJavaObject>("recoverBuilderPreNougat", context, notification);
+        var recoveredBuilder = utils.CallStatic<AndroidJavaObject>("recoverBuilderCustom", context, notification);
         Assert.IsNotNull(recoveredBuilder);
 
         var notificationAfterRecover = recoveredBuilder.Call<AndroidJavaObject>("build");