@imatis/react-native-notifications 4.1.2-imatis.13 → 4.1.2-imatis.17

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java

@@ -9,6 +9,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -65,15 +67,18 @@ public class PushNotification implements IPushNotification {
         mAppLaunchHelper = appLaunchHelper;
         mJsIOHelper = JsIOHelper;
         mNotificationProps = createProps(bundle);
-        initDefaultChannel(context);
+        // initDefaultChannel(context);
     }
 
     @Override
-    public void onReceived() throws InvalidNotificationException {
-        if (!mAppLifecycleFacade.isAppVisible()) {
-            notifyReceivedBackgroundToJS();
+    public void onReceived() {
+        ReactContext reactContext = mAppLifecycleFacade.getRunningReactContext();
+        boolean hasActiveCatalystInstance = reactContext != null && reactContext.hasActiveCatalystInstance();
+        if (!mAppLifecycleFacade.isAppVisible() || !hasActiveCatalystInstance) {
             postNotification(null);
-        } else {
+            notifyReceivedBackgroundToJS();
+        }
+        if (hasActiveCatalystInstance) {
             notifyReceivedToJS();
         }
     }
@@ -184,7 +189,8 @@ public class PushNotification implements IPushNotification {
                 .setContentIntent(intent)
                 .setDefaults(Notification.DEFAULT_VIBRATE)
                 .setAutoCancel(true)
-                .setPriority(Notification.PRIORITY_HIGH);
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setOngoing(mNotificationProps.getOngoing());
 
         if (soundUri != null) {
             notification.setSound(soundUri);
@@ -195,14 +201,10 @@ public class PushNotification implements IPushNotification {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
             String channelId = mNotificationProps.getChannelId();
-            channelId = channelId != null ? channelId : DEFAULT_CHANNEL_ID;
+            channelId = channelId != null ? channelId : DEFAULT_CHANNEL_ID + sound;
             NotificationChannel channel = notificationManager.getNotificationChannel(channelId);
-            if (channel != null && soundUri != null) {
-                AudioAttributes audioAttributes = new AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-                        .setUsage(AudioAttributes.USAGE_NOTIFICATION)
-                        .build();
-                channel.setSound(soundUri, audioAttributes);
+            if (channel == null && soundUri != null) {
+                initDefaultChannel(mContext, channelId, soundUri);
             }
             notification.setChannelId(channelId);
         }
@@ -299,9 +301,9 @@ public class PushNotification implements IPushNotification {
         notificationManager.cancelAll();
     }
 
-    private void initDefaultChannel(Context context) {
+    private void initDefaultChannel(Context context, String channelId, Uri soundUri) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel defaultChannel = new NotificationChannel(DEFAULT_CHANNEL_ID,
+            NotificationChannel defaultChannel = new NotificationChannel(channelId,
                     DEFAULT_CHANNEL_NAME,
                     NotificationManager.IMPORTANCE_HIGH);
             defaultChannel.setDescription(DEFAULT_CHANNEL_NAME);
@@ -311,6 +313,13 @@ public class PushNotification implements IPushNotification {
             defaultChannel.enableVibration(true);
             defaultChannel.setShowBadge(true);
             defaultChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+            if (soundUri != null) {
+                AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                        .build();
+                defaultChannel.setSound(soundUri, audioAttributes);
+            }
             final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.createNotificationChannel(defaultChannel);
         }

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java

@@ -54,6 +54,10 @@ public class PushNotificationProps {
         return 0.0;
     }
 
+    public Boolean getOngoing() {
+        return mBundle.getBoolean("ongoing");
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(1024);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imatis/react-native-notifications",
-  "version": "4.1.2-imatis.13",
+  "version": "4.1.2-imatis.17",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "author": "Lidan Hifi <lidan.hifi@gmail.com>",
   "license": "MIT",