PLAT-8408: Enable folder encryption #6547
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
| { | ||
| list ( $fileSync , $local ) = self::getReadyFileSyncForKey($key, $strict); | ||
| if ($fileSync) | ||
| return self::resolve($fileSync); |
There was a problem hiding this comment.
Return null if no fs
| @@ -1653,4 +1653,11 @@ public static function getResolveLocalFileSyncForKey(FileSyncKey $key) | |||
| return self::resolve($fileSync); | |||
| } | |||
|
|
|||
| public static function getResolveReadyFileSyncForKey(FileSyncKey $key , $strict = false) | |||
There was a problem hiding this comment.
remove the resolve from the name
|
|
||
| $fileSync = kFileSyncUtils::getResolveReadyFileSyncForKey($syncKey); | ||
|
|
||
| $filePath = $fileSync ? $fileSync->getFullPath() : null; |
There was a problem hiding this comment.
No need to check if $fileSync more than once
| @@ -120,8 +120,12 @@ public function execute() | |||
|
|
|||
| $this->handleFileSyncRedirection($syncKey); | |||
|
|
|||
| $filePath = kFileSyncUtils::getReadyLocalFilePathForKey($syncKey); | |||
|
|
|||
| $fileSync = kFileSyncUtils::getResolveReadyFileSyncForKey($syncKey); | |||
There was a problem hiding this comment.
If no fileSync then dieGracefuly.
|
Reviewed |
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.
No description provided.