wip

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

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -80,7 +80,6 @@
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.IntStream;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -1126,18 +1125,17 @@ public void removeFile(@NonNull OCFile file) {
 
     @SuppressLint("NotifyDataSetChanged")
     public void updateFile(@NonNull OCFile updatedFile) {
-        long fileId = updatedFile.getFileId();
+        int allIndex = helper.indexOfSameRemoteFile(mFilesAll, updatedFile);
+        if (allIndex != -1) {
+            mFilesAll.set(allIndex, updatedFile);
+        }
 
-        IntStream.range(0, mFilesAll.size())
-            .filter(i -> mFilesAll.get(i).getFileId() == fileId)
-            .findFirst()
-            .ifPresent(i -> mFilesAll.set(i, updatedFile));
+        int oldIndex = helper.indexOfSameRemoteFile(mFiles, updatedFile);
+        if (oldIndex == -1) {
+            return;
+        }
 
-        int oldIndex = IntStream.range(0, mFiles.size())
-            .filter(i -> mFiles.get(i).getFileId() == fileId)
-            .findFirst()
-            .orElse(-1);
-        if (oldIndex == -1) return;
+        long previousItemId = mFiles.get(oldIndex).getFileId();
 
         mFiles.remove(oldIndex);
         mFiles.add(updatedFile);
@@ -1161,10 +1159,12 @@ public void updateFile(@NonNull OCFile updatedFile) {
         int oldAdapterPos = oldIndex + headerOffset;
         int newAdapterPos = newIndex + headerOffset;
 
-        if (oldAdapterPos != newAdapterPos) {
-            notifyItemMoved(oldAdapterPos, newAdapterPos);
+        if (oldAdapterPos == newAdapterPos && previousItemId == updatedFile.getFileId()) {
+            notifyItemChanged(newAdapterPos);
+        } else {
+            notifyItemRemoved(oldAdapterPos);
+            notifyItemInserted(newAdapterPos);
         }
-        notifyItemChanged(newAdapterPos);
 
         if (shouldShowRecommendedFiles() && recommendedFilesAdapter != null && updatedFile.isRecommendedFile()) {
             int pos = recommendedFilesAdapter.getItemPosition(updatedFile);

app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt

@@ -196,6 +196,18 @@ class OCFileListAdapterHelper {
         }
     }
 
+    fun indexOfSameRemoteFile(files: List<OCFile>, target: OCFile): Int =
+        files.indexOfFirst { isSameRemoteFile(it, target) }
+
+    fun isSameRemoteFile(file: OCFile, target: OCFile): Boolean {
+        if (file.fileId == target.fileId) {
+            return true
+        }
+
+        val remoteId = file.remoteId ?: return false
+        return remoteId == target.remoteId
+    }
+
     fun cleanup() {
         job?.cancel()
         job = null

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -962,8 +962,6 @@ public void renameFile(OCFile file, String newFilename) {
         service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
         service.putExtra(OperationsService.EXTRA_NEWNAME, newFilename);
         mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
-
-        fileActivity.refreshList();
     }