Merge pull request #1578 from OneSignal/fix/grouped_heads_up_showing_last

Fix Heads-Up Displaying Previous Notification When Grouped on some devices

Author: jkasten2

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

@@ -82,12 +82,26 @@ class GenerateNotification {
    private static Resources contextResources = null;
    private static Context currentContext = null;
    private static String packageName = null;
+   private static Integer groupAlertBehavior = null;
 
    private static class OneSignalNotificationBuilder {
       NotificationCompat.Builder compatBuilder;
       boolean hasLargeIcon;
    }
 
+   // NotificationCompat unfortunately doesn't correctly support some features
+   // such as sounds and heads-up notifications with GROUP_ALERT_CHILDREN on
+   // Android 6.0 and older.
+   // This includes:
+   //    Android 6.0 - No Sound or heads-up
+   //    Android 5.0 - Sound, but no heads-up
+   private static void initGroupAlertBehavior() {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+         groupAlertBehavior = NotificationCompat.GROUP_ALERT_CHILDREN;
+     else
+         groupAlertBehavior = NotificationCompat.GROUP_ALERT_SUMMARY;
+   }
+
    private static void setStatics(Context inContext) {
       currentContext = inContext;
       packageName = currentContext.getPackageName();
@@ -100,6 +114,8 @@ static boolean displayNotification(OSNotificationGenerationJob notificationJob)
 
       isRunningOnMainThreadCheck();
 
+      initGroupAlertBehavior();
+
       return showNotification(notificationJob);
    }
 
@@ -385,7 +401,7 @@ private static void createGenericPendingIntentsForGroup(
       notifBuilder.setGroup(group);
 
       try {
-         notifBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+         notifBuilder.setGroupAlertBehavior(groupAlertBehavior);
       } catch (Throwable t) {
          //do nothing in this case...Android support lib 26 isn't in the project
       }
@@ -612,7 +628,7 @@ private static void createSummaryNotification(OSNotificationGenerationJob notifi
               .setGroupSummary(true);
 
          try {
-            summaryBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+            summaryBuilder.setGroupAlertBehavior(groupAlertBehavior);
          }
          catch (Throwable t) {
             //do nothing in this case...Android support lib 26 isn't in the project
@@ -674,7 +690,7 @@ private static void createSummaryNotification(OSNotificationGenerationJob notifi
                        .setGroupSummary(true);
 
          try {
-            summaryBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+            summaryBuilder.setGroupAlertBehavior(groupAlertBehavior);
          }
          catch (Throwable t) {
             //do nothing in this case...Android support lib 26 isn't in the project
@@ -730,7 +746,7 @@ private static void createGrouplessSummaryNotification(
             .setGroupSummary(true);
 
       try {
-        summaryBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+        summaryBuilder.setGroupAlertBehavior(groupAlertBehavior);
       }
       catch (Throwable t) {
         // Do nothing in this case... Android support lib 26 isn't in the project