tvOS push support (#1375)

toto · flovilmart · commit ad1fea4799fa · 2018-12-10T18:33:53.000-05:00
* Add PFPush, PFInstallation to tvOS. * Add support for Installation and Push on tvOS via CocoaPods. * containingApplicationBundleIdentifier and applicationGroupIdentifier should also be availible for tvos * Allow badge updates on tvOS * Also return device model on tvOS * Setup project for tvOS * Use @available for tvOS since applicationIconBadgeNumber appeared in tvOS 10 * fix visibility of pfpush * Allow tvOS to have a badge as well * tvos installations need to be identified by tvos because the parse server adapter uses this nomenclature * Use FBSDKErrorDialogUnavailable instead of deprecated code
diff --git a/Parse.podspec b/Parse.podspec
@@ -34,17 +34,7 @@ Pod::Spec.new do |s|
                           'Parse/Parse/Internal/Purchase/**/*.{h,m}',
                           'Parse/Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
     s.tvos.exclude_files = 'Parse/Parse/PFNetworkActivityIndicatorManager.{h,m}',
-                           'Parse/Parse/PFPush.{h,m}',
-                           'Parse/Parse/PFPush+Synchronous.{h,m}',
-                           'Parse/Parse/PFPush+Deprecated.{h,m}',
-                           'Parse/Parse/PFInstallation.{h,m}',
-                           'Parse/Parse/Internal/PFAlertView.{h,m}',
-                           'Parse/Parse/Internal/Push/**/*.{h,m}',
-                           'Parse/Parse/Internal/Installation/Controller/*.{h,m}',
-                           'Parse/Parse/Internal/Installation/Constants/*.{h,m}',
-                           'Parse/Parse/Internal/Installation/CurrentInstallationController/*.{h,m}',
-                           'Parse/Parse/Internal/Installation/PFInstallationPrivate.h',
-                           'Parse/Parse/Internal/Commands/PFRESTPushCommand.{h,m}'
+                           'Parse/Parse/Internal/PFAlertView.{h,m}'
     s.watchos.exclude_files = 'Parse/Parse/PFNetworkActivityIndicatorManager.{h,m}',
                               'Parse/Parse/PFProduct.{h,m}',
                               'Parse/Parse/PFPurchase.{h,m}',
diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Parse/Internal/Commands/PFRESTPushCommand.h b/Parse/Parse/Internal/Commands/PFRESTPushCommand.h
@@ -11,14 +11,13 @@
 
 #import <Parse/PFConstants.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFPushState;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
+PF_WATCH_UNAVAILABLE @interface PFRESTPushCommand : PFRESTCommand
 
 + (nullable instancetype)sendPushCommandWithPushState:(PFPushState *)state
                                         sessionToken:(nullable NSString *)sessionToken
diff --git a/Parse/Parse/Internal/Installation/Controller/PFInstallationController.h b/Parse/Parse/Internal/Installation/Controller/PFInstallationController.h
@@ -12,12 +12,11 @@
 #import "PFCoreDataProvider.h"
 #import "PFObjectControlling.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
+PF_WATCH_UNAVAILABLE @interface PFInstallationController : NSObject <PFObjectControlling>
 
 @property (nonatomic, weak, readonly) id<PFObjectControllerProvider, PFCurrentInstallationControllerProvider> dataSource;
 
diff --git a/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h b/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h
@@ -16,7 +16,6 @@
 #import "PFDataProvider.h"
 #import "PFMacros.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 extern NSString *const PFCurrentInstallationFileName;
@@ -25,7 +24,7 @@ extern NSString *const PFCurrentInstallationPinName;
 @class BFTask<__covariant BFGenericType>;
 @class PFInstallation;
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
+PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
 
 @property (nonatomic, weak, readonly) id<PFInstallationIdentifierStoreProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFObjectFilePersistenceControllerProvider> coreDataSource;
diff --git a/Parse/Parse/Internal/Installation/PFInstallationPrivate.h b/Parse/Parse/Internal/Installation/PFInstallationPrivate.h
@@ -11,7 +11,6 @@
 
 #import <Parse/PFInstallation.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @interface PFInstallation (Private)
diff --git a/Parse/Parse/Internal/PFApplication.m b/Parse/Parse/Internal/PFApplication.m
@@ -37,9 +37,11 @@ + (instancetype)currentApplication {
 - (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;
+#if TARGET_OS_IOS || TARGET_OS_TV
+        if (@available(iOS 1.0, tvOS 10.0, *)) {
+            [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];
+            _iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;
+        }
 #endif
     }
     return self;
@@ -62,9 +64,9 @@ - (BOOL)isExtensionEnvironment {
 }
 
 - (NSInteger)iconBadgeNumber {
-#if TARGET_OS_WATCH || TARGET_OS_TV
+#if TARGET_OS_WATCH
     return 0;
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS || TARGET_OS_TV
     return _iconBadgeNumber;
 #elif PF_TARGET_OS_OSX
     // Make sure not to use `NSApp` here, because it doesn't work sometimes,
@@ -88,10 +90,12 @@ - (NSInteger)iconBadgeNumber {
 
 - (void)setIconBadgeNumber:(NSInteger)iconBadgeNumber {
     if (self.iconBadgeNumber != iconBadgeNumber) {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_TV
         _iconBadgeNumber = iconBadgeNumber;
         dispatch_block_t block = ^{
-            self.systemApplication.applicationIconBadgeNumber = iconBadgeNumber;
+            if (@available(iOS 1.0, tvOS 10.0, *)) {
+                self.systemApplication.applicationIconBadgeNumber = iconBadgeNumber;
+            }
         };
         if ([NSThread currentThread].isMainThread) {
             block();
@@ -104,7 +108,7 @@ - (void)setIconBadgeNumber:(NSInteger)iconBadgeNumber {
     }
 }
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_TV
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context {
     if ([keyPath isEqualToString:@"applicationIconBadgeNumber"] && change) {
         _iconBadgeNumber = [change[@"new"] integerValue];
@@ -122,8 +126,10 @@ - (UIApplication *)systemApplication {
 }
 
 - (void)dealloc {
-#if TARGET_OS_IOS
-    [self.systemApplication removeObserver:self forKeyPath:@"applicationIconBadgeNumber"];
+#if TARGET_OS_IOS || TARGET_OS_TV
+    if (@available(iOS 1.0, tvOS 10.0, *)) {
+        [self.systemApplication removeObserver:self forKeyPath:@"applicationIconBadgeNumber"];
+    }
 #endif
 }
 
diff --git a/Parse/Parse/Internal/PFCoreManager.h b/Parse/Parse/Internal/PFCoreManager.h
@@ -48,7 +48,7 @@ PFObjectFilePersistenceControllerProvider,
 PFPinningObjectStoreProvider,
 PFObjectLocalIdStoreProvider,
 PFUserAuthenticationControllerProvider,
-#if !TARGET_OS_TV && !TARGET_OS_WATCH
+#if !TARGET_OS_WATCH
 PFInstallationControllerProvider,
 PFCurrentInstallationControllerProvider,
 #endif
diff --git a/Parse/Parse/Internal/PFCoreManager.m b/Parse/Parse/Internal/PFCoreManager.m
@@ -30,7 +30,7 @@
 #import "PFUserAuthenticationController.h"
 #import "PFUserController.h"
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 #import "PFCurrentInstallationController.h"
 #import "PFInstallationController.h"
 #endif
@@ -63,7 +63,7 @@ @implementation PFCoreManager
 @synthesize currentUserController = _currentUserController;
 @synthesize userController = _userController;
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @synthesize currentInstallationController = _currentInstallationController;
 @synthesize installationController = _installationController;
 #endif
@@ -380,7 +380,7 @@ - (void)setSessionController:(PFSessionController *)sessionController {
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 ///--------------------------------------
 #pragma mark - Current Installation Controller
@@ -438,7 +438,7 @@ - (void)setCurrentUserController:(PFCurrentUserController *)currentUserControlle
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 ///--------------------------------------
 #pragma mark - Installation Controller
diff --git a/Parse/Parse/Internal/PFDevice.m b/Parse/Parse/Internal/PFDevice.m
@@ -77,7 +77,7 @@ - (NSString *)detailedModel {
     if (!name) {
 #if TARGET_OS_WATCH
         name = [WKInterfaceDevice currentDevice].model;
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS || TARGET_OS_TV
         name = [UIDevice currentDevice].model;
 #elif TARGET_OS_MAC
         name = @"Mac";
diff --git a/Parse/Parse/Internal/ParseManager.h b/Parse/Parse/Internal/ParseManager.h
@@ -37,7 +37,7 @@ PFInstallationIdentifierStoreProvider>
 
 @property (nonatomic, strong, readonly) PFCoreManager *coreManager;
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @property (nonatomic, strong) PFPushManager *pushManager;
 #endif
 
diff --git a/Parse/Parse/Internal/ParseManager.m b/Parse/Parse/Internal/ParseManager.m
@@ -29,7 +29,7 @@
 #import "PFPersistenceController.h"
 #import "ParseManagerPrivate.h"
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 #import "PFPushManager.h"
 #import "PFInstallation.h"
 #endif
@@ -76,7 +76,7 @@ @implementation ParseManager
 @synthesize keyValueCache = _keyValueCache;
 @synthesize coreManager = _coreManager;
 @synthesize analyticsController = _analyticsController;
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 @synthesize pushManager = _pushManager;
 #endif
 #if TARGET_OS_IOS || TARGET_OS_TV
@@ -361,7 +361,7 @@ - (void)unloadCoreManager {
     });
 }
 
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
 
 #pragma mark PushManager
 
@@ -440,7 +440,7 @@ - (BFTask *)preloadDiskObjectsToMemoryAsync {
         NSArray *tasks = @[
                            [PFUser getCurrentUserInBackground],
                            [PFConfig getCurrentConfigInBackground],
-#if !TARGET_OS_WATCH && !TARGET_OS_TV
+#if !TARGET_OS_WATCH
                            [PFInstallation getCurrentInstallationInBackground],
 #endif
                            ];
@@ -457,7 +457,7 @@ - (BFTask *)preloadDiskObjectsToMemoryAsync {
 
 - (void)_migrateSandboxDataToApplicationGroupContainerIfNeeded {
     // There is no need to migrate anything on OSX, since we are using globally available folder.
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_TV
     // Do nothing if there is no application group container or containing application is specified.
     if (!self.configuration.applicationGroupIdentifier || self.configuration.containingApplicationBundleIdentifier) {
         return;
diff --git a/Parse/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h b/Parse/Parse/Internal/Push/ChannelsController/PFPushChannelsController.h
@@ -13,14 +13,13 @@
 
 #import "PFCoreDataProvider.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class BFTask<__covariant BFGenericType>;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushChannelsController : NSObject
 
 @property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> dataSource;
 
diff --git a/Parse/Parse/Internal/Push/Controller/PFPushController.h b/Parse/Parse/Internal/Push/Controller/PFPushController.h
@@ -11,7 +11,6 @@
 
 #import <Parse/PFConstants.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class BFTask<__covariant BFGenericType>;
@@ -20,7 +19,7 @@ PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushController : NSObject
 
 @property (nonatomic, strong, readonly) id<PFCommandRunning> commandRunner;
 
diff --git a/Parse/Parse/Internal/Push/Manager/PFPushManager.h b/Parse/Parse/Internal/Push/Manager/PFPushManager.h
@@ -14,15 +14,14 @@
 #import "PFCoreDataProvider.h"
 #import "PFDataProvider.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFPushChannelsController;
 @class PFPushController;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
+PF_WATCH_UNAVAILABLE @interface PFPushManager : NSObject
 
 @property (nonatomic, weak, readonly) id<PFCommandRunnerProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFCurrentInstallationControllerProvider> coreDataSource;
diff --git a/Parse/Parse/Internal/Push/PFPushPrivate.h b/Parse/Parse/Internal/Push/PFPushPrivate.h
@@ -13,7 +13,6 @@
 
 #import "PFMacros.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Parse/Parse/Internal/Push/State/PFMutablePushState.h b/Parse/Parse/Internal/Push/State/PFMutablePushState.h
@@ -9,12 +9,11 @@
 
 #import "PFPushState.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
+PF_WATCH_UNAVAILABLE @interface PFMutablePushState : PFPushState
 
 @property (nullable, nonatomic, copy, readwrite) NSSet *channels;
 @property (nullable, nonatomic, copy, readwrite) PFQueryState *queryState;
diff --git a/Parse/Parse/Internal/Push/State/PFPushState.h b/Parse/Parse/Internal/Push/State/PFPushState.h
@@ -13,14 +13,13 @@
 
 #import "PFBaseState.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 @class PFQueryState;
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
+PF_WATCH_UNAVAILABLE @interface PFPushState : PFBaseState <NSCopying, NSMutableCopying>
 
 @property (nullable, nonatomic, copy, readonly) NSSet *channels;
 @property (nullable, nonatomic, copy, readonly) PFQueryState *queryState;
diff --git a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.h b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.h
@@ -11,12 +11,11 @@
 
 #import "PFPushPrivate.h"
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
+PF_WATCH_UNAVAILABLE @interface PFPushUtilities : NSObject <PFPushInternalUtils>
 
 @end
 
diff --git a/Parse/Parse/PFConstants.m b/Parse/Parse/PFConstants.m
@@ -14,7 +14,7 @@
 #elif PF_TARGET_OS_OSX
 NSString *const kPFDeviceType = @"osx";
 #elif TARGET_OS_TV
-NSString *const kPFDeviceType = @"appletv";
+NSString *const kPFDeviceType = @"tvos";
 #elif TARGET_OS_WATCH
 NSString *const kPFDeviceType = @"applewatch";
 #endif
diff --git a/Parse/Parse/PFInstallation.h b/Parse/Parse/PFInstallation.h
@@ -12,7 +12,6 @@
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
 
-PF_TV_UNAVAILABLE_WARNING
 PF_WATCH_UNAVAILABLE_WARNING
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
  the Parse cloud can be used to target push notifications.
  */
 
-PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
+PF_WATCH_UNAVAILABLE @interface PFInstallation : PFObject<PFSubclassing>
 
 ///--------------------------------------
 #pragma mark - Accessing the Current Installation
diff --git a/Parse/Parse/PFInstallation.m b/Parse/Parse/PFInstallation.m
@@ -278,11 +278,13 @@ - (void)_updateTimeZoneFromDevice {
 }
 
 - (void)_updateBadgeFromDevice {
-    // Get the application icon and update the installation if necessary.
-    NSNumber *applicationBadge = @([PFApplication currentApplication].iconBadgeNumber);
-    NSNumber *installationBadge = [super objectForKey:PFInstallationKeyBadge];
-    if (installationBadge == nil || ![applicationBadge isEqualToNumber:installationBadge]) {
-        [super setObject:applicationBadge forKey:PFInstallationKeyBadge];
+    if (@available(iOS 1.0, tvOS 10.0, *)) {
+        // Get the application icon and update the installation if necessary.
+        NSNumber *applicationBadge = @([PFApplication currentApplication].iconBadgeNumber);
+        NSNumber *installationBadge = [super objectForKey:PFInstallationKeyBadge];
+        if (installationBadge == nil || ![applicationBadge isEqualToNumber:installationBadge]) {
+            [super setObject:applicationBadge forKey:PFInstallationKeyBadge];
+        }
     }
 }
 
diff --git a/Parse/Parse/PFPush.h b/Parse/Parse/PFPush.h
diff --git a/Parse/Parse/PFPush.m b/Parse/Parse/PFPush.m
diff --git a/Parse/Parse/Parse.h b/Parse/Parse/Parse.h
diff --git a/Parse/Parse/Parse.m b/Parse/Parse/Parse.m
diff --git a/Parse/Parse/ParseClientConfiguration.h b/Parse/Parse/ParseClientConfiguration.h
diff --git a/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m b/ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m
