[New arch] Migrate OCUpload to new database

owncloudApp/src/main/java/com/owncloud/android/datamodel/OCUpload.java

@@ -38,6 +38,7 @@
 
 import java.io.File;
 
+@Deprecated
 /**
  * Stores all information in order to start upload operations. PersistentUploadObject can
  * be stored persistently by {@link UploadsStorageManager}.

owncloudApp/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -94,42 +94,6 @@ public UploadsStorageManager(ContentResolver contentResolver) {
         mContentResolver = contentResolver;
     }
 
-    /**
-     * Stores an upload object in DB.
-     *
-     * @param ocUpload Upload object to store
-     * @return upload id, -1 if the insert process fails.
-     */
-    public long storeUpload(OCUpload ocUpload) {
-        Timber.v("Inserting " + ocUpload.getLocalPath() + " with status=" + ocUpload.getUploadStatus());
-
-        ContentValues cv = new ContentValues();
-        cv.put(ProviderTableMeta.UPLOADS_LOCAL_PATH, ocUpload.getLocalPath());
-        cv.put(ProviderTableMeta.UPLOADS_REMOTE_PATH, ocUpload.getRemotePath());
-        cv.put(ProviderTableMeta.UPLOADS_ACCOUNT_NAME, ocUpload.getAccountName());
-        cv.put(ProviderTableMeta.UPLOADS_FILE_SIZE, ocUpload.getFileSize());
-        cv.put(ProviderTableMeta.UPLOADS_STATUS, ocUpload.getUploadStatus().value);
-        cv.put(ProviderTableMeta.UPLOADS_LOCAL_BEHAVIOUR, ocUpload.getLocalAction());
-        cv.put(ProviderTableMeta.UPLOADS_FORCE_OVERWRITE, ocUpload.isForceOverwrite() ? 1 : 0);
-        cv.put(ProviderTableMeta.UPLOADS_IS_CREATE_REMOTE_FOLDER, ocUpload.createsRemoteFolder() ? 1 : 0);
-        cv.put(ProviderTableMeta.UPLOADS_LAST_RESULT, ocUpload.getLastResult().getValue());
-        cv.put(ProviderTableMeta.UPLOADS_CREATED_BY, ocUpload.getCreatedBy());
-        cv.put(ProviderTableMeta.UPLOADS_TRANSFER_ID, ocUpload.getTransferId());
-
-        Uri result = getDB().insert(ProviderTableMeta.CONTENT_URI_UPLOADS, cv);
-
-        Timber.d("storeUpload returns with: " + result + " for file: " + ocUpload.getLocalPath());
-        if (result == null) {
-            Timber.e("Failed to insert item " + ocUpload.getLocalPath() + " into upload db.");
-            return -1;
-        } else {
-            long new_id = Long.parseLong(result.getPathSegments().get(1));
-            ocUpload.setUploadId(new_id);
-            notifyObserversNow();
-            return new_id;
-        }
-    }
-
     /**
      * Update an upload object in DB.
      *
@@ -164,63 +128,6 @@ public int updateUpload(OCUpload ocUpload) {
         return result;
     }
 
-    private int updateUploadInternal(Cursor c, UploadStatus status, UploadResult result, String remotePath,
-                                     String localPath) {
-        int r = 0;
-        while (c.moveToNext()) {
-            // read upload object and update
-            OCUpload upload = createOCUploadFromCursor(c);
-
-            String path = getStringFromColumnOrThrow(c, ProviderTableMeta.UPLOADS_LOCAL_PATH);
-            Timber.v("Updating " + path + " with status:" + status + " and result:" + (result == null ? "null" :
-                    result.toString()) + " (old:" + upload.toFormattedString() + ")");
-
-            upload.setUploadStatus(status);
-            upload.setLastResult(result);
-            upload.setRemotePath(remotePath);
-            if (localPath != null) {
-                upload.setLocalPath(localPath);
-            }
-            upload.setUploadEndTimestamp(Calendar.getInstance().getTimeInMillis());
-
-            // store update upload object to db
-            r = updateUpload(upload);
-        }
-
-        return r;
-    }
-
-    /**
-     * Update upload status of file uniquely referenced by id.
-     *
-     * @param id         upload id.
-     * @param status     new status.
-     * @param result     new result of upload operation
-     * @param remotePath path of the file to upload in the ownCloud storage
-     * @param localPath  path of the file to upload in the device storage
-     * @return 1 if file status was updated, else 0.
-     */
-    public int updateUploadStatus(long id, UploadStatus status, UploadResult result, String remotePath,
-                                  String localPath) {
-        int returnValue = 0;
-        Cursor c = getDB().query(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                null,
-                ProviderTableMeta._ID + "=?",
-                new String[]{String.valueOf(id)},
-                null
-        );
-
-        if (c.getCount() != 1) {
-            Timber.e(c.getCount() + " items for id=" + id
-                    + " available in UploadDb. Expected 1. Failed to update upload db.");
-        } else {
-            returnValue = updateUploadInternal(c, status, result, remotePath, localPath);
-        }
-        c.close();
-        return returnValue;
-    }
-
     /**
      * Should be called when some value of this DB was changed. All observers
      * are informed.
@@ -231,64 +138,6 @@ public void notifyObserversNow() {
         notifyObservers();
     }
 
-    /**
-     * Remove an upload from the uploads list, known its target account and remote path.
-     *
-     * @param upload Upload instance to remove from persisted storage.
-     * @return true when the upload was stored and could be removed.
-     */
-    public int removeUpload(OCUpload upload) {
-        int result = getDB().delete(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta._ID + "=?",
-                new String[]{Long.toString(upload.getUploadId())}
-        );
-        Timber.d("delete returns " + result + " for upload " + upload);
-        if (result > 0) {
-            notifyObserversNow();
-        }
-        return result;
-    }
-
-    /**
-     * Remove an upload from the uploads list, known its target account and remote path.
-     *
-     * @param accountName Name of the OC account target of the upload to remove.
-     * @param remotePath  Absolute path in the OC account target of the upload to remove.
-     * @return true when one or more upload entries were removed
-     */
-    public int removeUpload(String accountName, String remotePath) {
-        int result = getDB().delete(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "=? AND " + ProviderTableMeta.UPLOADS_REMOTE_PATH + "=?",
-                new String[]{accountName, remotePath}
-        );
-        Timber.d("delete returns " + result + " for file " + remotePath + " in " + accountName);
-        if (result > 0) {
-            notifyObserversNow();
-        }
-        return result;
-    }
-
-    /**
-     * Remove all the uploads of a given account from the uploads list.
-     *
-     * @param accountName Name of the OC account target of the uploads to remove.
-     * @return true when one or more upload entries were removed
-     */
-    public int removeUploads(String accountName) {
-        int result = getDB().delete(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "=?",
-                new String[]{accountName}
-        );
-        Timber.d("delete returns " + result + " for uploads in " + accountName);
-        if (result > 0) {
-            notifyObserversNow();
-        }
-        return result;
-    }
-
     public OCUpload[] getAllStoredUploads() {
         return getUploads(null, null, null);
     }
