7 files changed, 46 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 217a2f14896..0add41d6419 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1156,7 +1156,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/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index e3b5eba3ecb..83926b24fee 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1455,6 +1455,32 @@ describe('OCA.Files.FileList tests', function() {
 			expect(OC.TestUtil.getImageUrl($td.find('.thumbnail'))).toEqual(OC.webroot + '/core/img/filetypes/folder.svg');
 			expect(previewLoadStub.notCalled).toEqual(true);
 		});
+		it('render encrypted folder icon for encrypted root', function() {
+			var fileData = {
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				name: 'test dir',
+				isEncrypted: true
+			};
+			var $tr = fileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(OC.TestUtil.getImageUrl($td.find('.thumbnail'))).toEqual(OC.webroot + '/core/img/filetypes/folder-encrypted.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+		});
+		it('render encrypted folder icon for encrypted subdir', function() {
+			var fileData = {
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				name: 'test dir',
+				isEncrypted: true
+			};
+			var $tr = fileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(OC.TestUtil.getImageUrl($td.find('.thumbnail'))).toEqual(OC.webroot + '/core/img/filetypes/folder-encrypted.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+			// default icon override
+			expect($tr.attr('data-icon')).toEqual(OC.webroot + '/core/img/filetypes/folder-encrypted.svg');
+		});
 		it('render external storage icon for external storage root', function() {
 			var fileData = {
 				type: 'dir',
diff --git a/core/img/filetypes/folder-encrypted.svg b/core/img/filetypes/folder-encrypted.svg
new file mode 100644
index 00000000000..e2b62a99b05
--- /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 ed4fedc7f8a..e5a07abc951 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 ea513131d88..13db16c5a21 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -104,6 +104,7 @@ OC.MimeTypeList={
     "file",
     "folder",
     "folder-drag-accept",
+    "folder-encrypted",
     "folder-external",
     "folder-public",
     "folder-shared",
diff --git a/core/js/share.js b/core/js/share.js
index 25d59b46fb4..be90c626959 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -276,10 +276,14 @@ OC.Share = _.extend(OC.Share || {}, {
 			$tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
 			$tr.attr('data-icon', shareFolderIcon);
 		} else if (type === 'dir') {
+			var isEncrypted = $tr.attr('data-e2eencrypted');
 			var mountType = $tr.attr('data-mounttype');
 			// FIXME: duplicate of FileList._createRow logic for external folder,
 			// need to refactor the icon logic into a single code path eventually
-			if (mountType && mountType.indexOf('external') === 0) {
+			if (isEncrypted === 'true') {
+				shareFolderIcon = OC.MimeType.getIconUrl('dir-encrypted');
+				$tr.attr('data-icon', shareFolderIcon);
+			} else if (mountType && mountType.indexOf('external') === 0) {
 				shareFolderIcon = OC.MimeType.getIconUrl('dir-external');
 				$tr.attr('data-icon', shareFolderIcon);
 			} else {
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 70c698c99a2..127582ace61 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -149,6 +149,13 @@ describe('OC.Share tests', function() {
 
 				checkIcon('filetypes/folder-external');
 			});
+			it('shows encrypted icon if encrypted folder', function() {
+				$file.attr('data-type', 'dir');
+				$file.attr('data-e2eencrypted', true);
+				OC.Share.markFileAsShared($file, false, false);
+
+				checkIcon('filetypes/folder-encrypted');
+			});
 		});
 
 		describe('displaying the recipients', function() {