Merge pull request #78 from pranavk/enc

Guard encryption support
nextcloud · May 25, 2017 · 35e2464 · 35e2464
2 parents 377eeae + c14ff8f
commit 35e2464
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -116,12 +116,16 @@ public function index($fileId) {
 				'instanceId' => $this->settings->getSystemValue('instanceid'),
 			];
 
-			// Update the current file to be accessible with system public shared key
-			$owner = $item->getOwner()->getUID();
-			$absPath = '/' . $owner . '/' .  $item->getInternalPath();
-			$accessList = \OC::$server->getEncryptionFilesHelper()->getAccessList($absPath);
-			$accessList['public'] = true;
-			\OC::$server->getEncryptionManager()->getEncryptionModule()->update($absPath, $owner, $accessList);
+			$encryptionManager = \OC::$server->getEncryptionManager();
+			if ($encryptionManager->isEnabled())
+			{
+				// Update the current file to be accessible with system public shared key
+				$owner = $item->getOwner()->getUID();
+				$absPath = '/' . $owner . '/' .  $item->getInternalPath();
+				$accessList = \OC::$server->getEncryptionFilesHelper()->getAccessList($absPath);
+				$accessList['public'] = true;
+				$encryptionManager->getEncryptionModule()->update($absPath, $owner, $accessList);
+			}
 
 			$response = new TemplateResponse('richdocuments', 'documents', $params, 'empty');
 			$policy = new ContentSecurityPolicy();