wip

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

Author: alperozturk96

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

@@ -12,6 +12,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.nextcloud.client.database.entity.ShareEntity
+import com.nextcloud.client.database.entity.model.ShareeKey
 
 @Dao
 interface ShareDao {
@@ -21,4 +22,10 @@ interface ShareDao {
 
     @Query("DELETE FROM ocshares WHERE owner_share = :accountName")
     suspend fun clearSharesForAccount(accountName: String)
+
+    @Query(
+        "SELECT path, shate_with, share_type FROM ocshares " +
+            "WHERE path IN (:paths) AND owner_share = :accountName AND share_type IN (:shareTypes)"
+    )
+    fun getShareeKeys(paths: List<String>, accountName: String, shareTypes: List<Int>): List<ShareeKey>
 }

app/src/main/java/com/nextcloud/client/database/entity/model/ShareeKey.kt

@@ -0,0 +1,29 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.database.entity.model
+
+import androidx.room.ColumnInfo
+import com.owncloud.android.lib.resources.shares.ShareType
+
+data class ShareeKey(
+    @ColumnInfo(name = "path") val path: String,
+    @ColumnInfo(name = "shate_with") val shareWith: String?,
+    @ColumnInfo(name = "share_type") val shareType: Int
+) {
+    companion object {
+        val shareableShareTypeValues = listOf(
+            ShareType.USER,
+            ShareType.GROUP,
+            ShareType.EMAIL,
+            ShareType.FEDERATED,
+            ShareType.FEDERATED_GROUP,
+            ShareType.ROOM,
+            ShareType.CIRCLE
+        ).map { it.value }
+    }
+}

app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt

@@ -7,30 +7,16 @@
 
 package com.nextcloud.utils.extensions
 
-import android.os.RemoteException
+import com.nextcloud.client.database.entity.model.ShareeKey
 import com.nextcloud.client.database.entity.toOCCapability
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
-import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.files.model.RemoteFile
 import com.owncloud.android.lib.resources.shares.OCShare
-import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.lib.resources.status.OCCapability
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlin.collections.asSequence
-
-// matches FileDataStorageManager.getSharesWithForAFile, excludes public link shares
-private val shareableShareTypes = listOf(
-    ShareType.USER,
-    ShareType.GROUP,
-    ShareType.EMAIL,
-    ShareType.FEDERATED,
-    ShareType.FEDERATED_GROUP,
-    ShareType.ROOM,
-    ShareType.CIRCLE
-)
+
 
 // keeps queries well under SQLite's bound-parameter limit
 private const val SHARE_PATH_QUERY_CHUNK_SIZE = 400
@@ -50,61 +36,17 @@ fun FileDataStorageManager.areShareesChanged(remoteFiles: List<RemoteFile>): Boo
                 .toSet()
         }
 
-    val existingShareesByPath = queryLocalShareeKeysByPath(newShareesByPath.keys, user.accountName)
+    val existingShareesByPath = newShareesByPath.keys
+        .chunked(SHARE_PATH_QUERY_CHUNK_SIZE)
+        .flatMap { chunk -> shareDao.getShareeKeys(chunk, user.accountName, ShareeKey.shareableShareTypeValues) }
+        .groupBy(ShareeKey::path) { "${it.shareWith}:${it.shareType}" }
+        .mapValues { (_, keys) -> keys.toSet() }
 
     return newShareesByPath.keys.any { path ->
         newShareesByPath[path].orEmpty() != existingShareesByPath[path].orEmpty()
     }
 }
 
-private fun FileDataStorageManager.queryLocalShareeKeysByPath(
-    paths: Set<String>,
-    accountName: String
-): Map<String, Set<String>> {
-    val result = mutableMapOf<String, MutableSet<String>>()
-
-    paths.toList().chunked(SHARE_PATH_QUERY_CHUNK_SIZE).forEach { chunk ->
-        queryLocalShareeKeysChunk(chunk, accountName, result)
-    }
-
-    return result
-}
-
-private fun FileDataStorageManager.queryLocalShareeKeysChunk(
-    paths: List<String>,
-    accountName: String,
-    result: MutableMap<String, MutableSet<String>>
-) {
-    val pathPlaceholders = paths.joinToString(",") { "?" }
-    val shareTypeFilter = shareableShareTypes.joinToString(" OR ") { "${ProviderTableMeta.OCSHARES_SHARE_TYPE} = ?" }
-    val selection = "${ProviderTableMeta.OCSHARES_PATH} IN ($pathPlaceholders) AND " +
-        "${ProviderTableMeta.OCSHARES_ACCOUNT_OWNER} = ? AND ($shareTypeFilter)"
-    val selectionArgs = (paths + accountName + shareableShareTypes.map { it.value.toString() }).toTypedArray()
-
-    val cursor = if (contentResolver != null) {
-        contentResolver.query(ProviderTableMeta.CONTENT_URI_SHARE, null, selection, selectionArgs, null)
-    } else {
-        try {
-            contentProviderClient?.query(ProviderTableMeta.CONTENT_URI_SHARE, null, selection, selectionArgs, null)
-        } catch (e: RemoteException) {
-            Log_OC.e(javaClass.simpleName, "Could not get list of shares: ${e.message}", e)
-            null
-        }
-    }
-
-    cursor?.use {
-        val pathIndex = it.getColumnIndex(ProviderTableMeta.OCSHARES_PATH)
-        val shareWithIndex = it.getColumnIndex(ProviderTableMeta.OCSHARES_SHARE_WITH)
-        val shareTypeIndex = it.getColumnIndex(ProviderTableMeta.OCSHARES_SHARE_TYPE)
-
-        while (it.moveToNext()) {
-            val path = it.getString(pathIndex) ?: continue
-            val key = "${it.getString(shareWithIndex)}:${it.getInt(shareTypeIndex)}"
-            result.getOrPut(path) { mutableSetOf() }.add(key)
-        }
-    }
-}
-
 suspend fun FileDataStorageManager.saveShares(shares: List<OCShare>, accountName: String) {
     withContext(Dispatchers.IO) {
         val entities = shares.map { share ->