@@ -368,19 +217,6 @@ public OCUpload[] getCurrentAndPendingUploads() {
         );
     }
 
-    /**
-     * Get all failed uploads.
-     */
-    public OCUpload[] getFailedUploads() {
-        return getUploads(
-                ProviderTableMeta.UPLOADS_STATUS + "== ?",
-                new String[]{
-                        String.valueOf(UploadStatus.UPLOAD_FAILED.value)
-                },
-                null
-        );
-    }
-
     /**
      * Get all uploads which where successfully completed.
      */
@@ -442,37 +278,4 @@ public long clearSuccessfulUploads() {
         }
         return result;
     }
-
-    /**
-     * Changes the status of any in progress upload from UploadStatus.UPLOAD_IN_PROGRESS
-     * to UploadStatus.UPLOAD_FAILED
-     *
-     * @return Number of uploads which status was changed.
-     */
-    public int failInProgressUploads(UploadResult uploadResult) {
-        Timber.v("Updating state of any killed upload");
-
-        ContentValues cv = new ContentValues();
-        cv.put(ProviderTableMeta.UPLOADS_STATUS, UploadStatus.UPLOAD_FAILED.getValue());
-        cv.put(
-                ProviderTableMeta.UPLOADS_LAST_RESULT,
-                uploadResult != null ? uploadResult.getValue() : UploadResult.UNKNOWN.getValue()
-        );
-        cv.put(ProviderTableMeta.UPLOADS_UPLOAD_END_TIMESTAMP, Calendar.getInstance().getTimeInMillis());
-
-        int result = getDB().update(
-                ProviderTableMeta.CONTENT_URI_UPLOADS,
-                cv,
-                ProviderTableMeta.UPLOADS_STATUS + "=?",
-                new String[]{String.valueOf(UploadStatus.UPLOAD_IN_PROGRESS.getValue())}
-        );
-
-        if (result == 0) {
-            Timber.v("No upload was killed");
-        } else {
-            Timber.w("%s uploads where abruptly interrupted", result);
-            notifyObserversNow();
-        }
-        return result;
-    }
 }

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/LocalDataSourceModule.kt

