Skip to content

Commit 56a73c4

Browse files
author
Taylor Case
authored
Merge pull request #347 from dropbox/upload-session-finish-batch-deprecation
Resolve uploadSessionFinishBatch deprecation warning.
2 parents c42024c + 0ccabca commit 56a73c4

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

Source/ObjectiveDropboxOfficial/Shared/Handwritten/Resources/DBCustomRoutes.m

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -415,25 +415,17 @@ - (void)batchFinishUponCompletion:(DBBatchUploadData *)uploadData {
415415

416416
uploadData.finishArgs = sortedFinishArgs;
417417

418-
#pragma clang diagnostic push
419-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
420-
[[self uploadSessionFinishBatch:sortedFinishArgs]
421-
setResponseBlock:^(DBFILESUploadSessionFinishBatchLaunch *result, DBNilObject *routeError,
422-
DBRequestError *error) {
423-
if (result && !routeError) {
424-
if ([result isAsyncJobId]) {
425-
sleep(1);
426-
[self queryJobStatus:uploadData asyncJobId:result.asyncJobId retryCount:2];
427-
}
428-
} else {
418+
[[self uploadSessionFinishBatchV2:sortedFinishArgs]
419+
setResponseBlock:^(DBFILESUploadSessionFinishBatchResult * _Nullable result,
420+
DBNilObject * _Nullable routeError,
421+
DBRequestError * _Nullable networkError) {
422+
if (!result || routeError) {
429423
[uploadData.queue addOperationWithBlock:^{
430-
uploadData.responseBlock(nil, nil, error, uploadData.fileUrlsToRequestErrors);
424+
uploadData.responseBlock(nil, nil, networkError, uploadData.fileUrlsToRequestErrors);
431425
}];
432-
}
433426
}
434-
queue:uploadData.pollingQueue];
427+
} queue:uploadData.pollingQueue];
435428
});
436-
#pragma clang diagnostic pop
437429
}
438430

439431
- (void)executeProgressHandler:(DBBatchUploadData *)uploadData amountUploaded:(int64_t)amountUploaded {

0 commit comments

Comments
 (0)