Merge pull request #9910 from hansemannn/TIMOB-25842

[TIMOB-25842] iOS: Only fire "handleurl" event if listener is added
tidev · May 22, 2018 · bb7f11f · bb7f11f
2 parents ce9db15 + ec13e1f
commit bb7f11f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/iphone/Classes/TiAppiOSProxy.m b/iphone/Classes/TiAppiOSProxy.m
@@ -135,6 +135,9 @@ - (void)_listenerRemoved:(NSString *)type count:(int)count
   if (count == 0 && [type isEqual:@"remotenotificationaction"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiRemoteNotificationAction object:nil];
   }
+  if ((count == 0) && [type isEqual:@"handleurl"]) {
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiApplicationLaunchedFromURL object:nil];
+  }
 
   if ((count == 1) && [type isEqual:@"backgroundfetch"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiBackgroundFetchNotification object:nil];
@@ -160,7 +163,6 @@ - (void)_listenerRemoved:(NSString *)type count:(int)count
   if ((count == 1) && [type isEqual:@"uploadprogress"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiURLUploadProgress object:nil];
   }
-
   if ((count == 1) && [type isEqual:@"usernotificationsetting"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiUserNotificationSettingsNotification object:nil];
   }
@@ -170,7 +172,6 @@ - (void)_listenerRemoved:(NSString *)type count:(int)count
   if ((count == 1) && [type isEqual:@"continueactivity"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiContinueActivity object:nil];
   }
-
   if ([TiUtils isIOS9OrGreater]) {
     if ((count == 1) && [type isEqual:@"shortcutitemclick"]) {
       [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiApplicationShortcut object:nil];
@@ -201,6 +202,10 @@ - (void)didReceiveApplicationShortcutNotification:(NSNotification *)info
 
 - (void)didHandleURL:(NSNotification *)info
 {
+  if (![self _hasListeners:@"handleurl"]) {
+    return;
+  }
+
   [self fireEvent:@"handleurl"
        withObject:@{
          @"launchOptions" : [info userInfo]