@@ -3,7 +3,9 @@
  *
  * @author David González Verdugo
  * @author Abel García de Prada
- * Copyright (C) 2021 ownCloud GmbH.
+ * @author Juan Carlos Garrote Gascón
+ *
+ * Copyright (C) 2022 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -26,18 +28,20 @@ import com.owncloud.android.MainApp.Companion.dataFolder
 import com.owncloud.android.data.OwncloudDatabase
 import com.owncloud.android.data.authentication.datasources.LocalAuthenticationDataSource
 import com.owncloud.android.data.authentication.datasources.implementation.OCLocalAuthenticationDataSource
-import com.owncloud.android.data.folderbackup.datasources.FolderBackupLocalDataSource
-import com.owncloud.android.data.folderbackup.datasources.implementation.FolderBackupLocalDataSourceImpl
 import com.owncloud.android.data.capabilities.datasources.LocalCapabilitiesDataSource
 import com.owncloud.android.data.capabilities.datasources.implementation.OCLocalCapabilitiesDataSource
 import com.owncloud.android.data.files.datasources.LocalFileDataSource
 import com.owncloud.android.data.files.datasources.implementation.OCLocalFileDataSource
+import com.owncloud.android.data.folderbackup.datasources.FolderBackupLocalDataSource
+import com.owncloud.android.data.folderbackup.datasources.implementation.FolderBackupLocalDataSourceImpl
 import com.owncloud.android.data.preferences.datasources.SharedPreferencesProvider
 import com.owncloud.android.data.preferences.datasources.implementation.SharedPreferencesProviderImpl
 import com.owncloud.android.data.sharing.shares.datasources.LocalShareDataSource
 import com.owncloud.android.data.sharing.shares.datasources.implementation.OCLocalShareDataSource
 import com.owncloud.android.data.storage.LocalStorageProvider
 import com.owncloud.android.data.storage.ScopedStorageProvider
+import com.owncloud.android.data.transfers.datasources.LocalTransferDataSource
+import com.owncloud.android.data.transfers.datasources.implementation.OCLocalTransferDataSource
 import com.owncloud.android.data.user.datasources.LocalUserDataSource
 import com.owncloud.android.data.user.datasources.implementation.OCLocalUserDataSource
 import org.koin.android.ext.koin.androidContext
