@imatis/react-native-notifications 4.1.2-imatis.12 → 4.1.2-imatis.16

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,7 +67,7 @@ public class PushNotification implements IPushNotification {
         mAppLaunchHelper = appLaunchHelper;
         mJsIOHelper = JsIOHelper;
         mNotificationProps = createProps(bundle);
-        initDefaultChannel(context);
+        // initDefaultChannel(context);
     }
 
     @Override
@@ -184,7 +186,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 +198,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);
         }
@@ -215,6 +214,24 @@ public class PushNotification implements IPushNotification {
             Log.d(LOGTAG, e.getMessage());
         }
 
+        if(mNotificationProps.getCriticalAlert()){
+            try {
+                MediaPlayer mMediaPlayer = new MediaPlayer();
+                mMediaPlayer.setDataSource(mContext.getApplicationContext(), soundUri);
+                mMediaPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
+
+                mMediaPlayer.prepare();
+                mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                    public void onPrepared(MediaPlayer arg0) {
+                        mMediaPlayer.seekTo(0);
+                        mMediaPlayer.start();
+                    }
+                });
+            } catch (Exception e) {
+                Log.d(LOGTAG, e.getMessage());
+            }
+        }
+        
         return notification;
     }
 
@@ -281,9 +298,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);
@@ -293,6 +310,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

@@ -38,6 +38,26 @@ public class PushNotificationProps {
         return mBundle.containsKey("google.message_id");
     }
 
+    public Boolean getCriticalAlert() {
+        String val = mBundle.getString("criticalalert");
+        if(val != null && !val.isEmpty()){
+            return val.toLowerCase().equals("true");
+        }
+        return false;
+    }
+
+    public Double getCriticalAlertVolume() {
+        String val = mBundle.getString("criticalalertvolume");
+        if(val != null && !val.isEmpty()){
+            return Double.parseDouble(val);
+        }
+        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.12",
+  "version": "4.1.2-imatis.16",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "author": "Lidan Hifi <lidan.hifi@gmail.com>",
   "license": "MIT",