Merge pull request #11358 from nextcloud/trashbin

use TrashbinFile

app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt

@@ -44,7 +44,7 @@ class TrashbinLocalRepository(val testCase: TrashbinActivityIT.TestCase) : Trash
         when (testCase) {
             TrashbinActivityIT.TestCase.ERROR -> callback?.onError(R.string.trashbin_loading_failed)
             TrashbinActivityIT.TestCase.FILES -> {
-                val files = ArrayList<Any>()
+                val files = ArrayList<TrashbinFile>()
                 files.add(
                     TrashbinFile(
                         "test.png",
@@ -78,7 +78,7 @@ class TrashbinLocalRepository(val testCase: TrashbinActivityIT.TestCase) : Trash
 
                 callback?.onSuccess(files)
             }
-            TrashbinActivityIT.TestCase.EMPTY -> callback?.onSuccess(ArrayList<Any>())
+            TrashbinActivityIT.TestCase.EMPTY -> callback?.onSuccess(ArrayList<TrashbinFile>())
         }
     }
 }

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

@@ -88,17 +88,15 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         this.viewThemeUtils = viewThemeUtils;
     }
 
-    public void setTrashbinFiles(List<Object> trashbinFiles, boolean clear) {
+    public void setTrashbinFiles(List<TrashbinFile> trashbinFiles, boolean clear) {
         if (clear) {
             files.clear();
         }
 
-        for (Object file : trashbinFiles) {
-            files.add((TrashbinFile) file);
-        }
+        files.addAll(trashbinFiles);
 
         files = preferences.getSortOrderByType(FileSortOrder.Type.trashBinView,
-            FileSortOrder.sort_new_to_old).sortTrashbinFiles(files);
+                                               FileSortOrder.sort_new_to_old).sortTrashbinFiles(files);
 
         notifyDataSetChanged();
     }

app/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java

@@ -182,7 +182,7 @@ public class RemoteTrashbinRepository implements TrashbinRepository {
         private String remotePath;
         private User user;
         private ClientFactory clientFactory;
-        private List<Object> trashbinFiles;
+        private List<TrashbinFile> trashbinFiles;
         private LoadFolderCallback callback;
 
         private ReadRemoteTrashbinFolderTask(String remotePath, User user, ClientFactory clientFactory,
@@ -197,9 +197,10 @@ public class RemoteTrashbinRepository implements TrashbinRepository {
         protected Boolean doInBackground(Void... voids) {
             try {
                 OwnCloudClient client = clientFactory.create(user);
-                RemoteOperationResult result = new ReadTrashbinFolderRemoteOperation(remotePath).execute(client);
+                RemoteOperationResult<List<TrashbinFile>> result =
+                    new ReadTrashbinFolderRemoteOperation(remotePath).execute(client);
                 if (result.isSuccess()) {
-                    trashbinFiles = result.getData();
+                    trashbinFiles = result.getResultData();
                     return Boolean.TRUE;
                 } else {
                     return Boolean.FALSE;

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java

@@ -260,7 +260,7 @@ public class TrashbinActivity extends DrawerActivity implements
     }
 
     @Override
-    public void showTrashbinFolder(List<Object> trashbinFiles) {
+    public void showTrashbinFolder(List<TrashbinFile> trashbinFiles) {
         if (active) {
             trashbinListAdapter.setTrashbinFiles(trashbinFiles, true);
             binding.swipeContainingList.setRefreshing(false);

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java

@@ -30,7 +30,7 @@ import java.util.List;
 public interface TrashbinContract {
 
     interface View {
-        void showTrashbinFolder(List<Object> trashbinFiles);
+        void showTrashbinFolder(List<TrashbinFile> trashbinFiles);
 
         void showSnackbarError(int message, TrashbinFile file);
 

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java

@@ -70,7 +70,7 @@ public class TrashbinPresenter implements TrashbinContract.Presenter {
     public void loadFolder() {
         trashbinRepository.getFolder(currentPath, new TrashbinRepository.LoadFolderCallback() {
             @Override
-            public void onSuccess(List<Object> files) {
+            public void onSuccess(List<TrashbinFile> files) {
                 trashbinView.showTrashbinFolder(files);
             }
 

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinRepository.java

@@ -29,7 +29,7 @@ import java.util.List;
  */
 public interface TrashbinRepository {
     interface LoadFolderCallback {
-        void onSuccess(List<Object> files);
+        void onSuccess(List<TrashbinFile> files);
 
         void onError(int error);
     }