fix etag saving logic

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

Author: alperozturk96

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

@@ -51,7 +51,6 @@
 import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
 import com.owncloud.android.lib.resources.files.model.FileLockType;
@@ -497,9 +496,13 @@ public List<OCFile> getFolderImages(OCFile folder, boolean onlyOnDevice) {
     }
 
     public boolean saveFile(OCFile ocFile) {
+        Log_OC.d(TAG, "saving file: " + ocFile.getRemotePath() + " etag: " + ocFile.getEtag());
+
         boolean overridden = false;
         final ContentValues cv = createContentValuesForFile(ocFile);
         if (ocFile.isFolder()) {
+            // only refresh folder operation must update eTag otherwise content of the folder may stay as outdated
+            cv.remove(ProviderTableMeta.FILE_ETAG);
             cv.remove(ProviderTableMeta.FILE_STORAGE_PATH);
         }
 

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

@@ -267,9 +267,6 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             updateUserProfile();
         }
 
-        // check first parent dirs are saved
-        fileDataStorageManager.saveFileWithParent(mLocalFolder, mContext);
-
         result = checkForChanges(client);
 
         if (result.isSuccess()) {
@@ -403,11 +400,6 @@ private void updatePredefinedStatus(ArbitraryDataProvider arbitraryDataProvider)
 
     private RemoteOperationResult checkForChanges(OwnCloudClient client) {
         mRemoteFolderChanged = true;
-        if (isMetadataSyncWorkerRunning) {
-            Log_OC.d(TAG, "Skipping eTag check since metadata worker already did");
-            return new RemoteOperationResult<>(ResultCode.OK);
-        }
-
         RemoteOperationResult<?> result;
         String remotePath = mLocalFolder.getRemotePath();
 
@@ -417,16 +409,18 @@ private RemoteOperationResult checkForChanges(OwnCloudClient client) {
         result = new ReadFileRemoteOperation(remotePath).execute(client);
 
         if (result.isSuccess()) {
-            if (!mIgnoreETag && result.getData().get(0) instanceof RemoteFile remoteFile) {
+            OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
+
+            if (!mIgnoreETag) {
                 // check if remote and local folder are different
-                String remoteFolderETag = remoteFile.getEtag();
+                String remoteFolderETag = remoteFolder.getEtag();
                 if (remoteFolderETag != null) {
                     String localFolderEtag = mLocalFolder.getEtag();
                     mRemoteFolderChanged = StringExtensionsKt.eTagChanged(remoteFolderETag, localFolderEtag);
                     Log_OC.d(
                         TAG,
                         "📂 eTag check\n" +
-                            "  Path:        " + remoteFile.getRemotePath() + "\n" +
+                            "  Path:        " + remoteFolder.getRemotePath() + "\n" +
                             "  Local eTag:  " + localFolderEtag + "\n" +
                             "  Remote eTag: " + remoteFolderETag + "\n" +
                             "  Changed:     " + mRemoteFolderChanged
@@ -505,7 +499,7 @@ private void synchronizeData(List<Object> folderAndFiles) {
         mLocalFolder = fileDataStorageManager.getFileByPath(mLocalFolder.getRemotePath());
 
         if (mLocalFolder == null) {
-            Log_OC.d(TAG,"mLocalFolder cannot be null");
+            Log_OC.e(TAG,"mLocalFolder cannot be null");
             return;
         }
 
@@ -514,7 +508,7 @@ private void synchronizeData(List<Object> folderAndFiles) {
         remoteFolder.setParentId(mLocalFolder.getParentId());
         remoteFolder.setFileId(mLocalFolder.getFileId());
 
-        Log_OC.d(TAG, "Remote folder " + mLocalFolder.getRemotePath() + " changed - starting update of local data ");
+        Log_OC.d(TAG, "Remote folder path: " + mLocalFolder.getRemotePath() + " changed - starting update of local data ");
 
         List<OCFile> updatedFiles = new ArrayList<>(folderAndFiles.size() - 1);
         mFilesToSyncContents.clear();