fix inside metadataworker

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

Author: alperozturk96

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

@@ -111,13 +111,4 @@ interface FileDao {
     """
     )
     fun searchFilesInFolder(parentId: Long, fileOwner: String, query: String): List<FileEntity>
-
-    @Query(
-        """
-    SELECT COUNT(*) 
-    FROM filelist 
-    WHERE parent = :parentId
-    """
-    )
-    fun getChildFileCount(parentId: Long): Int
 }

app/src/main/java/com/nextcloud/client/jobs/metadata/MetadataWorker.kt

@@ -55,7 +55,7 @@ class MetadataWorker(private val context: Context, params: WorkerParameters, pri
         return Result.success()
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "TooGenericExceptionCaught")
     private suspend fun refreshFolder(folder: OCFile, storageManager: FileDataStorageManager) =
         withContext(Dispatchers.IO) {
             Log_OC.d(
@@ -72,12 +72,23 @@ class MetadataWorker(private val context: Context, params: WorkerParameters, pri
 
             Log_OC.d(TAG, "⏳ Fetching metadata for: ${folder.remotePath}")
 
-            val operation = RefreshFolderOperation(folder, storageManager, user, context)
-            val result = operation.execute(user, context)
-            if (result.isSuccess) {
-                Log_OC.d(TAG, "✅ Successfully fetched metadata for: ${folder.remotePath}")
-            } else {
-                Log_OC.e(TAG, "❌ Failed to fetch metadata for: ${folder.remotePath}")
+            try {
+                val operation = RefreshFolderOperation(folder, storageManager, user, context)
+                val result = operation.execute(user, context)
+                if (result.isSuccess) {
+                    Log_OC.d(TAG, "✅ Successfully fetched metadata for: ${folder.remotePath}")
+                } else {
+                    Log_OC.e(TAG, "❌ Failed to fetch metadata for: ${folder.remotePath}, resetting e-Tag")
+                    resetETag(folder, storageManager)
+                }
+            } catch (e: Exception) {
+                Log_OC.e(TAG, "❌ Exception during to fetch metadata for: ${folder.remotePath}, resetting e-Tag $e")
+                resetETag(folder, storageManager)
             }
         }
+
+    private fun resetETag(folder: OCFile, storageManager: FileDataStorageManager) {
+        folder.etag = ""
+        storageManager.saveFile(folder)
+    }
 }

app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -411,11 +411,10 @@ private RemoteOperationResult checkForChanges(OwnCloudClient client) {
         Log_OC.d(TAG, "Checking changes in " + user.getAccountName() + remotePath);
 
         // remote request
-        result = new ReadFolderRemoteOperation(remotePath).execute(client);
+        result = new ReadFileRemoteOperation(remotePath).execute(client);
 
         if (result.isSuccess()) {
-            final var childFiles = result.getData();
-            if (!mIgnoreETag && childFiles.get(0) instanceof RemoteFile remoteFile) {
+            if (!mIgnoreETag && result.getData().get(0) instanceof RemoteFile remoteFile) {
                 // check if remote and local folder are different
                 String remoteFolderETag = remoteFile.getEtag();
                 if (remoteFolderETag != null) {
@@ -429,14 +428,6 @@ private RemoteOperationResult checkForChanges(OwnCloudClient client) {
                             "  Remote eTag: " + remoteFolderETag + "\n" +
                             "  Changed:     " + mRemoteFolderChanged
                             );
-
-                    // result.getData() returns folder itself with child files
-                    final int remoteChildFileSize = childFiles.size() - 1;
-                    final int childFileSize = fileDataStorageManager.fileDao.getChildFileCount(mLocalFolder.getFileId());
-                    if (childFileSize != remoteChildFileSize) {
-                        mRemoteFolderChanged = true;
-                        Log_OC.w(TAG, "file sizes are not matching, setting remote folder changed as true");
-                    }
                 } else {
                     Log_OC.e(TAG, "Checked " + user.getAccountName() + remotePath + ": No ETag received from server");
                 }
@@ -535,12 +526,6 @@ private void synchronizeData(List<Object> folderAndFiles) {
         // update richWorkspace
         mLocalFolder.setRichWorkspace(remoteFolder.getRichWorkspace());
 
-        // update eTag
-        mLocalFolder.setEtag(remoteFolder.getEtag());
-
-        // update size
-        mLocalFolder.setFileLength(remoteFolder.getFileLength());
-
         Object object = null;
         if (mLocalFolder.isEncrypted()) {
             object = getDecryptedFolderMetadata(encryptedAncestor,
@@ -628,6 +613,7 @@ private void synchronizeData(List<Object> folderAndFiles) {
             updatedFile.setEncrypted(encrypted);
 
             updatedFiles.add(updatedFile);
+            Log_OC.d(TAG, "folder: " + mLocalFolder.getRemotePath() + " file: " + updatedFile.getRemotePath() + " metadataWorking: " + isMetadataSyncWorkerRunning);
         }
 
 
@@ -643,8 +629,13 @@ private void synchronizeData(List<Object> folderAndFiles) {
                                            mLocalFolder);
         }
         fileDataStorageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());
-
         mChildren = updatedFiles;
+
+        // update eTag
+        mLocalFolder.setEtag(remoteFolder.getEtag());
+
+        // update size
+        mLocalFolder.setFileLength(remoteFolder.getFileLength());
     }
 
     @Nullable