fix(ios): avoid reusing background completion handlers

Author: hansemannn

iphone/Classes/TiAppiOSProxy.m

@@ -977,7 +977,7 @@ - (void)endBackgroundHandler:(id)handlerIdentifier
   if ([handlerIdentifier rangeOfString:@"Session"].location != NSNotFound) {
     [[TiApp app] performCompletionHandlerForBackgroundTransferWithKey:handlerIdentifier];
   } else {
-    [[TiApp app] performCompletionHandlerWithKey:handlerIdentifier andResult:UIBackgroundFetchResultNoData removeAfterExecution:NO];
+    [[TiApp app] performCompletionHandlerWithKey:handlerIdentifier andResult:UIBackgroundFetchResultNoData];
   }
 }
 

iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.h

@@ -297,7 +297,7 @@ TI_INLINE void waitForMemoryPanicCleared() // WARNING: This must never be run on
 - (void)registerBackgroundService:(TiProxy *)proxy;
 - (void)unregisterBackgroundService:(TiProxy *)proxy;
 - (void)stopBackgroundService:(TiProxy *)proxy;
-- (void)performCompletionHandlerWithKey:(NSString *)key andResult:(UIBackgroundFetchResult)result removeAfterExecution:(BOOL)removeAfterExecution;
+- (void)performCompletionHandlerWithKey:(NSString *)key andResult:(UIBackgroundFetchResult)result;
 - (void)performCompletionHandlerForBackgroundTransferWithKey:(NSString *)key;
 - (void)watchKitExtensionRequestHandler:(id)key withUserInfo:(NSDictionary *)userInfo;
 

iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.m

@@ -759,8 +759,7 @@ - (void)flushCompletionHandlerQueue
 {
   if (pendingCompletionHandlers != nil) {
     for (NSString *key in [pendingCompletionHandlers allKeys]) {
-      // Do not remove from the pending handlers for now, as it's removed after the enumeration finished
-      [self performCompletionHandlerWithKey:key andResult:UIBackgroundFetchResultFailed removeAfterExecution:NO];
+      [self performCompletionHandlerWithKey:key andResult:UIBackgroundFetchResultFailed];
     }
   }
   RELEASE_TO_NIL(pendingCompletionHandlers);
@@ -772,19 +771,17 @@ - (void)fireCompletionHandler:(NSTimer *)timer
   NSString *key = (NSString *)timer.userInfo;
   if ([pendingCompletionHandlers objectForKey:key]) {
     // Send an event notifying the developer that the background-fetch failed
-    [self performCompletionHandlerWithKey:key andResult:UIBackgroundFetchResultFailed removeAfterExecution:YES];
+    [self performCompletionHandlerWithKey:key andResult:UIBackgroundFetchResultFailed];
   }
 }
 
 // Gets called when user ends finishes with backgrounding stuff. By default this would always be called with UIBackgroundFetchResultNoData.
-- (void)performCompletionHandlerWithKey:(NSString *)key andResult:(UIBackgroundFetchResult)result removeAfterExecution:(BOOL)removeAfterExecution
+- (void)performCompletionHandlerWithKey:(NSString *)key andResult:(UIBackgroundFetchResult)result
 {
-  if ([pendingCompletionHandlers objectForKey:key]) {
-    void (^completionHandler)(UIBackgroundFetchResult) = [pendingCompletionHandlers objectForKey:key];
+  void (^completionHandler)(UIBackgroundFetchResult) = [pendingCompletionHandlers objectForKey:key];
+  if (completionHandler != nil) {
+    [pendingCompletionHandlers removeObjectForKey:key];
     completionHandler(result);
-    if (removeAfterExecution) {
-      [pendingCompletionHandlers removeObjectForKey:key];
-    }
   } else {
     DebugLog(@"[ERROR] The specified completion handler with ID = %@ has already expired or been removed from the system", key);
   }