make sure that we keep the correct timestamp and etag after encryoption/decryption

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 5e855abd9732e4076096c029285971d03ff9d48b..5800d3ed108ab819efd31da44b1e9262b6a62747 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -717,17 +717,17 @@ 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']);
 
+                               //get file info
+                               $fileInfo = \OC\Files\Filesystem::getFileInfo($relPath);
+
                                //relative to /data
                                $rawPath = $encryptedFile['path'];
 
                                //get timestamp
-                               $timestamp = $this->view->filemtime($rawPath);
+                               $timestamp = $fileInfo['mtime'];
 
                                //enable proxy to use OC\Files\View to access the original file
                                \OC_FileProxy::$enabled = true;
@@ -768,10 +768,10 @@ class Util {
 
                                $this->view->rename($relPath . '.part', $relPath);
 
-                               $this->view->chroot($fakeRoot);
-
                                //set timestamp
-                               $this->view->touch($rawPath, $timestamp);
+                               $this->view->touch($relPath, $timestamp);
+
+                               $this->view->chroot($fakeRoot);
 
                                // Add the file to the cache
                                \OC\Files\Filesystem::putFileInfo($relPath, array(
@@ -839,7 +839,7 @@ class Util {
                                $rawPath = '/' . $this->userId . '/files/' . $plainFile['path'];
 
                                // keep timestamp
-                               $timestamp = $this->view->filemtime($rawPath);
+                               $timestamp = $fileInfo['mtime'];
 
                                // Open plain file handle for binary reading
                                $plainHandle = $this->view->fopen($rawPath, 'rb');
@@ -858,10 +858,10 @@ class Util {
 
                                $this->view->rename($relPath . '.part', $relPath);
 
-                               $this->view->chroot($fakeRoot);
-
                                // set timestamp
-                               $this->view->touch($rawPath, $timestamp);
+                               $this->view->touch($relPath, $timestamp);
+
+                               $this->view->chroot($fakeRoot);
 
                                // Add the file to the cache
                                \OC\Files\Filesystem::putFileInfo($relPath, array(