fix: git conflict

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

Author: alperozturk96

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

@@ -0,0 +1,26 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.database.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import com.nextcloud.client.database.entity.SyncedFolderEntity
+import com.owncloud.android.db.ProviderMeta
+
+@Dao
+interface SyncedFolderDao {
+    @Query(
+        """
+        SELECT * FROM ${ProviderMeta.ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME}
+        WHERE ${ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_LOCAL_PATH} = :localPath
+          AND ${ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT} = :account
+        LIMIT 1
+        """
+    )
+    fun findByLocalPathAndAccount(localPath: String, account: String): SyncedFolderEntity?
+}

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

@@ -10,6 +10,9 @@ package com.nextcloud.client.database.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.nextcloud.client.preferences.SubFolderRule
+import com.owncloud.android.datamodel.MediaFolderType
+import com.owncloud.android.datamodel.SyncedFolder
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
 
 @Entity(tableName = ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME)
@@ -50,3 +53,40 @@ data class SyncedFolderEntity(
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_LAST_SCAN_TIMESTAMP_MS)
     val lastScanTimestampMs: Long?
 )
+
+fun SyncedFolderEntity.toSyncedFolder(): SyncedFolder = SyncedFolder(
+    // id
+    (this.id ?: SyncedFolder.UNPERSISTED_ID).toLong(),
+    // localPath
+    this.localPath ?: "",
+    // remotePath
+    this.remotePath ?: "",
+    // wifiOnly
+    this.wifiOnly == 1,
+    // chargingOnly
+    this.chargingOnly == 1,
+    // existing
+    this.existing == 1,
+    // subfolderByDate
+    this.subfolderByDate == 1,
+    // account
+    this.account ?: "",
+    // uploadAction
+    this.uploadAction ?: 0,
+    // nameCollisionPolicy
+    this.nameCollisionPolicy ?: 0,
+    // enabled
+    this.enabled == 1,
+    // timestampMs
+    (this.enabledTimestampMs ?: SyncedFolder.EMPTY_ENABLED_TIMESTAMP_MS).toLong(),
+    // type
+    MediaFolderType.getById(this.type ?: MediaFolderType.CUSTOM.id),
+    // hidden
+    this.hidden == 1,
+    // subFolderRule
+    this.subFolderRule?.let { SubFolderRule.entries[it] },
+    // excludeHidden
+    this.excludeHidden == 1,
+    // lastScanTimestampMs
+    this.lastScanTimestampMs ?: SyncedFolder.NOT_SCANNED_YET
+)

app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt

@@ -20,6 +20,7 @@ class FileSystemRepository(private val dao: FileSystemDao) {
         const val BATCH_SIZE = 50
     }
 
+    @Suppress("NestedBlockDepth")
     suspend fun getFilePathsWithIds(syncedFolder: SyncedFolder, lastId: Int): List<Pair<String, Int>> {
         val syncedFolderId = syncedFolder.id.toString()
         Log_OC.d(TAG, "Fetching candidate files for syncedFolderId = $syncedFolderId")

app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java

@@ -108,7 +108,7 @@ public SyncedFolder(String localPath,
      *
      * @param id id
      */
-    protected SyncedFolder(long id,
+    public SyncedFolder(long id,
                            String localPath,
                            String remotePath,
                            boolean wifiOnly,

app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -15,9 +15,14 @@
 
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.core.Clock;
+import com.nextcloud.client.database.NextcloudDatabase;
+import com.nextcloud.client.database.dao.SyncedFolderDao;
+import com.nextcloud.client.database.entity.SyncedFolderEntity;
+import com.nextcloud.client.database.entity.SyncedFolderEntityKt;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.nextcloud.client.preferences.SubFolderRule;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
@@ -42,6 +47,7 @@ public class SyncedFolderProvider extends Observable {
     private final ContentResolver mContentResolver;
     private final AppPreferences preferences;
     private final Clock clock;
+    public final SyncedFolderDao dao = NextcloudDatabase.getInstance(MainApp.getAppContext()).syncedFolderDao();
 
     /**
      * constructor.
@@ -183,33 +189,11 @@ public int updateSyncedFolderEnabled(long id, Boolean enabled) {
     }
 
     public SyncedFolder findByLocalPathAndAccount(String localPath, User user) {
-        SyncedFolder result = null;
-        Cursor cursor = mContentResolver.query(
-            ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
-            null,
-            ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_LOCAL_PATH + " LIKE ? AND " +
-                ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT + " =? ",
-            new String[]{localPath + "%", user.getAccountName()},
-            null
-        );
-
-        if (cursor != null && cursor.getCount() == 1) {
-            result = createSyncedFolderFromCursor(cursor);
-        } else {
-            if (cursor == null) {
-                Log_OC.e(TAG, "Sync folder db cursor for local path=" + localPath + " in NULL.");
-            } else {
-                Log_OC.e(TAG, cursor.getCount() + " items for local path=" + localPath
-                        + " available in sync folder db. Expected 1. Failed to update sync folder db.");
-            }
-        }
-
-        if (cursor != null) {
-            cursor.close();
+        final SyncedFolderEntity entity = dao.findByLocalPathAndAccount(localPath, user.getAccountName());
+        if (entity == null) {
+            return null;
         }
-
-        return result;
-
+        return SyncedFolderEntityKt.toSyncedFolder(entity);
     }
 
     @Nullable