From bd0b4c52ecbf42e9f410447ea4355e4c9647d5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 3 Sep 2019 10:07:27 +0200
Subject: [PATCH] Fallback to directory icon based on the mount type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 apps/files/js/mainfileinfodetailview.js |   3 +++
 core/js/dist/share_backend.js           | Bin 117263 -> 117332 bytes
 core/js/dist/share_backend.js.map       | Bin 377127 -> 377339 bytes
 core/js/share.js                        |   9 +++++----
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 4a2067e09e..f73b6a5556 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -186,6 +186,9 @@
 					this._previewManager.loadPreview(this.model, $iconDiv, $container);
 				} else {
 					var iconUrl = this.model.get('icon') || OC.MimeType.getIconUrl('dir');
+					if (typeof this.model.get('mountType') !== 'undefined') {
+						iconUrl = OC.MimeType.getIconUrl('dir-' + this.model.get('mountType'))
+					}
 					$iconDiv.css('background-image', 'url("' + iconUrl + '")');
 				}
 				this.$el.find('[title]').tooltip({placement: 'bottom'});
diff --git a/core/js/dist/share_backend.js b/core/js/dist/share_backend.js
index 284d853a85b1e2687ff921475ba19db46f102a0c..6daa88be0f0a99869b24d3eba19c233f79f92c86 100644
GIT binary patch
delta 160
zcmeC5!hU56d&3q+^#f9=dWj_^MH)&ei6x1;x%s7eB_)*wsY;qUxzp7SFuLoM<!7cS
z7%1A>7O1Hy6=x(CrKac><>!|up$LI__R|XwGRm+kX%}c(<v}>pyALqV=1?jrDos_g
swVkdFl%Jk^kkOd~Xqtg7(9rEW4l+(=V$7ZHbA-`}F?W0a5yl2q03B~N-T(jq

delta 141
zcmcaIg}r|Yd&3q+^#jwL4lueg<=IdFbAVB1`sV|Tv)#)QixhHgQ}q%{N{Td;QW8rN
zbyJN}Q}dFGDho<dQ<OAy(okh{^GoweN-7Idl{BrDN{UKTm27QobEgX)VpN=d`5>bb
iN1B?N0Z=Gy``?3%lbIL`rcXS==)_pC{mK!>237#bO*9Mu

diff --git a/core/js/dist/share_backend.js.map b/core/js/dist/share_backend.js.map
index ca1c08f93930e96ae16535b83d3be7b27576151b..262dd91cfca035bf3c40fba2ea98414d513960ec 100644
GIT binary patch
delta 1024
zcmZ`&&rcIU6wcJHsfi#a2zt<zs;#Djv?$fa5HmB~)&=>|Kq-)FvZ0lhZfUzLrR_ly
zNfY(t#Z2NqU_3~B(H@NPWHj;b;Nr!^14vrHH%ld`c$#^?zW3hu&AfWt-B|0cz4P>B
zvdfFcWGR<$V8=)*lW1M%6NWOEU5x13+J>jT;X!Xc*%X~JER%8mauYqfz!s=43MQG!
zQE@2cDLhQbFiuk<>)g48Mpws3V1;6Zka!4(2<c~do`OMy;bS;z-etma0j)%ZGn9dI
zf{+O_7{z074MKnwnI?L(a1sEINSq^bf#&`KX=|ZC(8~;dXB+kNZ(HaFQ%0f5-Jm=9
z=j2P2C|>F@w@TB#;*p(Fl&~_OJ^zW$1<bYFOsuFeB4~(&aF~!VRz=pR@cb7ExcH59
zhFi8#=hc6<m!Z@CjIcJ)6~(Yik{0W*i`UYg(kV0|s!5rjKWd<hr&4J#HcJM@P>R88
z4K&@J2B(n9^p$y66JgtmX8Kg#(L|m6K@&M_zPR9cyuhC{krVlNwTaHIE)EH&MzcdW
z1L|dIl7Y}6gZj++=*<A00cdSjv@Mu&D;WVqBBGK+_5Jw-OQ7P4Dx6_0Xbvr&0=%Sj
z&~!2!fvUcijJM*#<iQ=}IKLb)0sSfQJml&8!lA{l^U4nDJCOms1oaF2!wwp@&6^rb
z<#@*~Dxy4px{JK1z~AqpA(ZCF_t3p71Cyd4LSQguHkl9|<S-r~WF!w*;xuP8czF-G
zZ24*N@Kl|@-b30Yk1VWGKrlMM{E#oIO*PzL2=0q7{FWYzyHtr;DzRggnDuQ;lGgd>
zn$*khuS;Lr4ET20hxYw1$iL4@-2(^T(cUvSXm>3oRXq{!)w5Z{Wp_GTsZe$}?Bcj8
o-9G8EyAR@A{c7#vm#fkwZ~U;H=KiX5t^TnpSy6qnCV4x40es~|X#fBK

delta 894
zcmaJ<&rcIU6wa&Nq#i^MMB+gc(Wr#cwjcq$y_qgcDIg7$7EW%UwzS)p{;=(CVo0o9
zj5lM(s|Vvnv6^V()u{34jl`qzZx9Kkb>3n~FvQbjzIpF^-}}DVZS=jk-`9K}c>FPN
z=5$%lFPH4KN^+&2_2&wA^ObpfE!o%#w6+59>a))%alv$)k&k}CLyw-3*SBFNq+`hN
zbA^j!y2hD-Xk=~9<`CxuizCL_G8$E$SJ;tndQg;P&u_T1E`pqe5yQm{(cyB%J;Kfc
ziy%f=k)x>cRD#|XtB2pR9E~ZOndXCWHAhTLQCXJz>qm}VRa}lJ9U_@!i-=|*t~7|H
zX%agqNRK6uxMG4u5u?nc&e{L6r}o)p?+y$M{A0!~)DH$LOa2<9r@2EW47Hx_Ko@$l
zN}8$ExHkIb^If=bGMlAUM0(scsVcX2A>qp@ko=IvHuTC!8_xCEmJ69~*|4m&A>bQZ
zQB`8LE?>9d()yUHsBuJ_PY~?zFjIyox7H@<Zt>zI%PFA1GeUW9RQQ-n8NU%Cj~1;Z
z5~3oYv<gIxG3vy4WnVG*CM;o_1V;1Y?ixr<8J-(I;i7`YR9o7S<{n%-TMM}?{#E)p
zdZMhpz`_0_^5q`*j~7&wlz=6F?m@)2>PE3plA|4{Ls>RE5QMt?(Sb?G$*WzMx-vRX
z4KY+|!b|BSP0*uk8gaU;xaf3+RpqlTT=ta{l(|`v-@0I39Mb7#hiJzULEnhFT~R5O
z8*T19x$QacNjV!0&qm|eM#KBAp=q1)!>0C04mY)VdGEW|=S^DWq+EZi-E4hnYF>~J
NHnm{u>l<zO)F0BV9QXhL

diff --git a/core/js/share.js b/core/js/share.js
index cef05eb647..26b420ab47 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -269,22 +269,23 @@ OC.Share = _.extend(OC.Share || {}, {
 		var message, recipients, avatars;
 		var ownerId = $tr.attr('data-share-owner-id');
 		var owner = $tr.attr('data-share-owner');
+		var mountType = $tr.attr('data-mounttype');
 		var shareFolderIcon;
 		var iconClass = 'icon-shared';
 		action.removeClass('shared-style');
 		// update folder icon
 		if (type === 'dir' && (hasShares || hasLink || ownerId)) {
-			if (hasLink) {
+			if (typeof mountType !== 'undefined' && mountType !== 'shared-root' && mountType !== 'shared') {
+				shareFolderIcon = OC.MimeType.getIconUrl('dir-' + mountType);
+			} else if (hasLink) {
 				shareFolderIcon = OC.MimeType.getIconUrl('dir-public');
-			}
-			else {
+			} else {
 				shareFolderIcon = OC.MimeType.getIconUrl('dir-shared');
 			}
 			$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 (isEncrypted === 'true') {