Merge pull request #1647 from OneSignal/fix/remove_summary_notifications

Fix clearing >= 4 groupless notifications

Author: emawby

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

@@ -715,6 +715,8 @@ private static void createGrouplessSummaryNotification(
       String group = OneSignalNotificationManager.getGrouplessSummaryKey();
       String summaryMessage = grouplessNotifCount + " new messages";
       int summaryNotificationId = OneSignalNotificationManager.getGrouplessSummaryId();
+      OneSignalDbHelper dbHelper = OneSignalDbHelper.getInstance(currentContext);
+      createSummaryIdDatabaseEntry(dbHelper, group, summaryNotificationId);
 
       PendingIntent summaryContentIntent = intentGenerator.getNewActionPendingIntent(
           random.nextInt(),

OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java

@@ -430,6 +430,26 @@ public void testFourGrouplessNotificationsUseDefaultGroup() throws Exception {
       assertEquals(4, getNotificationsInGroup("os_group_undefined").size());
    }
 
+   @Test
+   @Config(sdk = Build.VERSION_CODES.N, shadows = { ShadowGenerateNotification.class })
+   public void testGrouplessSummaryNotificationIsDismissedOnClear() throws Exception {
+      OneSignal.setAppId("b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
+      OneSignal.initWithContext(blankActivity.getApplicationContext());
+      threadAndTaskWait();
+
+      // Add 4 groupless notifications
+      postNotificationWithOptionalGroup(4, null);
+      threadAndTaskWait();
+
+      // Obtain the posted notifications
+      Map<Integer, PostedNotification> postedNotifs = ShadowRoboNotificationManager.notifications;
+      assertEquals(5, postedNotifs.size());
+      // Clear OneSignal Notifications
+      OneSignal.clearOneSignalNotifications();
+      threadAndTaskWait();
+      assertEquals(0, postedNotifs.size());
+   }
+
     @Test
     @Config(sdk = Build.VERSION_CODES.LOLLIPOP, shadows = { ShadowGenerateNotification.class })
     public void testNotifDismissAllOnGroupSummaryClickForAndroidUnderM() throws Exception {