fix

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt

@@ -122,16 +122,16 @@ interface FileDao {
         """
     SELECT *
     FROM filelist
-    WHERE file_owner = :fileOwner
-      AND (
-            share_by_link = 1
-         OR shared_via_users = 1
-         OR permissions LIKE '%S%'
-      )
+    WHERE 
+        (file_owner != :accountName
+        OR share_by_link = 1
+        OR shared_via_users = 1
+        OR permissions LIKE '%S%')
+        AND parent = 1
     ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER}
     """
     )
-    suspend fun getSharedFiles(fileOwner: String): List<FileEntity>
+    suspend fun getSharedFiles(accountName: String): List<FileEntity>
 
     @Query(
         """

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

@@ -59,24 +59,7 @@ object OCShareToOCFileConverter {
             return@withContext emptyList()
         }
 
-        val cachedPaths = cachedFiles.map { it.decryptedRemotePath }.toSet()
-
-        // Group shares by path to identify unique files
-        val sharesByPath = shares
-            .filter { it.path != null }
-            .groupBy { it.path!! }
-
-        // Identify ONLY new file paths that aren't in cache
-        val newSharesByPath = sharesByPath.filterKeys { path ->
-            path !in cachedPaths
-        }
-
-        if (newSharesByPath.isEmpty()) {
-            return@withContext cachedFiles
-        }
-
-        val newShares = newSharesByPath.values.flatten()
-        val newFiles = buildOCFilesFromShares(newShares)
+        val newFiles = buildOCFilesFromShares(shares)
         val baseSavePath = FileStorageUtils.getSavePath(accountName)
 
         val resolvedNewFiles = newFiles.map { file ->
@@ -94,7 +77,7 @@ object OCShareToOCFileConverter {
             }
         }.awaitAll()
 
-        storageManager?.saveShares(newShares, accountName)
+        // storageManager?.saveShares(newShares, accountName)
         cachedFiles + resolvedNewFiles
     }
 

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt

@@ -128,18 +128,13 @@ class OCFileListSearchTask(
 
     private suspend fun loadCachedDbFiles(searchType: SearchRemoteOperation.SearchType): List<OCFile> {
         val storage = fileDataStorageManager ?: return emptyList()
-
-        val rows = when (searchType) {
-            SearchRemoteOperation.SearchType.SHARED_FILTER ->
-                storage.fileDao.getSharedFiles(currentUser.accountName)
-
-            SearchRemoteOperation.SearchType.FAVORITE_SEARCH ->
-                storage.fileDao.getFavoriteFiles(currentUser.accountName)
-
-            else -> null
-        } ?: return emptyList()
-
-        return rows.mapNotNull { storage.createFileInstance(it) }
+        return if (searchType == SearchRemoteOperation.SearchType.SHARED_FILTER) {
+            storage.fileDao
+                .getSharedFiles(currentUser.accountName)
+        } else {
+            storage.fileDao
+                .getFavoriteFiles(currentUser.accountName)
+        } .mapNotNull { storage.createFileInstance(it) }
     }
 
     @Suppress("DEPRECATION")