修改pods

Pods/GTMSessionFetcher/Sources/Core/GTMSessionFetcherService.m

@@ -37,9 +37,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
 
 #if !GTMSESSION_BUILD_COMBINED_SOURCES
 @interface GTMSessionFetcher (ServiceMethods)
-- (BOOL)beginFetchMayDelay:(BOOL)mayDelay
-              mayAuthorize:(BOOL)mayAuthorize
-               mayDecorate:(BOOL)mayDecorate;
+- (void)serviceRestartingFetcher;
 @end
 #endif  // !GTMSESSION_BUILD_COMBINED_SOURCES
 
@@ -141,7 +139,8 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
             unusedSessionTimeout = _unusedSessionTimeout,
             userAgentProvider = _userAgentProvider,
             decoratorsPointerArray = _decoratorsPointerArray,
-            testBlock = _testBlock;
+            testBlock = _testBlock,
+            stopFetchingTriggersCompletionHandler = _stopFetchingTriggersCompletionHandler;
 // clang-format on
 
 #if GTM_BACKGROUND_TASK_FETCHING
@@ -218,9 +217,8 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
   fetcher.retryBlock = self.retryBlock;
   fetcher.maxRetryInterval = self.maxRetryInterval;
   fetcher.minRetryInterval = self.minRetryInterval;
-  if (@available(iOS 10.0, *)) {
-    fetcher.metricsCollectionBlock = self.metricsCollectionBlock;
-  }
+  fetcher.metricsCollectionBlock = self.metricsCollectionBlock;
+  fetcher.stopFetchingTriggersCompletionHandler = self.stopFetchingTriggersCompletionHandler;
   fetcher.properties = self.properties;
   fetcher.service = self;
 
@@ -338,6 +336,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
 #pragma mark Queue Management
 
 - (void)addRunningFetcher:(GTMSessionFetcher *)fetcher forHost:(NSString *)host {
+  GTMSessionCheckSynchronized(self);
   // Add to the array of running fetchers for this host, creating the array if needed.
   NSMutableArray *runningForHost = [_runningFetchersByHost objectForKey:host];
   if (runningForHost == nil) {
@@ -349,6 +348,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
 }
 
 - (void)addDelayedFetcher:(GTMSessionFetcher *)fetcher forHost:(NSString *)host {
+  GTMSessionCheckSynchronized(self);
   // Add to the array of delayed fetchers for this host, creating the array if needed.
   NSMutableArray *delayedForHost = [_delayedFetchersByHost objectForKey:host];
   if (delayedForHost == nil) {
@@ -421,10 +421,6 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
   return shouldBeginResult;
 }
 
-- (void)startFetcher:(GTMSessionFetcher *)fetcher {
-  [fetcher beginFetchMayDelay:NO mayAuthorize:YES mayDecorate:YES];
-}
-
 // Internal utility. Returns a fetcher's delegate if it's a dispatcher, or nil if the fetcher
 // is its own delegate (possibly via proxy) and has no dispatcher.
 - (GTMSessionFetcherSessionDelegateDispatcher *)delegateDispatcherForFetcher:
@@ -486,7 +482,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
   [self fetcherDidStop:fetcher callbacksPending:false];
 }
 
-- (void)fetcherDidStop:(GTMSessionFetcher *)fetcher callbacksPending:(BOOL) callbacksPending {
+- (void)fetcherDidStop:(GTMSessionFetcher *)fetcher callbacksPending:(BOOL)callbacksPending {
   // Entry point from the fetcher
   NSString *host = fetcher.serviceHost;
   if (!host) {
@@ -498,7 +494,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
   // map when the task completes.
   if (!callbacksPending) {
     GTMSessionFetcherSessionDelegateDispatcher *delegateDispatcher =
-    [self delegateDispatcherForFetcher:fetcher];
+        [self delegateDispatcherForFetcher:fetcher];
     [delegateDispatcher removeFetcher:fetcher];
   }
 
@@ -554,7 +550,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
 
   // Start fetchers outside of the synchronized block to avoid a deadlock.
   for (GTMSessionFetcher *nextFetcher in fetchersToStart) {
-    [self startFetcher:nextFetcher];
+    [nextFetcher serviceRestartingFetcher];
   }
 
   // The fetcher is no longer in the running or the delayed array,
@@ -657,6 +653,8 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
     [_runningFetchersByHost removeAllObjects];
   }
 
+  // Stop the delayed fetchers first so a delayed one doesn't get started when canceling
+  // a running one.
   for (NSArray *delayedForHost in delayedFetchersByHost) {
     for (GTMSessionFetcher *fetcher in delayedForHost) {
       [self stopFetcher:fetcher];
@@ -1331,8 +1329,7 @@ static id<GTMUserAgentProvider> SharedStandardUserAgentProvider(void) {
 
 - (void)URLSession:(NSURLSession *)session
                           task:(NSURLSessionTask *)task
-    didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics
-    API_AVAILABLE(ios(10.0), macosx(10.12), tvos(10.0), watchos(6.0)) {
+    didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics {
   id<NSURLSessionTaskDelegate> fetcher = [self fetcherForTask:task];
   [fetcher URLSession:session task:task didFinishCollectingMetrics:metrics];
 }