Keep File Manager from Error State on disallowed #1455
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
justingluck93
changed the title
joeljfischer
suggested changes
Oct 22, 2019
joeljfischer
suggested changes
Oct 23, 2019
added 2 commits
October 23, 2019 11:44
joeljfischer
previously approved these changes
Oct 23, 2019
joeljfischer
suggested changes
Oct 23, 2019
Co-Authored-By: Joel Fischer <joeljfischer@gmail.com>
joeljfischer
suggested changes
Oct 24, 2019
| @@ -157,6 +157,22 @@ @implementation FileManagerSpecHelper | |||
| }); | |||
| }); | |||
|
|
|||
| describe(@"after receiving a ListFiles error with a resulCode", ^{ | |||
There was a problem hiding this comment.
Suggested change
| describe(@"after receiving a ListFiles error with a resulCode", ^{ | |
| describe(@"after receiving a ListFiles error with a resultCode DISALLOWED", ^{ |
| @@ -59,7 +59,14 @@ - (void)sdl_listFiles { | |||
| NSUInteger bytesAvailable = listFilesResponse.spaceAvailable != nil ? listFilesResponse.spaceAvailable.unsignedIntegerValue : 2000000000; | |||
|
|
|||
| if (weakSelf.completionHandler != nil) { | |||
| weakSelf.completionHandler(success, bytesAvailable, fileNames, error); | |||
| if([response.resultCode isEqualToEnum:SDLResultDisallowed]) { | |||
There was a problem hiding this comment.
Instead of this, just always set the resultCode into the error if an error exists.
| expect(@(successResult)).to(equal(@NO)); | ||
| }); | ||
|
|
||
| it(@"should have called completion handler with error including a resultCode ", ^{ |
There was a problem hiding this comment.
Based on the above change request, I think that this it is the only one needed?
joeljfischer
suggested changes
Oct 24, 2019
Co-Authored-By: Joel Fischer <joeljfischer@gmail.com>
joeljfischer
approved these changes
Oct 24, 2019
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.
Fixes #1454
This PR is ready for review.
Risk
This PR makes no API changes.
Testing Plan
Test against example app using Xcode 11. Make sure to remove
ListFilesRPC from cores policy table in order to recreate adisallowedSummary
This PR adds a check to see if the error was
disallowed. If it isdisallowedwe no longer want to Error but rather continue with the setup process.CLA