fix: absolute paths not working in sandbox #3794
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ming upload tasks that were pending upon app kill/restart
harsh62
force-pushed
the
bugfix/1697
branch
from
ebdf97d to
a100f03
Compare
brennanMKE
reviewed
Sep 28, 2021
AWSS3/AWSS3TransferUtility.m
Outdated
| @@ -325,8 +332,10 @@ + (void)registerS3TransferUtilityWithConfiguration:(AWSServiceConfiguration *)co | |||
| recoverState:NO | |||
| completionHandler:completionHandler]; | |||
| if (s3TransferUtility) { | |||
| NSAssert(_serviceClients != nil, @"Value is required"); | |||
There was a problem hiding this comment.
We should be using NSCAssert instead of NSAssert since it does not work with ARC.
brennanMKE
reviewed
Sep 28, 2021
AWSS3/AWSS3TransferUtility.m
Outdated
| @@ -38,7 +38,7 @@ | |||
| static NSString *const AWSS3TransferUtilityRetrySucceeded = @"AWSS3TransferUtilityRetrySucceeded"; | |||
| static NSUInteger const AWSS3TransferUtilityMultiPartSize = 5 * 1024 * 1024; | |||
| static NSString *const AWSS3TransferUtiltityRequestTimeoutErrorCode = @"RequestTimeout"; | |||
| static int const AWSS3TransferUtilityMultiPartDefaultConcurrencyLimit = 5; | |||
| static int const AWSS3TransferUtilityMultiPartDefaultConcurrencyLimit = 10; | |||
There was a problem hiding this comment.
This value should not be changed as a part of this bug fix.
brennanMKE
reviewed
Sep 28, 2021
AWSS3/AWSS3TransferUtility.m
Outdated
| @@ -1395,6 +1396,9 @@ - (void) retryUpload: (AWSS3TransferUtilityUploadTask *) transferUtilityUploadTa | |||
| } | |||
| } | |||
|
|
|||
| //Save in Database after the file has been created, so that file can be referenced incase upload is paused and needs to be restarted. | |||
There was a problem hiding this comment.
I would put do this if there is no error by adjusting the if statement below. I think that makes sense.
if (!subTaskCreationError) {
//Save in Database after the file has been created, so that file can be referenced incase upload is paused and needs to be restarted.
[AWSS3TransferUtilityDatabaseHelper insertMultiPartUploadRequestSubTaskInDB:transferUtilityMultiPartUploadTask subTask:subTask
databaseQueue:self.databaseQueue];
} else {
//Abort the request, so the server can clean up any partials.
[self callAbortMultiPartForUploadTask:transferUtilityMultiPartUploadTask];
transferUtilityMultiPartUploadTask.status = AWSS3TransferUtilityTransferStatusError;
//Add it to list of completed Tasks
[self.completedTaskDictionary setObject:transferUtilityMultiPartUploadTask forKey:transferUtilityMultiPartUploadTask.transferID];
//Clean up.
[self cleanupForMultiPartUploadTask:transferUtilityMultiPartUploadTask];
return [AWSTask taskWithError:subTaskCreationError];
}
|
LGTM |
brennanMKE
previously approved these changes
Oct 4, 2021
gabek
pushed a commit
to KeepSafe/aws-sdk-ios
that referenced
this pull request
Aug 31, 2023
* fix: absolute paths not working in sandbox and not automatically resuming upload tasks that were pending upon app kill/restart
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #1697
Description of changes:
The purpose of the PR is to fix the following 2 issues:
Check points:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.