From 98fb31d90f4ac4ea7757725df2ccf10568834673 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 9 Dec 2025 16:38:13 +0100 Subject: [PATCH 1/7] fix: favorite sub file visibility Signed-off-by: alperozturk --- .../android/ui/adapter/helper/OCFileListAdapterHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index 9d1fd774e87f..c4b301a189c4 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -94,7 +94,7 @@ class OCFileListAdapterHelper { continue } - if (isFavoritesView && !file.isFavorite) { + if (isFavoritesView && !file.isFavorite && !directory.isFavorite) { continue } From 0b421947fe12e33b2c482940c3d40dc1cf5728ea Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 9 Dec 2025 16:42:11 +0100 Subject: [PATCH 2/7] fix: shared sub file visibility Signed-off-by: alperozturk --- .../datamodel/FileDataStorageManager.java | 24 ------------------- .../adapter/helper/OCFileListAdapterHelper.kt | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index f63196e8fcfa..01508657858e 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -43,7 +43,6 @@ import com.nextcloud.client.database.entity.OfflineOperationEntity; import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepository; import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepositoryType; -import com.nextcloud.model.OCFileFilterType; import com.nextcloud.model.OfflineOperationRawType; import com.nextcloud.model.OfflineOperationType; import com.nextcloud.model.ShareeEntry; @@ -2755,29 +2754,6 @@ public boolean isPartOfInternalTwoWaySync(OCFile file) { return false; } - public List filter(OCFile file, OCFileFilterType filterType) { - if (!file.isRootDirectory()) { - return getFolderContent(file,false); - } - - final List result = new ArrayList<>(); - final List allFiles = getAllFiles(); - for (OCFile ocFile: allFiles) { - boolean condition = false; - if (filterType == OCFileFilterType.Shared) { - condition = ocFile.isShared(); - } else if (filterType == OCFileFilterType.Favorite) { - condition = ocFile.isFavorite(); - } - - if (condition) { - result.add(ocFile); - } - } - - return result; - } - @Nullable public FileEntity getFileEntity(OCFile file) { if (file == null) { diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index c4b301a189c4..97b1d649cb7d 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -90,7 +90,7 @@ class OCFileListAdapterHelper { } } - if (isSharedView && !file.isShared) { + if (isSharedView && !file.isShared && !directory.isShared) { continue } From 7605a32b4e265490797b37875de384323cb1222e Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 10 Dec 2025 08:15:08 +0100 Subject: [PATCH 3/7] add tests Signed-off-by: alperozturk --- .../adapter/helper/OCFileListAdapterHelper.kt | 4 +- .../ui/adapter/OCFileListAdapterHelperTest.kt | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index 97b1d649cb7d..06956fa0655b 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -90,11 +90,11 @@ class OCFileListAdapterHelper { } } - if (isSharedView && !file.isShared && !directory.isShared) { + if (isSharedView && !directory.isShared && !file.isShared) { continue } - if (isFavoritesView && !file.isFavorite && !directory.isFavorite) { + if (isFavoritesView && !directory.isFavorite && !file.isFavorite) { continue } diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt index 65db28cfe60a..fc4d5900a367 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt @@ -130,6 +130,64 @@ class OCFileListAdapterHelperTest { assertEquals(FileSortOrder.SORT_Z_TO_A, sort) } + @Test + fun `prepareFileList favorites tab`() = runBlocking { + val env = Sut() + val root = env.root + + val sub1 = env.directory("/subDir", 1).apply { + isFavorite = true + } + val file1 = env.file(sub1, "image.jpg", 11, MimeType.JPEG) + val file2 = env.file(sub1, "image2.jpg", 12, MimeType.JPEG) + val file3 = env.file(sub1, "image3.jpg", 13, MimeType.JPEG) + val file4 = env.file(sub1, "vid4.mp4", 14, MimeType.MP4) + val file5 = env.file(sub1, "image5.jpg", 15, MimeType.JPEG) + + val sub2 = env.directory("/subDir2", 2).apply { + isFavorite = true + } + val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) + + env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) + stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) + val (list, sort) = env.run(sub1) + assertEquals( + listOf("image.jpg", "image2.jpg", "image3.jpg", "image5.jpg", "vid4.mp4"), + list.map { it.fileName } + ) + assertEquals(FileSortOrder.SORT_A_TO_Z, sort) + } + + @Test + fun `prepareFileList share tab`() = runBlocking { + val env = Sut() + val root = env.root + + val sub1 = env.directory("/subDir", 1).apply { + isSharedViaLink = true + } + val file1 = env.file(sub1, "image.jpg", 11, MimeType.JPEG) + val file2 = env.file(sub1, "image2.jpg", 12, MimeType.JPEG) + val file3 = env.file(sub1, "image3.jpg", 13, MimeType.JPEG) + val file4 = env.file(sub1, "vid4.mp4", 14, MimeType.MP4) + val file5 = env.file(sub1, "image5.jpg", 15, MimeType.JPEG) + + val sub2 = env.directory("/subDir2", 2).apply { + isFavorite = true + } + val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) + + env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) + stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) + val (list, sort) = env.run(sub1) + assertEquals( + listOf("image.jpg", "image2.jpg", "image3.jpg", "image5.jpg", "vid4.mp4"), + list.map { it.fileName } + ) + assertEquals(FileSortOrder.SORT_A_TO_Z, sort) + } + @Test fun `prepareFileList with multiple folders and favorites first`() = runBlocking { val env = Sut() From 983635ca7bf115b787cfb2690a66dac65c1373d0 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 10 Dec 2025 08:47:22 +0100 Subject: [PATCH 4/7] remove unused source Signed-off-by: alperozturk --- .../java/com/nextcloud/model/OCFileFilterType.kt | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/model/OCFileFilterType.kt diff --git a/app/src/main/java/com/nextcloud/model/OCFileFilterType.kt b/app/src/main/java/com/nextcloud/model/OCFileFilterType.kt deleted file mode 100644 index 81451c242346..000000000000 --- a/app/src/main/java/com/nextcloud/model/OCFileFilterType.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2024 Alper Ozturk - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package com.nextcloud.model - -enum class OCFileFilterType { - Shared, - Favorite -} From 41fc24393883f46662334aa49cd838b111e7d3c5 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 10 Dec 2025 09:18:59 +0100 Subject: [PATCH 5/7] check nested files Signed-off-by: alperozturk --- .../nextcloud/client/database/dao/FileDao.kt | 18 +++++++++++++ .../OCFileListAdapterDataProviderImpl.kt | 27 +++++++++++++++++++ .../helper/OCFileListAdapterDataProvider.kt | 2 ++ .../adapter/helper/OCFileListAdapterHelper.kt | 6 +++-- .../MockOCFileListAdapterDataProvider.kt | 6 +++++ .../ui/adapter/OCFileListAdapterHelperTest.kt | 7 +++++ 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt index 06a94aaafdff..3779819f95c0 100644 --- a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt +++ b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt @@ -146,4 +146,22 @@ interface FileDao { @Query("SELECT remote_id FROM filelist WHERE file_owner = :accountName AND remote_id IS NOT NULL") fun getAllRemoteIds(accountName: String): List + + @Query("SELECT parent FROM filelist WHERE _id = :fileId LIMIT 1") + suspend fun getParentId(fileId: Long): Long? + + @Query("SELECT favorite FROM filelist WHERE _id = :fileId LIMIT 1") + suspend fun isFavoriteFolder(fileId: Long): Int? + + @Query( + """ + SELECT + (share_by_link = 1) OR + (shared_via_users = 1) OR + (permissions LIKE '%S%') + FROM filelist + WHERE _id = :fileId LIMIT 1 + """ + ) + suspend fun isSharedFolder(fileId: Long): Boolean? } diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt index 66622510612f..dfc39ee2457d 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt +++ b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt @@ -10,6 +10,7 @@ package com.owncloud.android.datamodel import com.nextcloud.client.database.entity.FileEntity import com.owncloud.android.ui.adapter.helper.OCFileListAdapterDataProvider +@Suppress("ReturnCount") class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStorageManager) : OCFileListAdapterDataProvider { override fun convertToOCFiles(id: Long): List = @@ -19,4 +20,30 @@ class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStor storageManager.fileDao.getFolderContentSuspended(id) override fun createFileInstance(entity: FileEntity): OCFile = storageManager.createFileInstance(entity) + + override suspend fun hasFavoriteParent(fileId: Long): Boolean { + var currentId: Long? = fileId + + while (currentId != null) { + val parentId = storageManager.fileDao.getParentId(currentId) ?: return false + val isFavorite = storageManager.fileDao.isFavoriteFolder(parentId) == 1 + if (isFavorite) return true + currentId = parentId + } + + return false + } + + override suspend fun hasSharedParent(fileId: Long): Boolean { + var currentId: Long? = fileId + + while (currentId != null) { + val parentId = storageManager.fileDao.getParentId(currentId) ?: return false + val isShared = storageManager.fileDao.isSharedFolder(parentId) == true + if (isShared) return true + currentId = parentId + } + + return false + } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt index 191b7ce666e3..0dd7387e706e 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt @@ -14,4 +14,6 @@ interface OCFileListAdapterDataProvider { fun convertToOCFiles(id: Long): List suspend fun getFolderContent(id: Long): List fun createFileInstance(entity: FileEntity): OCFile + suspend fun hasFavoriteParent(fileId: Long): Boolean + suspend fun hasSharedParent(fileId: Long): Boolean } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index 06956fa0655b..b3b6c2a68a18 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -90,11 +90,13 @@ class OCFileListAdapterHelper { } } - if (isSharedView && !directory.isShared && !file.isShared) { + val hasSharedParent = dataProvider.hasSharedParent(file.fileId) + if (isSharedView && !hasSharedParent && !file.isShared) { continue } - if (isFavoritesView && !directory.isFavorite && !file.isFavorite) { + val hasFavoriteParent = dataProvider.hasFavoriteParent(file.fileId) + if (isFavoritesView && !hasFavoriteParent && !file.isFavorite) { continue } diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt b/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt index c2b71334a569..baeca7f3f8e5 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt @@ -17,6 +17,8 @@ class MockOCFileListAdapterDataProvider : OCFileListAdapterDataProvider { private var offlineOCFile: OCFile? = null private var files = listOf() + var hasFavoriteParent = false + var hasSharedParent = false private fun getEntities(): List = files.map { file -> FileEntity( @@ -94,4 +96,8 @@ class MockOCFileListAdapterDataProvider : OCFileListAdapterDataProvider { } override fun createFileInstance(entity: FileEntity): OCFile = files.first { it.fileId == entity.id } + + override suspend fun hasFavoriteParent(fileId: Long): Boolean = hasFavoriteParent + + override suspend fun hasSharedParent(fileId: Long): Boolean = hasSharedParent } diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt index fc4d5900a367..d318fcffdd76 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt @@ -79,6 +79,7 @@ class OCFileListAdapterHelperTest { this.localId = localId etag = "etag_$id" storagePath = localPath + sharees = emptyList() } fun prepare(files: List, offline: OCFile? = null) { @@ -149,6 +150,9 @@ class OCFileListAdapterHelperTest { } val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) + dataProvider.hasFavoriteParent = true + dataProvider.hasSharedParent = false + env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) val (list, sort) = env.run(sub1) @@ -178,6 +182,9 @@ class OCFileListAdapterHelperTest { } val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) + dataProvider.hasFavoriteParent = false + dataProvider.hasSharedParent = true + env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) val (list, sort) = env.run(sub1) From d5359f4f1b0e1a29999b5384bdae1b777c724bf3 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 10 Dec 2025 10:38:16 +0100 Subject: [PATCH 6/7] remove filters Signed-off-by: alperozturk --- .../nextcloud/client/database/dao/FileDao.kt | 18 ------------- .../OCFileListAdapterDataProviderImpl.kt | 26 ------------------- .../helper/OCFileListAdapterDataProvider.kt | 2 -- .../adapter/helper/OCFileListAdapterHelper.kt | 10 ------- .../MockOCFileListAdapterDataProvider.kt | 6 ----- .../ui/adapter/OCFileListAdapterHelperTest.kt | 6 ----- 6 files changed, 68 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt index 3779819f95c0..06a94aaafdff 100644 --- a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt +++ b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt @@ -146,22 +146,4 @@ interface FileDao { @Query("SELECT remote_id FROM filelist WHERE file_owner = :accountName AND remote_id IS NOT NULL") fun getAllRemoteIds(accountName: String): List - - @Query("SELECT parent FROM filelist WHERE _id = :fileId LIMIT 1") - suspend fun getParentId(fileId: Long): Long? - - @Query("SELECT favorite FROM filelist WHERE _id = :fileId LIMIT 1") - suspend fun isFavoriteFolder(fileId: Long): Int? - - @Query( - """ - SELECT - (share_by_link = 1) OR - (shared_via_users = 1) OR - (permissions LIKE '%S%') - FROM filelist - WHERE _id = :fileId LIMIT 1 - """ - ) - suspend fun isSharedFolder(fileId: Long): Boolean? } diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt index dfc39ee2457d..3f09d4d6e276 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt +++ b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt @@ -20,30 +20,4 @@ class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStor storageManager.fileDao.getFolderContentSuspended(id) override fun createFileInstance(entity: FileEntity): OCFile = storageManager.createFileInstance(entity) - - override suspend fun hasFavoriteParent(fileId: Long): Boolean { - var currentId: Long? = fileId - - while (currentId != null) { - val parentId = storageManager.fileDao.getParentId(currentId) ?: return false - val isFavorite = storageManager.fileDao.isFavoriteFolder(parentId) == 1 - if (isFavorite) return true - currentId = parentId - } - - return false - } - - override suspend fun hasSharedParent(fileId: Long): Boolean { - var currentId: Long? = fileId - - while (currentId != null) { - val parentId = storageManager.fileDao.getParentId(currentId) ?: return false - val isShared = storageManager.fileDao.isSharedFolder(parentId) == true - if (isShared) return true - currentId = parentId - } - - return false - } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt index 0dd7387e706e..191b7ce666e3 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt @@ -14,6 +14,4 @@ interface OCFileListAdapterDataProvider { fun convertToOCFiles(id: Long): List suspend fun getFolderContent(id: Long): List fun createFileInstance(entity: FileEntity): OCFile - suspend fun hasFavoriteParent(fileId: Long): Boolean - suspend fun hasSharedParent(fileId: Long): Boolean } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index b3b6c2a68a18..28127ce835ee 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -90,16 +90,6 @@ class OCFileListAdapterHelper { } } - val hasSharedParent = dataProvider.hasSharedParent(file.fileId) - if (isSharedView && !hasSharedParent && !file.isShared) { - continue - } - - val hasFavoriteParent = dataProvider.hasFavoriteParent(file.fileId) - if (isFavoritesView && !hasFavoriteParent && !file.isFavorite) { - continue - } - if (file.isTempFile()) { continue } diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt b/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt index baeca7f3f8e5..c2b71334a569 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/MockOCFileListAdapterDataProvider.kt @@ -17,8 +17,6 @@ class MockOCFileListAdapterDataProvider : OCFileListAdapterDataProvider { private var offlineOCFile: OCFile? = null private var files = listOf() - var hasFavoriteParent = false - var hasSharedParent = false private fun getEntities(): List = files.map { file -> FileEntity( @@ -96,8 +94,4 @@ class MockOCFileListAdapterDataProvider : OCFileListAdapterDataProvider { } override fun createFileInstance(entity: FileEntity): OCFile = files.first { it.fileId == entity.id } - - override suspend fun hasFavoriteParent(fileId: Long): Boolean = hasFavoriteParent - - override suspend fun hasSharedParent(fileId: Long): Boolean = hasSharedParent } diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt index d318fcffdd76..edd0be902d65 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/OCFileListAdapterHelperTest.kt @@ -150,9 +150,6 @@ class OCFileListAdapterHelperTest { } val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) - dataProvider.hasFavoriteParent = true - dataProvider.hasSharedParent = false - env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) val (list, sort) = env.run(sub1) @@ -182,9 +179,6 @@ class OCFileListAdapterHelperTest { } val file6 = env.file(sub2, "image6.jpg", 16, MimeType.JPEG) - dataProvider.hasFavoriteParent = false - dataProvider.hasSharedParent = true - env.prepare(listOf(root, sub1, sub2, file1, file2, file3, file4, file5, file6)) stubPreferences(sort = FileSortOrder.SORT_A_TO_Z, favFirst = true) val (list, sort) = env.run(sub1) From 6809763fe3fcb502b5fde895f42b337cfa7cb971 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 10 Dec 2025 10:43:03 +0100 Subject: [PATCH 7/7] remove filters Signed-off-by: alperozturk --- .../android/ui/adapter/helper/OCFileListAdapterHelper.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt index 28127ce835ee..bca01ae9caba 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt @@ -12,9 +12,7 @@ import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.utils.extensions.filterFilenames import com.nextcloud.utils.extensions.isTempFile import com.owncloud.android.MainApp -import com.owncloud.android.R import com.owncloud.android.datamodel.OCFile -import com.owncloud.android.ui.activity.DrawerActivity import com.owncloud.android.utils.FileSortOrder import com.owncloud.android.utils.MimeTypeUtil import kotlinx.coroutines.CoroutineScope @@ -23,7 +21,6 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.util.ArrayList class OCFileListAdapterHelper { private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) @@ -65,8 +62,6 @@ class OCFileListAdapterHelper { val showHiddenFiles = preferences.isShowHiddenFilesEnabled() val hasMimeTypeFilter = limitToMimeType.isNotEmpty() val isRootAndPersonalOnly = (OCFile.ROOT_PATH == directory.remotePath && MainApp.isOnlyPersonFiles()) - val isSharedView = (DrawerActivity.menuItemId == R.id.nav_shared) - val isFavoritesView = (DrawerActivity.menuItemId == R.id.nav_favorites) val rawResult = getFolderContent(directory, dataProvider, onlyOnDevice) val filtered = ArrayList(rawResult.size)