Added new cancelGroupedNotifications method

Author: jkasten2

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

@@ -1497,6 +1497,74 @@ public static void cancelNotification(int id) {
       NotificationManager notificationManager = (NotificationManager)appContext.getSystemService(Context.NOTIFICATION_SERVICE);
       notificationManager.cancel(id);
    }
+   
+   
+   public static void cancelGroupedNotifications(String group) {
+      if (appContext == null) {
+         Log(LOG_LEVEL.ERROR, "OneSignal.init has not been called. Could not clear notifications part of group " + group);
+         return;
+      }
+   
+      NotificationManager notificationManager = (NotificationManager)appContext.getSystemService(Context.NOTIFICATION_SERVICE);
+      
+      OneSignalDbHelper dbHelper = OneSignalDbHelper.getInstance(appContext);
+      Cursor cursor = null;
+   
+      try {
+         SQLiteDatabase readableDb = dbHelper.getReadableDbWithRetries();
+      
+         String[] retColumn = { NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID };
+      
+         String whereStr =  NotificationTable.COLUMN_NAME_GROUP_ID + " = ? AND " +
+             NotificationTable.COLUMN_NAME_DISMISSED + " = 0 AND " +
+             NotificationTable.COLUMN_NAME_OPENED + " = 0";
+         String[] whereArgs = { group };
+      
+         cursor = readableDb.query(
+             NotificationTable.TABLE_NAME,
+             retColumn,
+             whereStr,
+             whereArgs,
+             null, null, null);
+         
+         while (cursor.moveToNext()) {
+            int notifId = cursor.getInt(cursor.getColumnIndex(NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID));
+            if (notifId != -1)
+               notificationManager.cancel(notifId);
+         }
+      }
+      catch (Throwable t) {
+         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error getting android notifications part of group: " + group, t);
+      }
+      finally {
+         if (cursor != null && !cursor.isClosed())
+            cursor.close();
+      }
+      
+      SQLiteDatabase writableDb = null;
+      try {
+         writableDb = dbHelper.getWritableDbWithRetries();
+         writableDb.beginTransaction();
+      
+         String whereStr = NotificationTable.COLUMN_NAME_GROUP_ID + " = ? AND " +
+             NotificationTable.COLUMN_NAME_OPENED + " = 0 AND " +
+             NotificationTable.COLUMN_NAME_DISMISSED + " = 0";
+         String[] whereArgs = { group };
+      
+         ContentValues values = new ContentValues();
+         values.put(NotificationTable.COLUMN_NAME_DISMISSED, 1);
+      
+         writableDb.update(NotificationTable.TABLE_NAME, values, whereStr, whereArgs);
+         BadgeCountUpdater.update(writableDb, appContext);
+      
+         writableDb.setTransactionSuccessful();
+      } catch (Throwable t) {
+         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error marking a notifications with group " + group + " as dismissed! ", t);
+      } finally {
+         if (writableDb != null)
+            writableDb.endTransaction();
+      }
+   }
 
    public static void removeNotificationOpenedHandler() {
       getCurrentOrNewInitBuilder().mNotificationOpenedHandler = null;

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

@@ -55,7 +55,7 @@ static void setup(Context context, String appId, String userId, String adId) {
       if (OneSignal.mEnterp)
          return;
 
-      if (userId == null || adId == null || adId.equals("OptedOut"))
+      if (userId == null)
          return;
 
       try {
@@ -64,7 +64,11 @@ static void setup(Context context, String appId, String userId, String adId) {
          return;
       }
 
-      String params = "?app_id=" + appId + "&user_id=" + userId + "&ad_id=" + adId + "&cbs_id=" + new Random().nextInt(Integer.MAX_VALUE);
+      String params = "?app_id=" + appId + "&user_id=" + userId;
+      if (adId != null)
+         params += "&ad_id=" + adId;
+      params += "&cbs_id=" + new Random().nextInt(Integer.MAX_VALUE);
+      
       CustomTabsServiceConnection connection = new OneSignalCustomTabsServiceConnection(context, params);
       opened = CustomTabsClient.bindCustomTabsService(context, "com.android.chrome", connection);
    }

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

@@ -233,7 +233,7 @@ public void shouldSetCorrectNumberOfButtonsOnSummaryNotification() throws Except
       OneSignal.init(blankActivity, "123456789", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
       threadAndTaskWait();
 
-      // Setup - Display 3 notifications that will be grouped together.
+      // Setup - Display a single notification with a grouped.
       Bundle bundle = getBaseNotifBundle("UUID1");
       bundle.putString("grp", "test1");
       bundle.putString("custom", "{\"i\": \"some_UUID\", \"a\": {\"actionButtons\": [{\"text\": \"test\"} ]}}");
@@ -248,6 +248,34 @@ public void shouldSetCorrectNumberOfButtonsOnSummaryNotification() throws Except
       Assert.assertEquals(1, postedSummaryNotification.notif.actions.length);
    }
 
+   
+   
+   @Test
+   public void shouldCancelAllNotificationsPartOfAGroup() throws Exception {
+      // Setup - Init
+      OneSignal.setInFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification);
+      OneSignal.init(blankActivity, "123456789", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
+      threadAndTaskWait();
+      
+      // Setup - Display 3 notifications, 2 of which that will be grouped together.
+      Bundle bundle = getBaseNotifBundle("UUID0");
+      NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);
+      
+      bundle = getBaseNotifBundle("UUID1");
+      bundle.putString("grp", "test1");
+      NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);
+      bundle = getBaseNotifBundle("UUID2");
+      bundle.putString("grp", "test1");
+      NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);
+      
+      Assert.assertEquals(4, ShadowRoboNotificationManager.notifications.size());
+      
+      OneSignal.cancelGroupedNotifications("test1");
+      Assert.assertEquals(1, ShadowRoboNotificationManager.notifications.size());
+   }
+   
+   
+   
    @Test
    @Config(shadows = {ShadowNotificationRestorer.class})
    public void shouldCancelNotificationAndUpdateSummary() throws Exception {