From e98a2be74847be4119562e4dbc46a0b93da1a9ac Mon Sep 17 00:00:00 2001 From: Alexey Shishov Date: Mon, 4 Dec 2017 12:49:45 +0200 Subject: [PATCH 1/2] added notifications params to --- .../mobile/communicator/utils/NotificationHelper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 7930284c72..97318856eb 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,12 @@ public class NotificationHelper extends ContextWrapper { } long notificationId = System.currentTimeMillis(); - Notification notification = builder.build(); + Notification notification; + if (StringUtils.isNotEmpty(type) && groupBuilder != null) { + notification = groupBuilder.build(); + } else { + notification = builder.build(); + } notification.defaults |= Notification.DEFAULT_SOUND; notification.defaults |= Notification.DEFAULT_VIBRATE; notification.flags |= Notification.FLAG_SHOW_LIGHTS; @@ -157,8 +162,8 @@ 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 { + notificationManager.notify((int) p.id, notification); + } else { notificationManager.notify(getString(R.string.app_name), (int) notificationId, notification); } } -- GitLab From 64b120a488f48a2ef2104ad2d961c990e80094c5 Mon Sep 17 00:00:00 2001 From: Alexey Shishov Date: Mon, 4 Dec 2017 13:37:39 +0200 Subject: [PATCH 2/2] refactoring --- .../nynja/mobile/communicator/utils/NotificationHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 97318856eb..0deb53b4c5 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,8 +146,9 @@ public class NotificationHelper extends ContextWrapper { } long notificationId = System.currentTimeMillis(); + boolean isGroupChat = StringUtils.isNotEmpty(type) && groupBuilder != null; Notification notification; - if (StringUtils.isNotEmpty(type) && groupBuilder != null) { + if (isGroupChat) { notification = groupBuilder.build(); } else { notification = builder.build(); @@ -161,7 +162,7 @@ public class NotificationHelper extends ContextWrapper { NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); if (notificationManager != null) { - if (StringUtils.isNotEmpty(type) && groupBuilder != null) { + if (isGroupChat) { notificationManager.notify((int) p.id, notification); } else { notificationManager.notify(getString(R.string.app_name), (int) notificationId, notification); -- GitLab