Correctly update file after sharing. NC PR: nextcloud#11775

nextmcloud · Oct 18, 2023 · 91efa3c · 91efa3c
1 parent 154796b
commit 91efa3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -807,7 +807,7 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
             }
 
             if (fileListFragment instanceof OCFileListFragment && file != null) {
-                ((OCFileListFragment) fileListFragment).updateOCFile(file);
+                ((OCFileListFragment) fileListFragment).getAdapter().replaceFile(file);
             }
         } else {
             // Detect Failure (403) --> maybe needs password

diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -740,6 +740,14 @@ public void setData(List<Object> objects,
         new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    public void replaceFile(OCFile file) {
+        mFiles.remove(file);
+        mFiles.add(file);
+        mFiles = sortOrder.sortCloudFiles(mFiles);
+        notifyDataSetChanged();
+    }
+
     private void parseShares(List<Object> objects) {
         List<OCShare> shares = new ArrayList<>();
 

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1370,12 +1370,6 @@ public void listDirectory(OCFile directory, OCFile file, boolean onlyOnDevice, b
         }
     }
 
-    public void updateOCFile(OCFile file) {
-        List<OCFile> mFiles = mAdapter.getFiles();
-        mFiles.set(mFiles.indexOf(file), file);
-        mAdapter.notifyItemChanged(file);
-    }
-
     private void updateLayout() {
         // decide grid vs list view
         if (isGridViewPreferred(mFile)) {