toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[MM-14866] Fix app crash due to parseInt call on null and display test notification message (#2690)

Browse source 
* Call setNumber on notification only if badge is not null

* Move setNumber call

* Add bundle to empty list
This commit is contained in:
Miguel Alatzar 2019-04-03 10:15:05 -07:00 committed by GitHub
parent 89ba815e8b
commit 531a743853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
View file

@ -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);