Cache the application badge number

Author: flovilmart

Carthage/Checkouts/Bolts-ObjC

@@ -14,6 +14,10 @@
 #elif PF_TARGET_OS_OSX
 #import <AppKit/AppKit.h>
 #endif
+@interface PFApplication() {
+    NSUInteger _iconBadgeNumber;
+}
+@end
 
 @implementation PFApplication
 
@@ -30,6 +34,19 @@ + (instancetype)currentApplication {
     return application;
 }
 
+- (id)init {
+    self = [super init];
+    if (self) {
+#if TARGET_OS_IOS
+        [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];
+        _iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;
+#elif PF_TARGET_OS_OSX
+
+#endif
+    }
+    return self;
+}
+
 ///--------------------------------------
 #pragma mark - Accessors
 ///--------------------------------------
@@ -50,7 +67,7 @@ - (NSInteger)iconBadgeNumber {
 #if TARGET_OS_WATCH || TARGET_OS_TV
     return 0;
 #elif TARGET_OS_IOS
-    return self.systemApplication.applicationIconBadgeNumber;
+    return _iconBadgeNumber;
 #elif PF_TARGET_OS_OSX
     // Make sure not to use `NSApp` here, because it doesn't work sometimes,
     // `NSApplication +sharedApplication` does though.
@@ -74,20 +91,27 @@ - (NSInteger)iconBadgeNumber {
 - (void)setIconBadgeNumber:(NSInteger)iconBadgeNumber {
     if (self.iconBadgeNumber != iconBadgeNumber) {
 #if TARGET_OS_IOS
+        _iconBadgeNumber = iconBadgeNumber;
         dispatch_block_t block = ^{
             self.systemApplication.applicationIconBadgeNumber = iconBadgeNumber;
         };
         if ([NSThread currentThread].isMainThread) {
             block();
         } else {
-            dispatch_sync(dispatch_get_main_queue(), block);
+            dispatch_async(dispatch_get_main_queue(), block);
         }
 #elif PF_TARGET_OS_OSX
         [[NSApplication sharedApplication] dockTile].badgeLabel = [@(iconBadgeNumber) stringValue];
 #endif
     }
 }
 
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
+    if ([keyPath isEqualToString:@"applicationIconBadgeNumber"] && change) {
+        _iconBadgeNumber = [change[NSKeyValueChangeNewKey] integerValue];
+    }
+}
+
 - (UIApplication *)systemApplication {
 #if TARGET_OS_WATCH
     return nil;
@@ -97,4 +121,10 @@ - (UIApplication *)systemApplication {
 #endif
 }
 
+- (void)dealloc {
+#if TARGET_OS_IOS
+    [self.systemApplication removeObserver:self forKeyPath:@"applicationIconBadgeNumber"];
+#endif
+}
+
 @end

Parse/Internal/PFApplication.m

@@ -279,24 +279,7 @@ - (void)_updateTimeZoneFromDevice {
 
 - (void)_updateBadgeFromDevice {
     // Get the application icon and update the installation if necessary.
-    __block NSNumber *applicationBadge;
-    dispatch_block_t block = ^{
-        applicationBadge = @([PFApplication currentApplication].iconBadgeNumber);
-    };
-
-    if ([NSThread currentThread].isMainThread) {
-        block();
-    } else {
-        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            block();
-            dispatch_semaphore_signal(semaphore);
-        });
-        dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 20 * NSEC_PER_MSEC));
-        if (applicationBadge == nil) {
-            block();
-        }
-    }
+    NSNumber *applicationBadge = @([PFApplication currentApplication].iconBadgeNumber);
     NSNumber *installationBadge = [super objectForKey:PFInstallationKeyBadge];
     if (installationBadge == nil || ![applicationBadge isEqualToNumber:installationBadge]) {
         [super setObject:applicationBadge forKey:PFInstallationKeyBadge];

Parse/PFInstallation.m

@@ -9,6 +9,7 @@
 #import <OCMock/OCMock.h>
 
 #import "PFInstallation.h"
+#import "PFApplication.h"
 #import "PFUnitTestCase.h"
 #import "Parse.h"
 #import "Parse_Private.h"
@@ -82,4 +83,19 @@ - (void)testInstallationImmutableFieldsCannotBeDeleted {
     PFAssertThrowsInvalidArgumentException([installation removeObjectForKey:@"localeIdentifier"]);
 }
 
+- (void)testInstallationHasApplicationBadge {
+    [PFApplication currentApplication].systemApplication.applicationIconBadgeNumber = 10;
+    PFInstallation *installation = [PFInstallation currentInstallation];
+    PFAssertEqualInts(installation.badge, 10, @"Installation should have the same badge as application");
+}
+
+- (void)testInstallationSetsApplicationBadge {
+    [PFApplication currentApplication].systemApplication.applicationIconBadgeNumber = 20;
+    PFInstallation *installation = [PFInstallation currentInstallation];
+    installation.badge = 5;
+    PFAssertEqualInts(installation.badge, 5, @"Installation should have the same badge as application");
+    PFAssertEqualInts([PFApplication currentApplication].systemApplication.applicationIconBadgeNumber, 5, @"Installation should have the same badge as application");
+    PFAssertEqualInts([PFApplication currentApplication].iconBadgeNumber, 5, @"Installation should have the same badge as application");
+}
+
 @end