Skip to content

Revert "Merge pull request #1922 from morganchen12/master" #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2018
Merged

Revert "Merge pull request #1922 from morganchen12/master" #1930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions GoogleUtilities/Network/GULNetworkURLSession.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ - (NSString *)sessionIDFromAsyncPOSTRequest:(NSURLRequest *)request

if (didWriteFile) {
// Exclude this file from backing up to iTunes. There are conflicting reports that excluding
// directory from backing up does not exclude files of that directory from backing up.
// directory from backing up does not excluding files of that directory from backing up.
[self excludeFromBackupForURL:_uploadingFileURL];

_sessionConfig = [self backgroundSessionConfigWithSessionID:_sessionID];
Expand Down Expand Up @@ -240,7 +240,6 @@ - (void)URLSession:(NSURLSession *)session
context:error];
_downloadedData = nil;
}
[session finishTasksAndInvalidate];
}

#if TARGET_OS_IOS || TARGET_OS_TV
Expand All @@ -251,7 +250,6 @@ - (void)URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
message:@"Background session finished"
context:session.configuration.identifier];
[self callSystemCompletionHandler:session.configuration.identifier];
[session finishTasksAndInvalidate];
}
#endif

Expand Down Expand Up @@ -286,7 +284,6 @@ - (void)URLSession:(NSURLSession *)session
// Try to clean up stale files again.
[self maybeRemoveTempFilesAtURL:_networkDirectoryURL
expiringTime:kGULNetworkTempFolderExpireTime];
[session finishTasksAndInvalidate];
}

- (void)URLSession:(NSURLSession *)session
Expand Down