Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÁlvaro Brey <alvaro.brey@nextcloud.com>2022-11-08 12:59:31 +0300
committerÁlvaro Brey <alvaro.brey@nextcloud.com>2022-11-08 12:59:31 +0300
commitfe3a6e67901b3aa565671fa10ac2adb511b8ccf0 (patch)
tree79aa7298688f7bf234a93375a6aed2f49ede47a9
parentae802cd27da48aadeca6c89a3626813928898b77 (diff)
Give groupfolders priority when choosing icon for folder
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 <alvaro.brey@nextcloud.com>
-rw-r--r--app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java6
1 files 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;
}