From 095240ca8e884b9d106e9a61d78d4f7534ae8286 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Tue, 19 Sep 2017 17:24:53 +0200
Subject: [PATCH] show e2e folder icon on encrypted folders

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 apps/files/js/filelist.js               | 5 ++++-
 core/img/filetypes/folder-encrypted.svg | 1 +
 core/js/mimetype.js                     | 2 ++
 core/js/mimetypelist.js                 | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 core/img/filetypes/folder-encrypted.svg

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d4f10a52e40ab..4672f5d5cd928 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1145,7 +1145,10 @@
 			if (type === 'dir') {
 				mime = mime || 'httpd/unix-directory';
 
-				if (fileData.mountType && fileData.mountType.indexOf('external') === 0) {
+				if (fileData.isEncrypted) {
+					icon = OC.MimeType.getIconUrl('dir-encrypted');
+					dataIcon = icon;
+				} else if (fileData.mountType && fileData.mountType.indexOf('external') === 0) {
 					icon = OC.MimeType.getIconUrl('dir-external');
 					dataIcon = icon;
 				}
diff --git a/core/img/filetypes/folder-encrypted.svg b/core/img/filetypes/folder-encrypted.svg
new file mode 100644
index 0000000000000..e2b62a99b053f
--- /dev/null
+++ b/core/img/filetypes/folder-encrypted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path fill-rule="evenodd" fill="#0082c9" d="m1.4609 2c-0.25 0-0.4609 0.2109-0.4609 0.4609v11.078c0 0.258 0.2029 0.461 0.4609 0.461h13.078c0.258 0 0.461-0.203 0.461-0.461v-9.0761c0-0.25-0.211-0.4649-0.461-0.4649h-6.539l-2-1.998h-4.5391zm6.5391 3.8008c0.8836 0 1.5996 0.7159 1.5996 1.5996v0.7988h0.4004v2.8008h-4v-2.8008h0.4004v-0.7988c0-0.8837 0.716-1.5996 1.5996-1.5996zm0 0.7988c-0.4419 0-0.8008 0.3589-0.8008 0.8008v0.7988h1.6016v-0.7988c0-0.4419-0.3589-0.8008-0.8008-0.8008z"/></svg>
diff --git a/core/js/mimetype.js b/core/js/mimetype.js
index ed4fedc7f8a72..e5a07abc9513b 100644
--- a/core/js/mimetype.js
+++ b/core/js/mimetype.js
@@ -44,6 +44,8 @@ OC.MimeType = {
 		// Generate path
 		if (mimeType === 'dir' && $.inArray('folder', files) !== -1) {
 			return 'folder';
+		} else if (mimeType === 'dir-encrypted' && $.inArray('folder-encrypted', files) !== -1) {
+			return 'folder-encrypted';
 		} else if (mimeType === 'dir-shared' && $.inArray('folder-shared', files) !== -1) {
 			return 'folder-shared';
 		} else if (mimeType === 'dir-public' && $.inArray('folder-public', files) !== -1) {
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index ea513131d8859..da1c031663e10 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -108,6 +108,7 @@ OC.MimeTypeList={
     "folder-public",
     "folder-shared",
     "folder-starred",
+    "folder-encrypted",
     "image",
     "link",
     "location",