diff options
| author | jknockaert <jasper@knockaert.nl> | 2015-02-19 16:08:33 +0100 |
|---|---|---|
| committer | jknockaert <jasper@knockaert.nl> | 2015-02-19 16:08:33 +0100 |
| commit | 417e40d218037cd6f930a8dbacfe951eb9499e82 (patch) | |
| tree | 394c9cb4e219a89729f05ea193e8d38a5fd8d0d6 /apps/files_encryption | |
| parent | d5ba6af25905797e0f38bccdb40cc012b3b7d3d6 (diff) | |
| parent | 470994ba1eb89edf461f93726d51047fcf9665b6 (diff) | |
| download | nextcloud-server-417e40d218037cd6f930a8dbacfe951eb9499e82.tar.gz nextcloud-server-417e40d218037cd6f930a8dbacfe951eb9499e82.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
apps/files_encryption/lib/stream.php
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/lib/stream.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index 644ac895a8f..0ec28e05e53 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -328,16 +328,24 @@ class Stream { } +<<<<<<< HEAD $util = new Util($this->rootView, $this->userId); // Fetch and decrypt keyfile // Fetch existing keyfile $this->encKeyfile = Keymanager::getFileKey($this->rootView, $util, $this->relPath); +======= + // $util = new Util($this->rootView, $this->userId); + + // Fetch and decrypt keyfile + // Fetch existing keyfile + $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->util, $this->relPath); +>>>>>>> origin/master // If a keyfile already exists if ($this->encKeyfile) { - $shareKey = Keymanager::getShareKey($this->rootView, $this->keyId, $util, $this->relPath); + $shareKey = Keymanager::getShareKey($this->rootView, $this->keyId, $this->util, $this->relPath); // if there is no valid private key return false if ($this->privateKey === false) { |