From 71f2b6cac06bfbf234cca461a585c5dccb1979e1 Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Fri, 16 Feb 2024 14:42:18 +0100 Subject: [PATCH] We cannot be in the root folder anymore therefore remove multiselect check --- .../infomaniak/drive/data/models/drive/Drive.kt | 14 -------------- .../drive/ui/fileList/FileListFragment.kt | 6 +----- .../com/infomaniak/drive/utils/FileItemUtils.kt | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt b/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt index da61953148..a0d0728303 100644 --- a/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt +++ b/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt @@ -18,9 +18,6 @@ package com.infomaniak.drive.data.models.drive import com.google.gson.annotations.SerializedName -import com.infomaniak.drive.data.models.File -import com.infomaniak.drive.data.models.Rights -import com.infomaniak.drive.utils.Utils import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey @@ -96,17 +93,6 @@ open class Drive( inline val isTechnicalMaintenance get() = maintenanceReason == MaintenanceReason.TECHNICAL.value - fun convertToFile(rootName: String? = null): File { - return File( - id = if (rootName == null) id else Utils.ROOT_ID, - driveId = id, - name = rootName ?: name, - type = File.Type.DRIVE.value, - lastModifiedAt = createdAt, - rights = Rights(canCreateFile = true) - ).apply { driveColor = preferences.color } - } - fun isUserAdmin(): Boolean = role == "admin" fun getUpdatedAt(): Date = Date(updatedAt * 1000) diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt index 61b99a259d..46c83b88e0 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt @@ -760,11 +760,7 @@ open class FileListFragment : MultiSelectFragment(MATOMO_CATEGORY), SwipeRefresh realm = mainViewModel.realm ).apply { fileAdapter.updateFileList(this) } - multiSelectManager.currentFolder = if (result.parentFolder?.id == ROOT_ID) { - AccountUtils.getCurrentDrive()?.convertToFile(Utils.getRootName(requireContext())) - } else { - result.parentFolder - } + multiSelectManager.currentFolder = result.parentFolder mainViewModel.setCurrentFolder(multiSelectManager.currentFolder) changeNoFilesLayoutVisibility( diff --git a/app/src/main/java/com/infomaniak/drive/utils/FileItemUtils.kt b/app/src/main/java/com/infomaniak/drive/utils/FileItemUtils.kt index 8084145bc6..bca8b38f19 100644 --- a/app/src/main/java/com/infomaniak/drive/utils/FileItemUtils.kt +++ b/app/src/main/java/com/infomaniak/drive/utils/FileItemUtils.kt @@ -51,7 +51,6 @@ import com.infomaniak.drive.databinding.CardviewFolderGridBinding import com.infomaniak.drive.databinding.ItemCategoriesLayoutBinding import com.infomaniak.drive.databinding.ItemFileBinding import com.infomaniak.drive.ui.fileList.FileListFragment.Companion.MAX_DISPLAYED_CATEGORIES -import com.infomaniak.drive.utils.Utils.ROOT_ID import com.infomaniak.drive.views.CategoryIconView import com.infomaniak.drive.views.ProgressLayoutView import com.infomaniak.lib.core.utils.context @@ -92,7 +91,6 @@ fun CardviewFileGridBinding.setFileItem(file: File, isGrid: Boolean = false) { private fun ItemFileBinding.displayDate(file: File) = fileDate.apply { - isVisible = file.id != ROOT_ID text = if (file.deletedAt.isPositive()) { file.getDeletedAt().format(context.getString(R.string.allDeletedFilePattern)) } else {