FIRMessagingRemoteNotificationsProxy: app delegate missing methods te…

…sts added. Cleanup
firebase · maksymmalyhin · Apr 4, 2019 · Mar 26, 2019 · Mar 27, 2019 · Mar 27, 2019
commit 98ffccbbd08514b499f5c4f4d9cf0faff29ce65e
diff --git a/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m b/Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m
@@ -65,6 +65,8 @@ @implementation IncompleteAppDelegate
 @interface FakeAppDelegate : NSObject <UIApplicationDelegate>
 @property(nonatomic) BOOL remoteNotificationMethodWasCalled;
 @property(nonatomic) BOOL remoteNotificationWithFetchHandlerWasCalled;
+@property(nonatomic, strong) NSData *deviceToken;
+@property(nonatomic, strong) NSError *registerForRemoteNotificationsError;
 @end
 @implementation FakeAppDelegate
 #if TARGET_OS_IOS
@@ -78,6 +80,17 @@ - (void)application:(UIApplication *)application
     fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
   self.remoteNotificationWithFetchHandlerWasCalled = YES;
 }
+
+- (void)application:(UIApplication *)application
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+  self.deviceToken = deviceToken;
+}
+
+- (void)application:(UIApplication *)application
+    didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+  self.registerForRemoteNotificationsError = error;
+}
+
 @end
 
 #pragma mark - Incompete UNUserNotificationCenterDelegate
@@ -145,8 +158,7 @@ - (void)setUp {
   OCMStub([_mockProxyClass sharedProxy]).andReturn(self.proxy);
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-  _mockUserNotificationCenter = OCMClassMock([UNUserNotificationCenter class]);
-  OCMStub([_mockUserNotificationCenter currentNotificationCenter]).andReturn(_mockUserNotificationCenter);
+  _mockUserNotificationCenter = OCMPartialMock([UNUserNotificationCenter currentNotificationCenter]);
 #endif
 }
 
@@ -160,6 +172,9 @@ - (void)tearDown {
   [_mockSharedApplication stopMocking];
   _mockSharedApplication = nil;
 
+  [_mockUserNotificationCenter stopMocking];
+  _mockUserNotificationCenter = nil;
+
   _proxy = nil;
   [super tearDown];
 }
