Merge branch 'master' into dev and prepare 6.0.0

* master:
  Upgrade to 5.1.1.
  Fix #1641
  Add explanation to DO NOT USE `.configure()` INSIDE A COMPONENT, EVEN `App`

# Conflicts:
#	CHANGELOG.md

Author: Dallas62

CHANGELOG.md

@@ -43,7 +43,15 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Fixed
 
+<<<<<<< HEAD
 - (iOS) upgrade `@react-native-community/push-notification-ios`, fixe the value of `userInteraction` [@react-native-community/push-notification-ios#122](https://github.com/react-native-community/push-notification-ios/pull/122).
+=======
+## [5.1.1] 2020-09-15
+
+### Fixed
+
+- (Android) Fatal Exception: java.lang.NullPointerException [#1641](https://github.com/zo0r/react-native-push-notification/issues/1641)
+>>>>>>> master
 
 ## [5.1.0] 2020-08-31
 

README.md

@@ -6,9 +6,9 @@
 React Native Local and Remote Notifications for iOS and Android
 
 
-## 🎉 Version 5.x is live ! 🎉
+## 🎉 Version 6.x is live ! 🎉
 
-Check out for changes in the CHANGELOG:
+Check out for changes and migration in the CHANGELOG:
 
 [Changelog](https://github.com/zo0r/react-native-push-notification/blob/master/CHANGELOG.md)
 
@@ -214,6 +214,8 @@ public class MainApplication extends Application implements ReactApplication {
 ## Usage
 
 **DO NOT USE `.configure()` INSIDE A COMPONENT, EVEN `App`**
+> If you do, notification handlers will not fire, because they are not loaded. Instead, use `.configure()` in the app's first file, usually `index.js`.
+
 
 ```javascript
 import PushNotificationIOS from "@react-native-community/push-notification-ios";

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

@@ -157,9 +157,9 @@ private RNPushNotificationAttributes(JSONObject jsonObject) {
             tag = jsonObject.has(TAG) ? jsonObject.getString(TAG) : null;
             repeatType = jsonObject.has(REPEAT_TYPE) ? jsonObject.getString(REPEAT_TYPE) : null;
             repeatTime = jsonObject.has(REPEAT_TIME) ? jsonObject.getDouble(REPEAT_TIME) : 0.0;
-            when = jsonObject.has(WHEN) ? jsonObject.getDouble(WHEN) : null;
+            when = jsonObject.has(WHEN) ? jsonObject.getDouble(WHEN) : -1;
             usesChronometer = jsonObject.has(USES_CHRONOMETER) ? jsonObject.getBoolean(USES_CHRONOMETER) : false;
-            timeoutAfter = jsonObject.has(TIMEOUT_AFTER) ? jsonObject.getDouble(TIMEOUT_AFTER) : null;
+            timeoutAfter = jsonObject.has(TIMEOUT_AFTER) ? jsonObject.getDouble(TIMEOUT_AFTER) : -1;
             onlyAlertOnce = jsonObject.has(ONLY_ALERT_ONCE) ? jsonObject.getBoolean(ONLY_ALERT_ONCE) : false;
             ongoing = jsonObject.has(ONGOING) ? jsonObject.getBoolean(ONGOING) : false;
             allowWhileIdle = jsonObject.has(ALLOW_WHILE_IDLE) ? jsonObject.getBoolean(ALLOW_WHILE_IDLE) : false;

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

@@ -457,14 +457,14 @@ public void sendToNotificationCentreWithPicture(Bundle bundle, Bitmap largeIconB
 
               Long timeoutAfter = (long) bundle.getDouble("timeoutAfter");
 
-              if (timeoutAfter != null) {
+              if (timeoutAfter != null && timeoutAfter >= 0) {
                 notification.setTimeoutAfter(timeoutAfter);
               }
             }
 
             Long when = (long) bundle.getDouble("when");
 
-            if (when != null) {
+            if (when != null && when >= 0) {
               notification.setWhen(when);
             }
 

package.json

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

trouble-shooting.md

@@ -50,7 +50,7 @@ Known bugs and issues:
 
 # About notifications...
 
-There are a number of different types of notifications, and they have subtly different behaviours.  There are essentially 4 types, let's call them _local notifications_ (1), _noisy remote push notifications_ (2), _silent remote push notifications_ (3) and _mixed remote push notifications_ (4).
+There are a number of different types of notifications, and they have subtly different behaviours.  There are essentially 4 types, let's call them _local notifications_ (1), _noisy remote push notifications_ (2) and _silent remote push notifications_ (3).
 
 ## 1. local notifications
 
@@ -203,50 +203,6 @@ The crucial bit of an iOS silent notification is presence of the `"content-avail
 
 After you have processed the notification you must call isn't `finish` method (as of RN 0.38).
 
-## 4. _mixed_ remote push notifications
-
-_Mixed_ remote push notifications are both delivered to your app AND to the notification center.
-
-#### Android _mixed_ remote push notifications
-
-Android doesn't directly support mixed notifications.  If you try to combine the above approaches you will see a _noisy_ notification but it will not be delivered to your app.  This library does however provide a basic work-around.  By adding `message` field to a _silent_ notification the library will synthesize a local notification as well as deliver a _silent_ notification to your app.  Something like this:
-
-```json
-{
-  "to": "<token>",
-  "time_to_live": 86400,
-  "collapse_key": "new_message",
-  "delay_while_idle": false,
-  "data": {
-    "title": "title",
-    "message": "this is a mixed test 14:03:29.676",
-    "your-key": "your-value"
-  }
-}
-```
-
-The resulting local notification will include the message as well as a few other (optional) fields: _title_, _sound_ and _colour_
-
-#### iOS _mixed_ remote push notifications
-
-Just combine the above _silent_ and _noisy_ notifications and send to APNS:
-
-```json
-{
-  "aps": {
-    "alert": {
-      "body": "body 16:03:49.889",
-      "title": "title"
-    },
-    "badge": 1,
-    "sound": "default"
-  },
-  "payload": "{\"your-key\":\"your-value\"}"
-}
-```
-
-It will be delivered to both the notification centre **and** your app if the app is running in the background, but only to your app if it's running in the foreground.
-
 #### Some useful links
 
  * http://www.fantageek.com/blog/2016/04/15/push-notification-in-practice/