Browse Source
Fix shared storage namespace in DecryptAll class
pull/1835/head
Vincent Petry
10 years ago
committed by
Morris Jobke
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with
2 additions and
2 deletions
-
lib/private/Encryption/DecryptAll.php
-
tests/lib/Encryption/DecryptAllTest.php
|
|
|
@ -211,7 +211,7 @@ class DecryptAll { |
|
|
|
$content = $this->rootView->getDirectoryContent($root); |
|
|
|
foreach ($content as $file) { |
|
|
|
// only decrypt files owned by the user
|
|
|
|
if($file->getStorage()->instanceOfStorage('OC\Files\Storage\Shared')) { |
|
|
|
if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
$path = $root . '/' . $file['name']; |
|
|
|
|
|
|
|
@ -260,7 +260,7 @@ class DecryptAllTest extends TestCase { |
|
|
|
->disableOriginalConstructor()->getMock(); |
|
|
|
|
|
|
|
$sharedStorage->expects($this->once())->method('instanceOfStorage') |
|
|
|
->with('OC\Files\Storage\Shared')->willReturn(true); |
|
|
|
->with('OCA\Files_Sharing\SharedStorage')->willReturn(true); |
|
|
|
|
|
|
|
$this->view->expects($this->at(0))->method('getDirectoryContent') |
|
|
|
->with('/user1/files')->willReturn( |
|
|
|
|
