Add offlineOperations to the adapter

Signed-off-by: alperozturk <alper_ozturk@proton.me>
nextcloud · Sep 3, 2024 · 6c2df1c · 6c2df1c
1 parent 51c30ec
commit 6c2df1c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/...ava/com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepository.kt b/...ava/com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepository.kt
@@ -11,6 +11,8 @@ import com.nextcloud.client.database.entity.OfflineOperationEntity
 import com.nextcloud.model.OfflineOperationType
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.utils.MimeType
+import com.owncloud.android.utils.MimeTypeUtil
 
 class OfflineOperationsRepository(
  private val fileDataStorageManager: FileDataStorageManager
@@ -94,4 +96,15 @@ class OfflineOperationsRepository(
  }
  .forEach { dao.update(it) }
  }
+
+ override fun convertToOCFiles(): List<OCFile> =
+ dao.getAll().map { entity ->
+ OCFile(entity.path).apply {
+ mimeType = if (entity.type is OfflineOperationType.CreateFolder) {
+ MimeType.DIRECTORY
+ } else {
+ MimeTypeUtil.getMimeTypeFromPath(entity.path)
+ }
+ }
+ }
 }
diff --git a/...com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepositoryType.kt b/...com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepositoryType.kt
@@ -14,4 +14,5 @@ interface OfflineOperationsRepositoryType {
  fun getAllSubEntities(fileId: Long): List<OfflineOperationEntity>
  fun deleteOperation(file: OCFile)
  fun updateNextOperations(operation: OfflineOperationEntity)
+ fun convertToOCFiles(): List<OCFile>
 }
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -107,7 +107,7 @@ public class FileDataStorageManager {
  public final OfflineOperationDao offlineOperationDao = NextcloudDatabase.getInstance(MainApp.getAppContext()).offlineOperationDao();
  private final FileDao fileDao = NextcloudDatabase.getInstance(MainApp.getAppContext()).fileDao();
  private final Gson gson = new Gson();
- private final OfflineOperationsRepositoryType offlineOperationsRepository;
+ public final OfflineOperationsRepositoryType offlineOperationsRepository;
 
  public FileDataStorageManager(User user, ContentResolver contentResolver) {
  this.contentProviderClient = null;

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
@@ -771,6 +771,14 @@ public void swapDirectory(
  mergeOCFilesForLivePhoto();
  mFilesAll.clear();
  mFilesAll.addAll(mFiles);
+
+ List<OCFile> offlineOperations = mStorageManager.offlineOperationsRepository.convertToOCFiles();
+ for (OCFile offlineFile : offlineOperations) {
+ if (!mFilesAll.contains(offlineFile)) {
+ mFilesAll.add(offlineFile);
+ }
+ }
+
  currentDirectory = directory;
  } else {
  mFiles.clear();