Release 7.0.0

Author: Dallas62

CHANGELOG.md

@@ -8,15 +8,24 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Breaking changes
 
+### Features
+
+### Fixed
+
+## [7.0.0] 2020-12-23
+
+### Breaking changes
+
 - (iOS) Replace deprecated local notification methods on iOS [1751](https://github.com/zo0r/react-native-push-notification/pull/1751)
 - (Android) Rename the Android package from `ReactNativePushNotification` to `ReactNativePushNotification` resolve [893](https://github.com/zo0r/react-native-push-notification/issues/893)
+- (Android) Allow `userInfo` to be stored in scheduled notification as in iOS (mapped as `data` on press or list scheduled notifications).
 
 ### Features
 
+- (Android) silent channel using playSound flag
 - (Android) implement 'bigLargeIcon' for Android notifications (must be combined with BigPicture) [#1730](https://github.com/zo0r/react-native-push-notification/pull/1730)
 - (Android) notification with inline reply [#612](https://github.com/zo0r/react-native-push-notification/pull/612)
-
-### Fixed
+- (Android) Support using drawable as Android small icon [#1787](https://github.com/zo0r/react-native-push-notification/pull/1787)
 
 ## [6.1.3] 2020-11-09
 

README.md

@@ -653,8 +653,6 @@ Make sure you have the receiver in `AndroidManifest.xml`:
   <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
 ```
 
-For iOS, you can use this [package](https://github.com/holmesal/react-native-ios-notification-actions) to add notification actions.
-
 Notifications with inline reply: 
 
 You must register an action as "ReplyInput", this will show in the notifications an input to write in. 
@@ -678,7 +676,17 @@ if(notification.action === "ReplyInput"){
   console.log("texto", notification.reply_text)// this will contain the inline reply text. 
 }
 ...
+```
+
+For iOS, you can use:
+
+```javascript
+PushNotification.setNotificationCategories(categories);
+```
+
+And use the `category` field in the notification.
 
+Documentation [here](https://github.com/react-native-push-notification-ios/push-notification-ios#how-to-perform-different-action-based-on-user-selected-action) to add notification actions.
 
 ## Set application badge icon
 

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationAttributes.java

@@ -10,6 +10,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Iterator;
+
 import static com.dieam.reactnativepushnotification.modules.RNPushNotification.LOG_TAG;
 
 public class RNPushNotificationAttributes {
@@ -51,6 +53,7 @@ public class RNPushNotificationAttributes {
     private static final String REPLAY_PLACEHOLDER_TEXT = "reply_placeholder_text";
     private static final String ALLOW_WHILE_IDLE = "allowWhileIdle";
     private static final String IGNORE_IN_FOREGROUND = "ignoreInForeground";
+    private static final String USER_INFO = "userInfo";
 
     private final String id;
     private final String message;
@@ -90,6 +93,7 @@ public class RNPushNotificationAttributes {
     private final String reply_placeholder_text;
     private final boolean allowWhileIdle;
     private final boolean ignoreInForeground;
+    private final String userInfo;
 
     public RNPushNotificationAttributes(Bundle bundle) {
         id = bundle.getString(ID);
@@ -130,6 +134,7 @@ public RNPushNotificationAttributes(Bundle bundle) {
         reply_placeholder_text = bundle.getString(REPLAY_PLACEHOLDER_TEXT);
         allowWhileIdle = bundle.getBoolean(ALLOW_WHILE_IDLE);
         ignoreInForeground = bundle.getBoolean(IGNORE_IN_FOREGROUND);
+        userInfo = bundle.getString(USER_INFO);
     }
 
     private RNPushNotificationAttributes(JSONObject jsonObject) {
@@ -172,6 +177,7 @@ private RNPushNotificationAttributes(JSONObject jsonObject) {
             reply_placeholder_text = jsonObject.has(REPLAY_PLACEHOLDER_TEXT) ? jsonObject.getString(REPLAY_PLACEHOLDER_TEXT) : null;
             allowWhileIdle = jsonObject.has(ALLOW_WHILE_IDLE) ? jsonObject.getBoolean(ALLOW_WHILE_IDLE) : false;
             ignoreInForeground = jsonObject.has(IGNORE_IN_FOREGROUND) ? jsonObject.getBoolean(IGNORE_IN_FOREGROUND) : false;
+            userInfo = jsonObject.has(USER_INFO) ? jsonObject.getString(USER_INFO) : null;
         } catch (JSONException e) {
             throw new IllegalStateException("Exception while initializing RNPushNotificationAttributes from JSON", e);
         }
@@ -180,6 +186,7 @@ private RNPushNotificationAttributes(JSONObject jsonObject) {
     @NonNull
     public static RNPushNotificationAttributes fromJson(String notificationAttributesJson) throws JSONException {
         JSONObject jsonObject = new JSONObject(notificationAttributesJson);
+        
         return new RNPushNotificationAttributes(jsonObject);
     }
 
@@ -191,41 +198,49 @@ public static RNPushNotificationAttributes fromJson(String notificationAttribute
      * @return true all fields in userInfo object match, false otherwise
      */
     public boolean matches(ReadableMap userInfo) {
-        Bundle bundle = toBundle();
+        try {
+          if(this.userInfo == null) {
+            return false;
+          }
+
+          JSONObject jsonObject = new JSONObject(this.userInfo);
 
-        ReadableMapKeySetIterator iterator = userInfo.keySetIterator();
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
+          ReadableMapKeySetIterator iterator = userInfo.keySetIterator();
+          while (iterator.hasNextKey()) {
+              String key = iterator.nextKey();
 
-            if (!bundle.containsKey(key))
-                return false;
+              if (!jsonObject.has(key))
+                  return false;
 
-            switch (userInfo.getType(key)) {
-                case Null: {
-                    if (bundle.get(key) != null)
-                        return false;
-                    break;
-                }
-                case Boolean: {
-                    if (userInfo.getBoolean(key) != bundle.getBoolean(key))
-                        return false;
-                    break;
-                }
-                case Number: {
-                    if ((userInfo.getDouble(key) != bundle.getDouble(key)) && (userInfo.getInt(key) != bundle.getInt(key)))
-                        return false;
-                    break;
-                }
-                case String: {
-                    if (!userInfo.getString(key).equals(bundle.getString(key)))
-                        return false;
-                    break;
-                }
-                case Map:
-                    return false;//there are no maps in the bundle
-                case Array:
-                    return false;//there are no arrays in the bundle
-            }
+              switch (userInfo.getType(key)) {
+                  case Null: {
+                      if (jsonObject.get(key) != null)
+                          return false;
+                      break;
+                  }
+                  case Boolean: {
+                      if (userInfo.getBoolean(key) != jsonObject.getBoolean(key))
+                          return false;
+                      break;
+                  }
+                  case Number: {
+                      if ((userInfo.getDouble(key) != jsonObject.getDouble(key)) && (userInfo.getInt(key) != jsonObject.getInt(key)))
+                          return false;
+                      break;
+                  }
+                  case String: {
+                      if (!userInfo.getString(key).equals(jsonObject.getString(key)))
+                          return false;
+                      break;
+                  }
+                  case Map:
+                      return false;//there are no maps in the jsonObject
+                  case Array:
+                      return false;//there are no arrays in the jsonObject
+              }
+          }
+        } catch(JSONException e) {
+          return false;
         }
 
         return true;
@@ -271,6 +286,7 @@ public Bundle toBundle() {
         bundle.putString(REPLAY_PLACEHOLDER_TEXT, reply_placeholder_text);
         bundle.putBoolean(ALLOW_WHILE_IDLE, allowWhileIdle);
         bundle.putBoolean(IGNORE_IN_FOREGROUND, ignoreInForeground);
+        bundle.putString(USER_INFO, userInfo);
         return bundle;
     }
 
@@ -315,6 +331,7 @@ public JSONObject toJson() {
             jsonObject.put(REPLAY_PLACEHOLDER_TEXT, reply_placeholder_text);
             jsonObject.put(ALLOW_WHILE_IDLE, allowWhileIdle);
             jsonObject.put(IGNORE_IN_FOREGROUND, ignoreInForeground);
+            jsonObject.put(USER_INFO, userInfo);
         } catch (JSONException e) {
             Log.e(LOG_TAG, "Exception while converting RNPushNotificationAttributes to " +
                     "JSON. Returning an empty object", e);
@@ -365,6 +382,7 @@ public String toString() {
                 ", reply_placeholder_text=" + reply_placeholder_text +
                 ", allowWhileIdle=" + allowWhileIdle +
                 ", ignoreInForeground=" + ignoreInForeground +
+                ", userInfo=" + userInfo +
                 '}';
     }
 
@@ -388,6 +406,10 @@ public String getNumber() {
         return number;
     }
 
+    public String getUserInfo() {
+        return userInfo;
+    }
+
     public String getRepeatType() {
         return repeatType;
     }

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java

@@ -431,10 +431,6 @@ public void sendToNotificationCentreWithPicture(Bundle bundle, Bitmap largeIconB
             if (!bundle.containsKey("playSound") || bundle.getBoolean("playSound")) {
                 String soundName = bundle.getString("soundName");
 
-                if (soundName == null) {
-                    soundName = "default";
-                }
-
                 soundUri = getSoundUri(soundName);
 
                 notification.setSound(soundUri);
@@ -772,6 +768,7 @@ public WritableArray getScheduledLocalNotifications() {
                 notificationMap.putString("id", notification.getId());
                 notificationMap.putString("repeatInterval", notification.getRepeatType());
                 notificationMap.putString("soundName", notification.getSound());
+                notificationMap.putString("data", notification.getUserInfo());
 
                 scheduled.pushMap(notificationMap);
             } catch (JSONException e) {

example/package.json

@@ -14,7 +14,7 @@
     "@react-native-community/push-notification-ios": "^1.4.0",
     "react": "16.13.1",
     "react-native": "0.63.3",
-    "react-native-push-notification": "lluis-sancho/react-native-push-notification"
+    "react-native-push-notification": "zo0r/react-native-push-notification#master"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",

index.js

@@ -210,6 +210,10 @@ Notifications.localNotification = function(details) {
     if(details && Array.isArray(details.actions)) {
       details.actions = JSON.stringify(details.actions);
     }
+
+    if(details.userInfo) {
+      details.userInfo = JSON.stringify(details.userInfo);
+    }
 
     this.handler.presentLocalNotification(details);
   }
@@ -289,6 +293,10 @@ Notifications.localNotificationSchedule = function(details) {
       details.actions = JSON.stringify(details.actions);
     }
 
+    if(details.userInfo) {
+      details.userInfo = JSON.stringify(details.userInfo);
+    }
+
     details.fireDate = details.date.getTime();
     delete details.date;
     // ignore iOS only repeatType
@@ -360,6 +368,8 @@ Notifications._transformNotificationObject = function(data, isFromBackground = n
       title: data.getTitle(),
       soundName: data.getSound(),
       fireDate: Date.parse(data._fireDate),
+      action: data.getActionIdentifier(),
+      reply_text: data.getUserText(),
       finish: (res) => data.finish(res)
     };
 
@@ -381,6 +391,15 @@ Notifications._transformNotificationObject = function(data, isFromBackground = n
         /* void */
       }
     }
+    
+    if ( typeof _notification.userInfo === 'string' ) {
+      try {
+        _notification.userInfo = JSON.parse(_notification.userInfo);
+      } catch(e) {
+        /* void */
+      }
+    }
+
 
     _notification.data = {
       ...(typeof _notification.userInfo === 'object' ? _notification.userInfo : {}),
@@ -521,11 +540,17 @@ Notifications.getScheduledLocalNotifications = function(callback) {
                         date: (notif.date ? new Date(notif.date) : null),
 						number: notif?.badge,
 						message: notif?.body,
-						title: notif?.title,
+            title: notif?.title,
+            data: notif?.userInfo
 					})
 				})
 			} else if(Platform.OS === 'android') {
 				mappedNotifications = notifications.map(notif => {
+
+          try {
+            notif.data = JSON.parse(notif.data);
+          } catch(e) { }
+
 					return ({
 						soundName: notif.soundName,
 						repeatInterval: notif.repeatInterval,
@@ -534,6 +559,7 @@ Notifications.getScheduledLocalNotifications = function(callback) {
 						number: notif.number,
 						message: notif.message,
 						title: notif.title,
+						data: notif.data,
 					})
 				})
 			}
@@ -576,4 +602,8 @@ Notifications.deleteChannel = function() {
   return this.callNative('deleteChannel', arguments);
 };
 
+Notifications.setNotificationCategories = function() {
+  return this.callNative('setNotificationCategories', arguments);
+}
+
 module.exports = Notifications;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-push-notification",
-  "version": "6.1.3",
+  "version": "7.0.0",
   "description": "React Native Local and Remote Notifications",
   "main": "index.js",
   "scripts": {