Use SecureRandom and remove onNotification call for Scheduled notifications when there is no user interation.

Author: Dallas62

CHANGELOG.md

@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Breaking changes
 
-- Now local scheduled notifications trigger `onNotification` before display [#574](https://github.com/zo0r/react-native-push-notification/pull/574).
 - `RNPushNotificationRegistrationService` has been removed, old reference in AndroidManifest must be removed.
 - `Notifications.registerNotificationActions()` has been removed and is not required for `actions`.
 - `DeviceEventEmitter.addListener('notificationActionReceived', callback)` is replaced by `onAction`.

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

@@ -1,26 +1,14 @@
 package com.dieam.reactnativepushnotification.modules;
 
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
-import com.dieam.reactnativepushnotification.helpers.ApplicationBadgeHelper;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-
-import org.json.JSONObject;
-
 import java.util.List;
-import java.util.Random;
+import java.security.SecureRandom;
 
 import static com.dieam.reactnativepushnotification.modules.RNPushNotification.LOG_TAG;
 
@@ -38,40 +26,14 @@ public void onReceive(final Context context, Intent intent) {
 
         Log.v(LOG_TAG, "onMessageReceived: " + bundle);
 
-        // We need to run this on the main thread, as the React code assumes that is true.
-        // Namely, DevServerHelper constructs a Handler() without a Looper, which triggers:
-        // "Can't create handler inside thread that has not called Looper.prepare()"
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(new Runnable() {
-            public void run() {
-                // Construct and load our normal React JS code bundle
-                final ReactInstanceManager mReactInstanceManager = ((ReactApplication) context.getApplicationContext()).getReactNativeHost().getReactInstanceManager();
-                ReactContext context = mReactInstanceManager.getCurrentReactContext();
-                // If it's constructed, send a notification
-                if (context != null) {
-                    handleLocalNotification((ReactApplicationContext) context, bundle);
-                } else {
-                    // Otherwise wait for construction, then send the notification
-                    mReactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-                        public void onReactContextInitialized(ReactContext context) {
-                            handleLocalNotification((ReactApplicationContext) context, bundle);
-                            mReactInstanceManager.removeReactInstanceEventListener(this);
-                        }
-                    });
-                    if (!mReactInstanceManager.hasStartedCreatingInitialContext()) {
-                        // Construct it in the background
-                        mReactInstanceManager.createReactContextInBackground();
-                    }
-                }
-            }
-        });
+        handleLocalNotification(context, bundle);
     }
 
-    private void handleLocalNotification(ReactApplicationContext context, Bundle bundle) {
+    private void handleLocalNotification(Context context, Bundle bundle) {
 
         // If notification ID is not provided by the user for push notification, generate one at random
         if (bundle.getString("id") == null) {
-            Random randomNumberGenerator = new Random(System.currentTimeMillis());
+            SecureRandom randomNumberGenerator = new SecureRandom();
             bundle.putString("id", String.valueOf(randomNumberGenerator.nextInt()));
         }
 
@@ -80,16 +42,6 @@ private void handleLocalNotification(ReactApplicationContext context, Bundle bun
 
         boolean isForeground = pushNotificationHelper.isApplicationInForeground(applicationContext);
 
-        RNPushNotificationJsDelivery jsDelivery = new RNPushNotificationJsDelivery(context);
-        bundle.putBoolean("foreground", isForeground);
-        bundle.putBoolean("userInteraction", false);
-        jsDelivery.notifyNotification(bundle);
-
-        // If contentAvailable is set to true, then send out a remote fetch event
-        if (bundle.getString("contentAvailable", "false").equalsIgnoreCase("true")) {
-            jsDelivery.notifyRemoteFetch(bundle);
-        }
-
         Log.v(LOG_TAG, "sendNotification: " + bundle);
 
         pushNotificationHelper.sendToNotificationCentre(bundle);

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

@@ -22,7 +22,7 @@
 
 import java.util.Map;
 import java.util.List;
-import java.util.Random;
+import java.security.SecureRandom;
 
 import static android.content.Context.ACTIVITY_SERVICE;
 import static com.dieam.reactnativepushnotification.modules.RNPushNotification.LOG_TAG;
@@ -125,7 +125,7 @@ private void handleRemotePushNotification(ReactApplicationContext context, Bundl
 
         // If notification ID is not provided by the user for push notification, generate one at random
         if (bundle.getString("id") == null) {
-            Random randomNumberGenerator = new Random(System.currentTimeMillis());
+            SecureRandom randomNumberGenerator = new SecureRandom();
             bundle.putString("id", String.valueOf(randomNumberGenerator.nextInt()));
         }