Prevent crash for NaN.

Author: Dallas62

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

@@ -80,13 +80,19 @@ private AlarmManager getAlarmManager() {
     }
 
     private PendingIntent toScheduleNotificationIntent(Bundle bundle) {
-        int notificationID = Integer.parseInt(bundle.getString("id"));
+        try {
+            int notificationID = Integer.parseInt(bundle.getString("id"));
+
+            Intent notificationIntent = new Intent(context, RNPushNotificationPublisher.class);
+            notificationIntent.putExtra(RNPushNotificationPublisher.NOTIFICATION_ID, notificationID);
+            notificationIntent.putExtras(bundle);
 
-        Intent notificationIntent = new Intent(context, RNPushNotificationPublisher.class);
-        notificationIntent.putExtra(RNPushNotificationPublisher.NOTIFICATION_ID, notificationID);
-        notificationIntent.putExtras(bundle);
+            return PendingIntent.getBroadcast(context, notificationID, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Unable to parse Notification ID", e);
+        }
 
-        return PendingIntent.getBroadcast(context, notificationID, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        return null;
     }
 
     public void sendNotificationScheduled(Bundle bundle) {
@@ -137,6 +143,10 @@ public void sendNotificationScheduledCore(Bundle bundle) {
         // notification to the user
         PendingIntent pendingIntent = toScheduleNotificationIntent(bundle);
 
+        if(pendingIntent == null) {
+            return;
+        }
+
         Log.d(LOG_TAG, String.format("Setting a notification with id %s at time %s",
                 bundle.getString("id"), Long.toString(fireDate)));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -636,7 +646,11 @@ private void cancelScheduledNotification(String notificationIDString) {
         // remove it from the alarm manger schedule
         Bundle b = new Bundle();
         b.putString("id", notificationIDString);
-        getAlarmManager().cancel(toScheduleNotificationIntent(b));
+        PendingIntent pendingIntent = toScheduleNotificationIntent(b);
+
+        if(pendingIntent != null) {
+            getAlarmManager().cancel(pendingIntent);
+        }
 
         if (scheduledNotificationsPersistence.contains(notificationIDString)) {
             // remove it from local storage
@@ -650,7 +664,11 @@ private void cancelScheduledNotification(String notificationIDString) {
         // removed it from the notification center
         NotificationManager notificationManager = notificationManager();
 
-        notificationManager.cancel(Integer.parseInt(notificationIDString));
+        try {
+            notificationManager.cancel(Integer.parseInt(notificationIDString));
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Unable to parse Notification ID " + notificationIDString, e);
+        }
     }
 
     private NotificationManager notificationManager() {

index.js

@@ -141,13 +141,26 @@ Notifications.localNotification = function(details) {
 		});
 	} else {
     if(details && typeof details.id === 'number') {
-      details.id = '' + details.id;
+      if(isNaN(details.id)) {
+        console.warn('NaN value has been passed as id');
+        delete details.id;
+      }
+      else {
+        details.id = '' + details.id;
+      }
     }
 
     if(details && typeof details.number === 'number') {
-      details.number = '' + details.number;
+      if(isNaN(details.number)) {
+        console.warn('NaN value has been passed as number');
+        delete details.number;
+      }
+      else {
+        details.number = '' + details.number;
+      }
     }
 
+  
 		this.handler.presentLocalNotification(details);
 	}
 };
@@ -187,11 +200,23 @@ Notifications.localNotificationSchedule = function(details) {
 		this.handler.scheduleLocalNotification(iosDetails);
 	} else {
     if(details && typeof details.id === 'number') {
-      details.id = '' + details.id;
+      if(isNaN(details.id)) {
+        console.warn('NaN value has been passed as id');
+        delete details.id;
+      }
+      else {
+        details.id = '' + details.id;
+      }
     }
 
     if(details && typeof details.number === 'number') {
-      details.number = '' + details.number;
+      if(isNaN(details.number)) {
+        console.warn('NaN value has been passed as number');
+        delete details.number;
+      }
+      else {
+        details.number = '' + details.number;
+      }
     }
 
 		details.fireDate = details.date.getTime();