move register notification subscription into methods that relies on it.

Author: peterp

Libraries/PushNotificationIOS/RCTPushNotificationManager.m

@@ -142,6 +142,17 @@ - (void)startObserving
                                            selector:@selector(handleRemoteNotificationReceived:)
                                                name:RCTRemoteNotificationReceived
                                              object:nil];
+  [self startObservingRegisteredNotifications];
+}
+
+
+
+- (void)startObservingRegisteredNotifications
+{
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(handleRegisterUserNotificationSettings:)
+                                               name:RCTRegisterUserNotificationSettings
+                                             object:nil];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(handleRemoteNotificationsRegistered:)
                                                name:RCTRemoteNotificationsRegistered
@@ -150,15 +161,19 @@ - (void)startObserving
                                            selector:@selector(handleRemoteNotificationRegistrationError:)
                                                name:RCTErrorRemoteNotificationRegistrationFailed
                                              object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(handleRegisterUserNotificationSettings:)
-                                               name:RCTRegisterUserNotificationSettings
-                                             object:nil];
 }
 
-- (void)stopObserving
+- (void)stopObservingRegisteredNotifications
 {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTErrorRemoteNotificationRegistrationFailed
+                                                object:nil];
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTRegisterUserNotificationSettings
+                                                object:nil];
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTRemoteNotificationsRegistered
+                                                object:nil];
 }
 
 - (NSArray<NSString *> *)supportedEvents
@@ -249,6 +264,7 @@ - (void)handleRemoteNotificationReceived:(NSNotification *)notification
 - (void)handleRemoteNotificationsRegistered:(NSNotification *)notification
 {
   [self sendEventWithName:@"remoteNotificationsRegistered" body:notification.userInfo];
+  [self stopObservingRegisteredNotifications];
 }
 
 - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
@@ -260,6 +276,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
     @"details": error.userInfo,
   };
   [self sendEventWithName:@"remoteNotificationRegistrationError" body:errorDetails];
+  [self stopObservingRegisteredNotifications];
 }
 
 - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
@@ -319,6 +336,7 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
     return;
   }
 
+  [self startObservingRegisteredNotifications];
   _requestPermissionsResolveBlock = resolve;
 
   UIUserNotificationType types = UIUserNotificationTypeNone;