check nested files

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

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<String>
+
+    @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?
 }

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<OCFile> =
@@ -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
+    }
 }

app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterDataProvider.kt

@@ -14,4 +14,6 @@ interface OCFileListAdapterDataProvider {
     fun convertToOCFiles(id: Long): List<OCFile>
     suspend fun getFolderContent(id: Long): List<FileEntity>
     fun createFileInstance(entity: FileEntity): OCFile
+    suspend fun hasFavoriteParent(fileId: Long): Boolean
+    suspend fun hasSharedParent(fileId: Long): Boolean
 }

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
             }
 

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<OCFile>()
+    var hasFavoriteParent = false
+    var hasSharedParent = false
 
     private fun getEntities(): List<FileEntity> = 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
 }

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<OCFile>, 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)