Populate userInfo on android, update RNCPushNotificationIOS

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [Dallas62]
+custom: ["https://www.buymeacoffee.com/Dallas62"]

CHANGELOG.md

@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 
 
-## [4.4.0] 2020-07-06
+## [4.0.0] 2020-07-06
 
 ### Breaking changes
 

README.md

@@ -330,9 +330,9 @@ PushNotification.localNotification({
   /* iOS only properties */
   alertAction: "view", // (optional) default: view
   category: "", // (optional) default: empty string
-  userInfo: {}, // (optional) default: {} (using null throws a JSON value '<null>' error)
 
   /* iOS and Android properties */
+  userInfo: {}, // (optional) default: {} (using null throws a JSON value '<null>' error)
   title: "My Notification Title", // (optional)
   message: "My Notification Message", // (required)
   playSound: false, // (optional) default: true

example/NotifService.js

@@ -79,9 +79,9 @@ export default class NotifService {
       /* iOS only properties */
       alertAction: 'view', // (optional) default: view
       category: '', // (optional) default: empty string
-      userInfo: {}, // (optional) default: {} (using null throws a JSON value '<null>' error)
-
+
       /* iOS and Android properties */
+      userInfo: {}, // (optional) default: {} (using null throws a JSON value '<null>' error)
       title: 'Scheduled Notification', // (optional)
       message: 'My Notification Message', // (required)
       playSound: !!soundName, // (optional) default: true

example/ios/Podfile.lock

@@ -292,7 +292,7 @@ PODS:
     - React-cxxreact (= 0.62.2)
     - React-jsi (= 0.62.2)
     - ReactCommon/callinvoker (= 0.62.2)
-  - RNCPushNotificationIOS (1.2.2):
+  - RNCPushNotificationIOS (1.3.0):
     - React
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -453,10 +453,10 @@ SPEC CHECKSUMS:
   React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d
   React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256
   ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
-  RNCPushNotificationIOS: 4c97a36dbec42dba411cc35e6dac25e34a805fde
+  RNCPushNotificationIOS: d5fd66aed4e03c6491ca0c6111a03d4f6455ff6c
   Yoga: 3ebccbdd559724312790e7742142d062476b698e
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 56c2537f71f3f02200d6918c542a8e89a0b422fa
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

example/package.json

@@ -11,7 +11,7 @@
     "pod-install": "cd ios && pod install"
   },
   "dependencies": {
-    "@react-native-community/push-notification-ios": "^1.2.2",
+    "@react-native-community/push-notification-ios": "^1.3.0",
     "react": "16.11.0",
     "react-native": "0.62.2",
     "react-native-push-notification": "git+https://git@github.com/zo0r/react-native-push-notification.git"

index.js

@@ -152,6 +152,12 @@ Notifications.localNotification = function(details) {
     }
   }
 
+  if (details.userInfo) {
+    details.userInfo.id = details.userInfo.id || details.id;
+  } else {
+    details.userInfo = {id: details.id};
+  }
+
   if (Platform.OS === 'ios') {
     // https://developer.apple.com/reference/uikit/uilocalnotification
 
@@ -161,12 +167,6 @@ Notifications.localNotification = function(details) {
       soundName = ''; // empty string results in no sound (and no vibration)
     }
 
-    if (details.userInfo) {
-      details.userInfo.id = details.userInfo.id || details.id;
-    } else {
-      details.userInfo = {id: details.id};
-    }
-
     // for valid fields see: https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/PayloadKeyReference.html
     // alertTitle only valid for apple watch: https://developer.apple.com/library/ios/documentation/iPhone/Reference/UILocalNotification_Class/#//apple_ref/occ/instp/UILocalNotification/alertTitle
 
@@ -190,6 +190,10 @@ Notifications.localNotification = function(details) {
       }
     }
 
+    if(!details.data && details.userInfo){
+      details.data = details.userInfo;
+    }
+
     if (details && typeof details.shortcutId === 'number') {
       if(isNaN(details.shortcutId)) {
         console.warn('NaN value has been passed as shortcutId');
@@ -224,19 +228,19 @@ Notifications.localNotificationSchedule = function(details) {
     }
   }
 
+  if (details.userInfo) {
+    details.userInfo.id = details.userInfo.id || details.id;
+  } else {
+    details.userInfo = {id: details.id};
+  }
+
   if (Platform.OS === 'ios') {
     let soundName = details.soundName ? details.soundName : 'default'; // play sound (and vibrate) as default behaviour
 
     if (details.hasOwnProperty('playSound') && !details.playSound) {
       soundName = ''; // empty string results in no sound (and no vibration)
     }
 
-    if (details.userInfo) {
-      details.userInfo.id = details.userInfo.id || details.id;
-    } else {
-      details.userInfo = {id: details.id};
-    }
-
     const iosDetails = {
       fireDate: details.date.toISOString(),
       alertTitle: details.title,
@@ -277,6 +281,10 @@ Notifications.localNotificationSchedule = function(details) {
         details.shortcutId = '' + details.shortcutId;
       }
     }
+
+    if(!details.data && details.userInfo){
+      details.data = details.userInfo;
+    }
 
     if(details && Array.isArray(details.actions)) {
       details.actions = JSON.stringify(details.actions);
@@ -336,12 +344,13 @@ Notifications._onNotification = function(data, isFromBackground = null) {
 
   if ( this.onNotification !== false ) {
     if ( Platform.OS === 'ios' ) {
+      const notifData = data.getData();
       this.onNotification({
-        id: data?.userInfo?.id,
+        id: notifData?.id,
         foreground: ! isFromBackground,
         userInteraction: isFromBackground,
         message: data.getMessage(),
-        data: data.getData(),
+        data: notifData,
         badge: data.getBadgeCount(),
         alert: data.getAlert(),
         sound: data.getSound(),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-push-notification",
-  "version": "3.5.2",
+  "version": "4.0.0",
   "description": "React Native Local and Remote Notifications",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "url": "git+ssh://git@github.com:zo0r/react-native-push-notification.git"
   },
   "dependencies": {
-    "@react-native-community/push-notification-ios": "^1.2.2"
+    "@react-native-community/push-notification-ios": "^1.3.0"
   },
   "peerDependencies": {
     "react-native": ">=0.33"