Merge pull request #939 from OneSignal/fix/clear_badge_count_on_reinstall

Fix clearing badge count on reinstall

Author: emawby

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -2181,8 +2181,7 @@ + (BOOL)clearBadgeCount:(BOOL)fromNotifOpened {
     else
         disableBadgeClearing = NO;
 
-    if (disableBadgeClearing ||
-        ([self.osNotificationSettings getNotificationPermissionState].notificationTypes & NOTIFICATION_TYPE_BADGE) == 0)
+    if (disableBadgeClearing)
         return false;
 
     bool wasBadgeSet = [UIApplication sharedApplication].applicationIconBadgeNumber > 0;

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -507,10 +507,10 @@ - (void)testTestPermissionChangeObserverWithNativeiOS10PromptCall {
     [UnitTestCommonMethods answerNotificationPrompt:true];
     [UnitTestCommonMethods runBackgroundThreads];
 
-    XCTAssertEqual(observer->fireCount, 3);
+    XCTAssertEqual(observer->fireCount, 2);
 
     XCTAssertEqualObjects([observer->last description],
-                          @"<OSSubscriptionStateChanges:\nfrom: <OSPermissionState: hasPrompted: 1, status: Denied, provisional: 0>,\nto:   <OSPermissionState: hasPrompted: 1, status: Authorized, provisional: 0>\n>");
+                          @"<OSSubscriptionStateChanges:\nfrom: <OSPermissionState: hasPrompted: 1, status: NotDetermined, provisional: 0>,\nto:   <OSPermissionState: hasPrompted: 1, status: Authorized, provisional: 0>\n>");
 }
 
 - (void)testDeliverQuietly {