From 531a7438534e7fce95a215daacefdd57221f5824 Mon Sep 17 00:00:00 2001
From: Miguel Alatzar <migbot@users.noreply.github.com>
Date: Wed, 3 Apr 2019 10:15:05 -0700
Subject: [PATCH] [MM-14866] Fix app crash due to parseInt call on null and
 display test notification message (#2690)

* Call setNumber on notification only if badge is not null

* Move setNumber call

* Add bundle to empty list
---
 .../java/com/mattermost/rnbeta/CustomPushNotification.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
index 860f118d7..90c691f8b 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -230,7 +230,9 @@ public class CustomPushNotification extends PushNotification {
         }
 
         if (badge != null) {
-            CustomPushNotification.badgeCount = Integer.parseInt(badge);
+            int badgeCount = Integer.parseInt(badge);
+            CustomPushNotification.badgeCount = badgeCount;
+            notification.setNumber(badgeCount);
             ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), CustomPushNotification.badgeCount);
         } else {
             // HERE ADD THE DOT INDICATOR STUFF
@@ -248,6 +250,7 @@ public class CustomPushNotification extends PushNotification {
             list = new ArrayList<Bundle>(bundleArray);
         } else {
             list = new ArrayList<Bundle>();
+            list.add(bundle);
         }
 
         for (Bundle data : list) {
@@ -263,7 +266,6 @@ public class CustomPushNotification extends PushNotification {
                 .setGroupSummary(true)
                 .setStyle(messagingStyle)
                 .setSmallIcon(smallIconResId)
-                .setNumber(Integer.parseInt(badge))
                 .setVisibility(Notification.VISIBILITY_PRIVATE)
                 .setPriority(Notification.PRIORITY_HIGH)
                 .setAutoCancel(true);