@@ -51,6 +55,7 @@ val localDataSourceModule = module {
     single { OwncloudDatabase.getDatabase(androidContext()).shareDao() }
     single { OwncloudDatabase.getDatabase(androidContext()).userDao() }
     single { OwncloudDatabase.getDatabase(androidContext()).folderBackUpDao() }
+    single { OwncloudDatabase.getDatabase(androidContext()).transferDao() }
 
     single<SharedPreferencesProvider> { SharedPreferencesProviderImpl(get()) }
     single<LocalStorageProvider> { ScopedStorageProvider(dataFolder, androidContext()) }
@@ -61,4 +66,5 @@ val localDataSourceModule = module {
     factory<LocalShareDataSource> { OCLocalShareDataSource(get()) }
     factory<LocalUserDataSource> { OCLocalUserDataSource(get()) }
     factory<FolderBackupLocalDataSource> { FolderBackupLocalDataSourceImpl(get()) }
+    factory<LocalTransferDataSource> { OCLocalTransferDataSource(get()) }
 }

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt

@@ -2,7 +2,10 @@
  * ownCloud Android client application
  *
  * @author David González Verdugo
- * Copyright (C) 2020 ownCloud GmbH.
+ * @author Abel García de Prada
+ * @author Juan Carlos Garrote Gascón
+ *
+ * Copyright (C) 2022 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -27,6 +30,7 @@ import com.owncloud.android.data.oauth.OAuthRepositoryImpl
 import com.owncloud.android.data.server.repository.OCServerInfoRepository
 import com.owncloud.android.data.sharing.sharees.repository.OCShareeRepository
 import com.owncloud.android.data.sharing.shares.repository.OCShareRepository
+import com.owncloud.android.data.transfers.repository.OCTransferRepository
 import com.owncloud.android.data.user.repository.OCUserRepository
 import com.owncloud.android.domain.authentication.AuthenticationRepository
 import com.owncloud.android.domain.authentication.oauth.OAuthRepository
@@ -36,6 +40,7 @@ import com.owncloud.android.domain.files.FileRepository
 import com.owncloud.android.domain.server.ServerInfoRepository
 import com.owncloud.android.domain.sharing.sharees.ShareeRepository
 import com.owncloud.android.domain.sharing.shares.ShareRepository
+import com.owncloud.android.domain.transfers.TransferRepository
 import com.owncloud.android.domain.user.UserRepository
 import org.koin.dsl.module
 
@@ -49,4 +54,5 @@ val repositoryModule = module {
     factory<UserRepository> { OCUserRepository(get(), get()) }
     factory<OAuthRepository> { OAuthRepositoryImpl(get()) }
     factory<FolderBackupRepository> { FolderBackupRepositoryImpl(get()) }
+    factory<TransferRepository> { OCTransferRepository(get()) }
 }

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt

@@ -2,7 +2,10 @@
  * ownCloud Android client application
  *
  * @author David González Verdugo
- * Copyright (C) 2020 ownCloud GmbH.
+ * @author Abel García de Prada
+ * @author Juan Carlos Garrote Gascón
+ *
+ * Copyright (C) 2022 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -73,6 +76,7 @@ import com.owncloud.android.usecases.transfers.downloads.DownloadFileUseCase
 import com.owncloud.android.usecases.transfers.downloads.GetLiveDataForDownloadingFileUseCase
 import com.owncloud.android.usecases.transfers.downloads.GetLiveDataForFinishedDownloadsFromAccountUseCase
 import com.owncloud.android.usecases.transfers.uploads.CancelUploadForFileUseCase
+import com.owncloud.android.usecases.transfers.uploads.RetryUploadFromSystemUseCase
 import com.owncloud.android.usecases.transfers.uploads.UploadFileInConflictUseCase
 import com.owncloud.android.usecases.transfers.uploads.UploadFilesFromSAFUseCase
 import com.owncloud.android.usecases.transfers.uploads.UploadFilesFromSystemUseCase
@@ -131,10 +135,11 @@ val useCaseModule = module {
     factory { DownloadFileUseCase(get()) }
     factory { GetLiveDataForDownloadingFileUseCase(get()) }
     factory { GetLiveDataForFinishedDownloadsFromAccountUseCase(get()) }
-    factory { UploadFilesFromSAFUseCase(get()) }
-    factory { UploadFilesFromSystemUseCase(get()) }
-    factory { UploadFileInConflictUseCase(get()) }
-    factory { CancelUploadForFileUseCase(get()) }
+    factory { UploadFilesFromSAFUseCase(get(), get()) }
+    factory { UploadFilesFromSystemUseCase(get(), get()) }
+    factory { UploadFileInConflictUseCase(get(), get()) }
+    factory { CancelUploadForFileUseCase(get(), get()) }
+    factory { RetryUploadFromSystemUseCase(get(), get()) }
 
     // User
     factory { GetStoredQuotaUseCase(get()) }

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt

@@ -46,6 +46,7 @@ import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityVie
 import com.owncloud.android.presentation.viewmodels.settings.SettingsVideoUploadsViewModel
 import com.owncloud.android.presentation.viewmodels.settings.SettingsViewModel
 import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
+import com.owncloud.android.presentation.viewmodels.transfers.TransfersViewModel
 import com.owncloud.android.ui.dialog.RemoveAccountDialogViewModel
 import com.owncloud.android.ui.preview.PreviewImageViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -87,4 +88,5 @@ val viewModelModule = module {
     viewModel { FileDetailsViewModel(get(), get(), get(), get(), get()) }
     viewModel { FileOperationsViewModel(get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { MainFileListViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { TransfersViewModel(get(), get(), get()) }
 }

owncloudApp/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -28,6 +28,9 @@
 import android.content.Context;
 
 import androidx.work.WorkManager;
+import com.owncloud.android.data.OwncloudDatabase;
+import com.owncloud.android.data.transfers.datasources.implementation.OCLocalTransferDataSource;
+import com.owncloud.android.data.transfers.repository.OCTransferRepository;
 import com.owncloud.android.domain.files.model.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -229,7 +232,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
      */
     private void requestForUpload(OCFile file) {
         WorkManager workManager = WorkManager.getInstance(mContext);
-        UploadFileInConflictUseCase uploadFileInConflictUseCase = new UploadFileInConflictUseCase(workManager);
+        // Workaround... should be removed as soon as possible
+        OCTransferRepository transferRepository = new OCTransferRepository(new OCLocalTransferDataSource(OwncloudDatabase.Companion.getDatabase(mContext).transferDao()));
+        UploadFileInConflictUseCase uploadFileInConflictUseCase = new UploadFileInConflictUseCase(workManager, transferRepository);
         UploadFileInConflictUseCase.Params params = new UploadFileInConflictUseCase.Params(
                 file.getOwner(),
                 file.getStoragePath(),