Skip to content

Commit cfa20cc

Browse files
authored
Merge pull request #1603 from OneSignal/fix/groupless_heads_up_redisplay
[Fix] groupless heads-up style notifications from redisplaying previous
2 parents da8c8d8 + 9d76b27 commit cfa20cc

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalNotificationManager.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,16 @@ static ArrayList<StatusBarNotification> getActiveGrouplessNotifications(Context
100100
/**
101101
* All groupless notifications are assigned the GROUPLESS_SUMMARY_KEY and notify() is called
102102
*/
103-
@RequiresApi(api = Build.VERSION_CODES.M)
103+
@RequiresApi(api = Build.VERSION_CODES.N)
104104
static void assignGrouplessNotifications(Context context, ArrayList<StatusBarNotification> grouplessNotifs) {
105105
for (StatusBarNotification grouplessNotif : grouplessNotifs) {
106-
Notification.Builder grouplessNotifBuilder;
107-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
108-
grouplessNotifBuilder = Notification.Builder.recoverBuilder(context, grouplessNotif.getNotification());
109-
} else {
110-
grouplessNotifBuilder = new Notification.Builder(context);
111-
}
106+
Notification.Builder grouplessNotifBuilder =
107+
Notification.Builder.recoverBuilder(context, grouplessNotif.getNotification());
112108

113109
// Recreate the notification but with the groupless key instead
114110
Notification notif = grouplessNotifBuilder
115111
.setGroup(GROUPLESS_SUMMARY_KEY)
112+
.setOnlyAlertOnce(true)
116113
.build();
117114

118115
NotificationManagerCompat.from(context).notify(grouplessNotif.getId(), notif);

0 commit comments

Comments
 (0)