show e2e folder icon on encrypted folders

Signed-off-by: Bjoern Schiessle <[email protected]>
nextcloud · Sep 26, 2017 · 095240c · 095240c
1 parent 8d13ea9
commit 095240c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git 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
diff --git 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
@@ -108,6 +108,7 @@ OC.MimeTypeList={
     "folder-public",
     "folder-shared",
     "folder-starred",
+    "folder-encrypted",
     "image",
     "link",
     "location",