diff --git a/app/src/main/java/com/nynja/mobile/communicator/utils/NotificationHelper.java b/app/src/main/java/com/nynja/mobile/communicator/utils/NotificationHelper.java index 7930284c722f350e715871f0b883c8c1559b7e0a..0deb53b4c5e094a6ad3117a0c38fa5815d4bdbd4 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/utils/NotificationHelper.java +++ b/app/src/main/java/com/nynja/mobile/communicator/utils/NotificationHelper.java @@ -146,7 +146,13 @@ public class NotificationHelper extends ContextWrapper { } long notificationId = System.currentTimeMillis(); - Notification notification = builder.build(); + boolean isGroupChat = StringUtils.isNotEmpty(type) && groupBuilder != null; + Notification notification; + if (isGroupChat) { + notification = groupBuilder.build(); + } else { + notification = builder.build(); + } notification.defaults |= Notification.DEFAULT_SOUND; notification.defaults |= Notification.DEFAULT_VIBRATE; notification.flags |= Notification.FLAG_SHOW_LIGHTS; @@ -156,9 +162,9 @@ public class NotificationHelper extends ContextWrapper { NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); if (notificationManager != null) { - if (StringUtils.isNotEmpty(type) && groupBuilder != null) { - notificationManager.notify((int) p.id, groupBuilder.build()); - }else { + if (isGroupChat) { + notificationManager.notify((int) p.id, notification); + } else { notificationManager.notify(getString(R.string.app_name), (int) notificationId, notification); } }