wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again

Browse source
This commit is contained in:
Bjoern Schiessle 2013-08-18 11:21:01 +02:00
parent cabe92ef12
commit 1be11bb03d
1 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files_encryption/lib/util.php
View file

@ -708,6 +708,9 @@ class Util {
// Encrypt unencrypted files
foreach ($found['encrypted'] as $encryptedFile) {
//get file info
$fileInfo = \OC\Files\Filesystem::getFileInfo($encryptedFile['path']);
//relative to data/<user>/file
$relPath = Helper::stripUserFilesPath($encryptedFile['path']);
@ -765,7 +768,8 @@ class Util {
\OC\Files\Filesystem::putFileInfo($relPath, array(
'encrypted' => false,
'size' => $size,
'unencrypted_size' => $size
'unencrypted_size' => $size,
'etag' => $fileInfo['etag']
));
$decryptedFiles[] = $relPath;
@ -816,6 +820,9 @@ class Util {
// Encrypt unencrypted files
foreach ($found['plain'] as $plainFile) {
//get file info
$fileInfo = \OC\Files\Filesystem::getFileInfo($plainFile['path']);
//relative to data/<user>/file
$relPath = $plainFile['path'];
@ -851,7 +858,8 @@ class Util {
\OC\Files\Filesystem::putFileInfo($relPath, array(
'encrypted' => true,
'size' => $size,
'unencrypted_size' => $size
'unencrypted_size' => $size,
'etag' => $fileInfo['etag']
));
$encryptedFiles[] = $relPath;