Fix merge

aurimasc · aurimasc · commit 0903796332cb · 2022-05-20T14:25:35.000+03:00
diff --git a/com.unity.mobile.notifications/Runtime/Android/Plugins/com/unity/androidnotifications/UnityNotificationManager.java b/com.unity.mobile.notifications/Runtime/Android/Plugins/com/unity/androidnotifications/UnityNotificationManager.java
@@ -719,6 +719,7 @@ protected static void notify(Context context, int id, Notification notification)
         boolean showInForeground = notification.extras.getBoolean(KEY_SHOW_IN_FOREGROUND, true);
         if (!isInForeground() || showInForeground) {
             getNotificationManager(context).notify(id, notification);
+        }
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) synchronized (UnityNotificationManager.class) {
             mVisibleNotifications.add(Integer.valueOf(id));
         }

Original file line number	Diff line number	Diff line change
`@@ -719,6 +719,7 @@ protected static void notify(Context context, int id, Notification notification)`
`719`	`719`	`boolean showInForeground = notification.extras.getBoolean(KEY_SHOW_IN_FOREGROUND, true);`
`720`	`720`	`if (!isInForeground() \|\| showInForeground) {`
`721`	`721`	`getNotificationManager(context).notify(id, notification);`
	`722`	`+ }`
`722`	`723`	`if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) synchronized (UnityNotificationManager.class) {`
`723`	`724`	`mVisibleNotifications.add(Integer.valueOf(id));`
`724`	`725`	`}`