Merge pull request #1711 from OneSignal/fix/individually_clear_notifications

Fix individually clearing notifications

Author: jennantilla

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

@@ -65,7 +65,7 @@ private static Cursor internalUpdateSummaryNotificationAfterChildRemoved(Context
       // If all individual notifications consumed
       //   - Remove summary notification from the shade.
       //   - Mark summary notification as consumed.
-      if (notificationsInGroup == 0) {
+      if (notificationsInGroup == 0 && !group.equals(OneSignalNotificationManager.getGrouplessSummaryKey())) {
          cursor.close();
 
          Integer androidNotifId = getSummaryNotificationId(db, group);

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

@@ -74,7 +74,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -450,6 +449,34 @@ public void testGrouplessSummaryNotificationIsDismissedOnClear() throws Exceptio
       assertEquals(0, postedNotifs.size());
    }
 
+   @Test
+   @Config(sdk = Build.VERSION_CODES.N, shadows = { ShadowGenerateNotification.class })
+   public void testIndividualGrouplessSummaryNotificationDismissal() 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;
+      Iterator<Map.Entry<Integer, PostedNotification>> iterator = postedNotifs.entrySet().iterator();
+      Map.Entry<Integer, PostedNotification> entry = iterator.next();
+      Map.Entry<Integer, PostedNotification> entry2 = iterator.next();
+      Map.Entry<Integer, PostedNotification> entry3 = iterator.next();
+      Map.Entry<Integer, PostedNotification> entry4 = iterator.next();
+      Integer id4 = entry4.getKey();
+      assertNotNull(id4);
+
+      assertEquals(5, postedNotifs.size());
+      // Clear a OneSignal Notification
+      OneSignal.removeNotification(id4);
+      threadAndTaskWait();
+      assertEquals(4, postedNotifs.size());
+   }
+
     @Test
     @Config(sdk = Build.VERSION_CODES.LOLLIPOP, shadows = { ShadowGenerateNotification.class })
     public void testNotifDismissAllOnGroupSummaryClickForAndroidUnderM() throws Exception {