use saveFileWithParent

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

Author: alperozturk96

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

@@ -547,46 +547,65 @@ public boolean saveFile(OCFile ocFile) {
     }
 
     /**
-     * traverses a files parent tree to be able to store a file with its parents. Throws a
-     * RemoteOperationFailedException in case the parent can't be retrieved.
+     * Ensures that an {@link OCFile} and all of its parent folders are stored locally.
+     * <p>
+     * If the file has no parent ID and is not the root folder, this method recursively:
+     * <ul>
+     *     <li>Resolves the parent path</li>
+     *     <li>Loads the parent from local storage or fetches it from the server</li>
+     *     <li>Saves all missing parent folders</li>
+     *     <li>Assigns the resolved parent ID to the file</li>
+     * </ul>
+     *
+     * @param ocFile    the file to be saved together with its parent hierarchy
+     * @param context Android context used for remote operations
      *
-     * @param ocFile  the file
-     * @param context the app context
-     * @return the parent file
+     * @return the same {@link OCFile} instance with a valid parent ID
+     *
+     * @throws RemoteOperationFailedException if a parent folder cannot be retrieved
+     *                                       from the server
      */
     public OCFile saveFileWithParent(OCFile ocFile, Context context) {
         if (ocFile.getParentId() == 0 && !OCFile.ROOT_PATH.equals(ocFile.getRemotePath())) {
+            Log_OC.d(TAG, "saving file with parents: " + ocFile.getRemotePath());
+
             String remotePath = ocFile.getRemotePath();
             String parentPath = remotePath.substring(0, remotePath.lastIndexOf(ocFile.getFileName()));
 
             OCFile parentFile = getFileByPath(parentPath);
             OCFile returnFile;
 
             if (parentFile == null) {
-                // remote request
-                ReadFileRemoteOperation operation = new ReadFileRemoteOperation(parentPath);
-                // TODO Deprecated
-                RemoteOperationResult result = operation.execute(getUser(), context);
-                if (result.isSuccess()) {
-                    OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
-
-                    returnFile = saveFileWithParent(remoteFolder, context);
+                Log_OC.d(TAG, "Parent not found locally, fetching: " + parentPath);
+
+                final var operation = new ReadFileRemoteOperation(parentPath);
+                final var result = operation.execute(getUser(), context);
+
+                if (result.isSuccess() && result.getData().get(0) instanceof RemoteFile remoteFile) {
+                    OCFile folder = FileStorageUtils.fillOCFile(remoteFile);
+                    Log_OC.d(TAG, "Fetched parent folder: " + folder);
+                    returnFile = saveFileWithParent(folder, context);
                 } else {
                     Exception exception = result.getException();
                     String message = "Error during saving file with parents: " + ocFile.getRemotePath() + " / "
                         + result.getLogMessage(context);
 
+                    Log_OC.e(TAG, message);
+
                     if (exception != null) {
                         throw new RemoteOperationFailedException(message, exception);
                     } else {
                         throw new RemoteOperationFailedException(message);
                     }
                 }
             } else {
+                Log_OC.d(TAG, "parent file exists, calling saveFileWithParent: " + ocFile.getRemotePath());
                 returnFile = saveFileWithParent(parentFile, context);
             }
 
-            ocFile.setParentId(returnFile.getFileId());
+            long parentId = returnFile.getFileId();
+            Log_OC.d(TAG, "saving parent id of: " + ocFile.getRemotePath() + " with: " + parentId);
+            ocFile.setParentId(parentId);
             saveFile(ocFile);
         }
 

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

@@ -267,6 +267,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             updateUserProfile();
         }
 
+        fileDataStorageManager.saveFileWithParent(mLocalFolder, mContext);
+
+        Log_OC.d(TAG, "STEP 1 --- refreshing folder " + mLocalFolder.getRemotePath());
+
         result = checkForChanges(client);
 
         if (result.isSuccess()) {

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

@@ -11,7 +11,6 @@ package com.owncloud.android.ui.fragment
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ContentValues
-import android.content.Context
 import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.account.User
 import com.nextcloud.client.preferences.AppPreferences
@@ -41,7 +40,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import java.lang.ref.WeakReference
-import java.util.concurrent.TimeUnit
 
 @Suppress("LongParameterList", "ReturnCount", "TooGenericExceptionCaught", "DEPRECATION", "MagicNumber")
 @SuppressLint("NotifyDataSetChanged")
@@ -106,14 +104,6 @@ class OCFileListSearchTask(
                     fragment.adapter.files
                 }
 
-                val subDirectories = newList
-                    .filter { it.isFolder }
-                    .sortedBy { it.fileId }
-
-                subDirectories.forEach { dir ->
-                    fetchDirContent(dir, fileDataStorageManager, fragment.context)
-                }
-
                 val sortedNewList = sortSearchData(newList, searchType, null, setNewSortOrder = {
                     fragment.adapter.setSortOrder(it)
                 })
@@ -135,39 +125,6 @@ class OCFileListSearchTask(
 
     fun isFinished(): Boolean = job?.isCompleted == true
 
-    private suspend fun fetchDirContent(
-        folder: OCFile,
-        storageManager: FileDataStorageManager?,
-        context: Context?
-    ) = withContext(Dispatchers.IO) {
-        if (context == null || storageManager == null) {
-            Log_OC.e(TAG, "sub directory content cannot be fetched, context or storage manager is null")
-            return@withContext
-        }
-
-        val currentSyncTime = System.currentTimeMillis()
-        val shouldIgnoreETag = (currentSyncTime - folder.lastSyncDateForProperties) > TimeUnit.MINUTES.toMillis(5)
-
-        Log_OC.d(TAG, "fetching content for: " + folder.remotePath + " ignore eTag: " + shouldIgnoreETag)
-
-        val operation =
-            RefreshFolderOperation(
-                folder,
-                currentSyncTime,
-                shouldIgnoreETag,
-                shouldIgnoreETag,
-                storageManager,
-                currentUser,
-                context
-            )
-        val result = operation.execute(currentUser, context)
-        if (result.isSuccess) {
-            Log_OC.d(TAG, "sub directory content is fetched")
-        } else {
-            Log_OC.e(TAG, "sub directory content cannot be fetched")
-        }
-    }
-
     private suspend fun loadCachedDbFiles(searchType: SearchRemoteOperation.SearchType): List<OCFile> {
         val storage = fileDataStorageManager ?: return emptyList()
         return if (searchType == SearchRemoteOperation.SearchType.SHARED_FILTER) {
@@ -179,6 +136,7 @@ class OCFileListSearchTask(
         }.mapNotNull { storage.createFileInstance(it) }
     }
 
+    @Suppress("DEPRECATION")
     private suspend fun fetchRemoteResults(): RemoteOperationResult<List<Any>>? {
         val fragment = fragmentReference.get() ?: return null
         val context = fragment.context ?: return null