Merge pull request #36 from owncloud/exif-rotate-with-encryption

Rotate thumbnail when encryption is enabled

lib/thumbnail.php

@@ -58,15 +58,22 @@ public function __construct($imagePath, $user = null, $square = false) {
 	private function create($imagePath, $square) {
 		$galleryDir = \OC_User::getHome($this->user) . '/gallery/' . $this->user . '/';
 		$dir = dirname($imagePath);
-		if (!$this->view->file_exists($imagePath)) {
-			return;
+		$fileInfo = $this->view->getFileInfo($imagePath);
+		if(!$fileInfo) {
+			return false;
 		}
 		if (!is_dir($galleryDir . $dir)) {
 			mkdir($galleryDir . $dir, 0755, true);
 		}
-		$local = $this->view->getLocalFile($imagePath);
+
 		$this->image = new \OCP\Image();
-		$this->image->loadFromFile($local);
+		// check if file is encrypted
+		if($fileInfo['encrypted'] === true) {
+			$fileName = $this->view->toTmpFile($imagePath);
+		} else {
+			$fileName = $this->view->getLocalFile($imagePath);
+		}
+		$this->image->loadFromFile($fileName);
 		if ($this->image->valid()) {
 			$this->image->fixOrientation();
 			if ($square) {