@@ -238,6 +253,26 @@ - (void)testSwizzledAppDelegateRemoteNotificationMethods {
   XCTAssertTrue(appDelegate.remoteNotificationWithFetchHandlerWasCalled);
 
   [self.mockMessaging verify];
+
+  // Verify application:didRegisterForRemoteNotificationsWithDeviceToken:
+  NSData *deviceToken = [NSData data];
+
+  OCMExpect([self.mockMessaging setAPNSToken:deviceToken]);
+
+  [appDelegate application:self.mockSharedApplication
+      didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+
+  XCTAssertEqual(appDelegate.deviceToken, deviceToken);
+  [self.mockMessaging verify];
+
+  // Verify application:didFailToRegisterForRemoteNotificationsWithError:
+  NSError *error = [NSError errorWithDomain:@"tests" code:-1 userInfo:nil];
+
+  [appDelegate application:self.mockSharedApplication
+      didFailToRegisterForRemoteNotificationsWithError:error];
+
+  XCTAssertEqual(appDelegate.registerForRemoteNotificationsError, error);
+
 #endif
 }
 

diff --git a/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m b/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m
@@ -31,15 +31,13 @@
     @"userNotificationCenter:willPresentNotification:withCompletionHandler:";
 static NSString *kUserNotificationDidReceiveResponseSelectorString =
     @"userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:";
-static NSString *kReceiveDataMessageSelectorString = @"messaging:didReceiveMessage:";
 
 @interface FIRMessagingRemoteNotificationsProxy () <UIApplicationDelegate>
 
 @property(strong, nonatomic) NSMutableDictionary<NSString *, NSValue *> *originalAppDelegateImps;
 @property(strong, nonatomic) NSMutableDictionary<NSString *, NSArray *> *swizzledSelectorsByClass;
 
 @property(nonatomic) BOOL didSwizzleMethods;
-@property(nonatomic) BOOL didSwizzleAppDelegateMethods;
 
 @property(nonatomic) BOOL hasSwizzledUserNotificationDelegate;
 @property(nonatomic) BOOL isObservingUserNotificationDelegateChanges;
@@ -92,13 +90,6 @@ - (void)swizzleMethodsIfPossible {
   [GULAppDelegateSwizzler proxyOriginalDelegate];
   self.appDelegateInterceptorID = [GULAppDelegateSwizzler registerAppDelegateInterceptor:self];
 
-  UIApplication *application = [GULAppDelegateSwizzler sharedApplication];
-  if (!application) {
-    return;
-  }
-  NSObject<UIApplicationDelegate> *appDelegate = [application delegate];
-  [self swizzleAppDelegateMethods:appDelegate];
-
   // Add KVO listener on [UNUserNotificationCenter currentNotificationCenter]'s delegate property
   Class notificationCenterClass = NSClassFromString(@"UNUserNotificationCenter");
   if (notificationCenterClass) {
@@ -127,24 +118,6 @@ - (void)unswizzleAllMethods {
   [self.swizzledSelectorsByClass removeAllObjects];
 }
 
-- (void)swizzleAppDelegateMethods:(id<UIApplicationDelegate>)appDelegate {
-  Class appDelegateClass = [appDelegate class];
-
-  BOOL didSwizzleAppDelegate = NO;
-
-  // For data message from MCS.
-  SEL receiveDataMessageSelector = NSSelectorFromString(kReceiveDataMessageSelectorString);
-  if ([appDelegate respondsToSelector:receiveDataMessageSelector]) {
-    [self swizzleSelector:receiveDataMessageSelector
-                   inClass:appDelegateClass
-        withImplementation:(IMP)FCM_swizzle_messagingDidReceiveMessage
-                inProtocol:@protocol(UIApplicationDelegate)];
-    didSwizzleAppDelegate = YES;
-  }
-
-  self.didSwizzleAppDelegateMethods = didSwizzleAppDelegate;
-}
-
 - (void)listenForDelegateChangesInUserNotificationCenter:(id)notificationCenter {
   Class notificationCenterClass = NSClassFromString(@"UNUserNotificationCenter");
   if (![notificationCenter isKindOfClass:notificationCenterClass]) {
@@ -446,37 +419,6 @@ - (void)application:(UIApplication *)application
 
 #pragma mark - Swizzled Methods
 
-void FCM_swizzle_appDidReceiveRemoteNotification(id self,
-                                                 SEL _cmd,
-                                                 UIApplication *app,
-                                                 NSDictionary *userInfo) {
-  [[FIRMessaging messaging] appDidReceiveMessage:userInfo];
-
-  IMP original_imp =
-      [[FIRMessagingRemoteNotificationsProxy sharedProxy] originalImplementationForSelector:_cmd];
-  if (original_imp) {
-    ((void (*)(id, SEL, UIApplication *, NSDictionary *))original_imp)(self,
-                                                                       _cmd,
-                                                                       app,
-                                                                       userInfo);
-  }
-}
-
-void FCM_swizzle_appDidReceiveRemoteNotificationWithHandler(
-    id self, SEL _cmd, UIApplication *app, NSDictionary *userInfo,
-    void (^handler)(UIBackgroundFetchResult)) {
-
-  [[FIRMessaging messaging] appDidReceiveMessage:userInfo];
-
-  IMP original_imp =
-      [[FIRMessagingRemoteNotificationsProxy sharedProxy] originalImplementationForSelector:_cmd];
-  if (original_imp) {
-    ((void (*)(id, SEL, UIApplication *, NSDictionary *,
-               void (^)(UIBackgroundFetchResult)))original_imp)(
-        self, _cmd, app, userInfo, handler);
-  }
-}
-
 /**
  * Swizzle the notification handler for iOS 10+ devices.
  * Signature of original handler is as below:
@@ -652,46 +594,4 @@ id userInfoFromNotification(id notification) {
   return notificationUserInfo;
 }
 
-void FCM_swizzle_messagingDidReceiveMessage(id self, SEL _cmd, FIRMessaging *message,
-                                            FIRMessagingRemoteMessage *remoteMessage) {
-  [[FIRMessaging messaging] appDidReceiveMessage:remoteMessage.appData];
-
-  IMP original_imp =
-      [[FIRMessagingRemoteNotificationsProxy sharedProxy] originalImplementationForSelector:_cmd];
-  if (original_imp) {
-    ((void (*)(id, SEL, FIRMessaging *, FIRMessagingRemoteMessage *))original_imp)(
-        self, _cmd, message, remoteMessage);
-  }
-}
-
-void FCM_swizzle_appDidFailToRegisterForRemoteNotifications(id self,
-                                                            SEL _cmd,
-                                                            UIApplication *app,
-                                                            NSError *error) {
-  // Log the fact that we failed to register for remote notifications
-  FIRMessagingLoggerError(kFIRMessagingMessageCodeRemoteNotificationsProxyAPNSFailed,
-                          @"Error in "
-                          @"application:didFailToRegisterForRemoteNotificationsWithError: %@",
-                          error.localizedDescription);
-  IMP original_imp =
-      [[FIRMessagingRemoteNotificationsProxy sharedProxy] originalImplementationForSelector:_cmd];
-  if (original_imp) {
-    ((void (*)(id, SEL, UIApplication *, NSError *))original_imp)(self, _cmd, app, error);
-  }
-}
-
-void FCM_swizzle_appDidRegisterForRemoteNotifications(id self,
-                                                      SEL _cmd,
-                                                      UIApplication *app,
-                                                      NSData *deviceToken) {
-  // Pass the APNSToken along to FIRMessaging (and auto-detect the token type)
-  [FIRMessaging messaging].APNSToken = deviceToken;
-
-  IMP original_imp =
-      [[FIRMessagingRemoteNotificationsProxy sharedProxy] originalImplementationForSelector:_cmd];
-  if (original_imp) {
-    ((void (*)(id, SEL, UIApplication *, NSData *))original_imp)(self, _cmd, app, deviceToken);
-  }
-}
-
 @end