From fe3a6e67901b3aa565671fa10ac2adb511b8ccf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Tue, 8 Nov 2022 10:59:31 +0100 Subject: Give groupfolders priority when choosing icon for folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the server UI, a groupfolder that also has a link shows as a groupfolder. In the app, it shows as a link. This fixes that. Signed-off-by: Álvaro Brey --- app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java b/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java index cd44c80b3b..de0490a23f 100644 --- a/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java +++ b/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java @@ -142,7 +142,9 @@ public final class MimeTypeUtil { ViewThemeUtils viewThemeUtils) { int drawableId; - if (isSharedViaLink) { + if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder) { + drawableId = R.drawable.folder_group; + } else if (isSharedViaLink) { drawableId = R.drawable.folder_shared_link; } else if (isSharedViaUsers) { drawableId = R.drawable.folder_shared_users; @@ -150,8 +152,6 @@ public final class MimeTypeUtil { drawableId = R.drawable.folder_encrypted; } else if (WebdavEntry.MountType.EXTERNAL == mountType) { drawableId = R.drawable.folder_external; - } else if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder) { - drawableId = R.drawable.folder_group; } else { drawableId = R.drawable.folder; } -- cgit v1.2.3