clearAll now also always removes badges

If clearAll was called with disable badge clearing set to true then we would clear notifications but no the badge. This change makes it so that clearAll removes badges regardless of the disable badge clearing setting

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h

@@ -114,7 +114,7 @@ NS_SWIFT_NAME(onClick(event:));
 
 + (void)handleWillShowInForegroundForNotification:(OSNotification *_Nonnull)notification completion:(OSNotificationDisplayResponse _Nonnull)completion;
 + (void)handleNotificationActionWithUrl:(NSString* _Nullable)url actionID:(NSString* _Nonnull)actionID;
-+ (BOOL)clearBadgeCount:(BOOL)fromNotifOpened;
++ (BOOL)clearBadgeCount:(BOOL)fromNotifOpened fromClearAll:(BOOL)fromClearAll;
 
 + (BOOL)receiveRemoteNotification:(UIApplication* _Nonnull)application UserInfo:(NSDictionary* _Nonnull)userInfo completionHandler:(void (^_Nonnull)(UIBackgroundFetchResult))completionHandler;
 + (void)notificationReceived:(NSDictionary* _Nonnull)messageDict wasOpened:(BOOL)opened;

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -383,8 +383,8 @@ + (void)presentAppSettings {
 
 + (void)clearAll {
     [[UNUserNotificationCenter currentNotificationCenter] removeAllDeliveredNotifications];
-    // TODO: Determine if we also need to call clearBadgeCount
-    [self clearBadgeCount:false];
+    // removing delivered notifications doesn't update the badge count
+    [self clearBadgeCount:false fromClearAll:true];
 }
 
 + (BOOL)registerForAPNsToken {
@@ -686,7 +686,7 @@ + (void)handleNotificationOpened:(NSDictionary*)messageDict
         [self launchWebURL:notification.launchURL]; //TODO: where should this live?
     }
 
-    [self clearBadgeCount:true];
+    [self clearBadgeCount:true fromClearAll:false];
 
     NSString* actionID = NULL;
     if (actionType == OSNotificationActionTypeActionTaken) {
@@ -755,7 +755,7 @@ + (void)displayWebView:(NSURL*)url {
     openUrlBlock(true);
 }
 
-+ (BOOL)clearBadgeCount:(BOOL)fromNotifOpened {
++ (BOOL)clearBadgeCount:(BOOL)fromNotifOpened fromClearAll:(BOOL)fromClearAll {
 
     NSNumber *disableBadgeNumber = [[NSBundle mainBundle] objectForInfoDictionaryKey:ONESIGNAL_DISABLE_BADGE_CLEARING];
 
@@ -764,7 +764,7 @@ + (BOOL)clearBadgeCount:(BOOL)fromNotifOpened {
     else
         _disableBadgeClearing = NO;
 
-    if (_disableBadgeClearing) {
+    if (_disableBadgeClearing && !fromClearAll) {
         // The customer could have manually changed the badge value. We must ensure our cached value will match the current state.
         [OneSignalUserDefaults.initShared saveIntegerForKey:ONESIGNAL_BADGE_KEY withValue:[UIApplication sharedApplication].applicationIconBadgeNumber];
         return false;

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -506,7 +506,7 @@ + (void)init {
      }];
      */
 
-    [OSNotificationsManager clearBadgeCount:false];
+    [OSNotificationsManager clearBadgeCount:false fromClearAll:false];
     [self startOutcomes];
     [self startLocation];
     [self startTrackIAP];
@@ -798,7 +798,6 @@ + (void)load {
 */
 - (void)onesignalSetApplicationIconBadgeNumber:(NSInteger)badge {
     [OneSignalExtensionBadgeHandler updateCachedBadgeValue:badge];
-    
     [self onesignalSetApplicationIconBadgeNumber:badge];
 }
 

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m

@@ -114,7 +114,7 @@ + (void)applicationForegrounded {
         // [OneSignal receivedInAppMessageJson:nil];
     }
 
-    [OSNotificationsManager clearBadgeCount:false];
+    [OSNotificationsManager clearBadgeCount:false fromClearAll:false];
 }
 
 + (void)applicationBackgrounded {