Don't retry failed uploads when they are removed or cleared

owncloud · Aug 26, 2022 · 977bffe · 977bffe
1 parent 4010b17
commit 977bffe
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 57 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt
@@ -69,9 +69,8 @@ import com.owncloud.android.domain.sharing.shares.usecases.EditPublicShareAsyncU
 import com.owncloud.android.domain.sharing.shares.usecases.GetShareAsLiveDataUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.GetSharesAsLiveDataUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.RefreshSharesFromServerAsyncUseCase
-import com.owncloud.android.domain.transfers.usecases.ClearFailedTransfersUseCase
+import com.owncloud.android.usecases.transfers.uploads.ClearFailedTransfersUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransfersUseCase
-import com.owncloud.android.domain.transfers.usecases.DeleteTransferWithIdUseCase
 import com.owncloud.android.domain.transfers.usecases.GetAllTransfersAsLiveDataUseCase
 import com.owncloud.android.domain.transfers.usecases.UpdatePendingUploadsPathUseCase
 import com.owncloud.android.domain.user.usecases.GetStoredQuotaUseCase
@@ -168,8 +167,7 @@ val useCaseModule = module {
     factory { RetryUploadFromContentUriUseCase(get(), get(), get()) }
     factory { GetAllTransfersAsLiveDataUseCase(get()) }
     factory { CancelUploadWithIdUseCase(get(), get()) }
-    factory { DeleteTransferWithIdUseCase(get()) }
-    factory { ClearFailedTransfersUseCase(get()) }
+    factory { ClearFailedTransfersUseCase(get(), get()) }
     factory { RetryFailedUploadsUseCase(get(), get(), get(), get()) }
     factory { ClearSuccessfulTransfersUseCase(get()) }
     factory { CancelUploadsFromAccountUseCase(get(), get()) }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt
@@ -89,5 +89,5 @@ val viewModelModule = module {
     viewModel { FileDetailsViewModel(get(), get(), get(), get(), get()) }
     viewModel { FileOperationsViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { (accountName: String, initialFolderToDisplay: OCFile) -> MainFileListViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), accountName, initialFolderToDisplay) }
-    viewModel { TransfersViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { TransfersViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
 }
diff --git a/...pp/src/main/java/com/owncloud/android/presentation/adapters/transfers/TransfersAdapter.kt b/...pp/src/main/java/com/owncloud/android/presentation/adapters/transfers/TransfersAdapter.kt
@@ -49,7 +49,6 @@ import java.io.File
 
 class TransfersAdapter(
     val cancel: (Long) -> Unit,
-    val delete: (Long) -> Unit,
     val retry: (OCTransfer) -> Unit,
     val clearFailed: () -> Unit,
     val retryFailed: () -> Unit,
@@ -141,7 +140,7 @@ class TransfersAdapter(
                             uploadRightButton.apply {
                                 setImageResource(R.drawable.ic_action_delete_grey)
                                 setOnClickListener {
-                                    delete(transferItem.transfer.id!!)
+                                    cancel(transferItem.transfer.id!!)
                                 }
                             }
                             holder.itemView.setOnClickListener {

diff --git a/...dApp/src/main/java/com/owncloud/android/presentation/ui/transfers/TransferListFragment.kt b/...dApp/src/main/java/com/owncloud/android/presentation/ui/transfers/TransferListFragment.kt
@@ -63,9 +63,6 @@ class TransferListFragment : Fragment() {
             cancel = { id ->
                 transfersViewModel.cancelTransferWithId(id)
             },
-            delete = { id ->
-                transfersViewModel.deleteTransferWithId(id)
-            },
             retry = { transfer: OCTransfer ->
                 if (transfer.lastResult == TransferResult.CREDENTIAL_ERROR) {
                     val parentActivity = requireActivity() as FileActivity

diff --git a/...rc/main/java/com/owncloud/android/presentation/viewmodels/transfers/TransfersViewModel.kt b/...rc/main/java/com/owncloud/android/presentation/viewmodels/transfers/TransfersViewModel.kt
@@ -28,9 +28,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkInfo
 import com.owncloud.android.domain.transfers.model.OCTransfer
-import com.owncloud.android.domain.transfers.usecases.ClearFailedTransfersUseCase
+import com.owncloud.android.usecases.transfers.uploads.ClearFailedTransfersUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransfersUseCase
-import com.owncloud.android.domain.transfers.usecases.DeleteTransferWithIdUseCase
 import com.owncloud.android.domain.transfers.usecases.GetAllTransfersAsLiveDataUseCase
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import com.owncloud.android.providers.WorkManagerProvider
@@ -48,7 +47,6 @@ class TransfersViewModel(
     private val uploadFilesFromContentUriUseCase: UploadFilesFromContentUriUseCase,
     private val uploadFilesFromSystemUseCase: UploadFilesFromSystemUseCase,
     private val cancelUploadWithIdUseCase: CancelUploadWithIdUseCase,
-    private val deleteTransferWithIdUseCase: DeleteTransferWithIdUseCase,
     private val retryUploadFromSystemUseCase: RetryUploadFromSystemUseCase,
     private val retryUploadFromContentUriUseCase: RetryUploadFromContentUriUseCase,
     private val clearFailedTransfersUseCase: ClearFailedTransfersUseCase,
@@ -130,14 +128,6 @@ class TransfersViewModel(
         }
     }
 
-    fun deleteTransferWithId(id: Long) {
-        viewModelScope.launch(coroutinesDispatcherProvider.io) {
-            deleteTransferWithIdUseCase.execute(
-                DeleteTransferWithIdUseCase.Params(id = id)
-            )
-        }
-    }
-
     fun retryUploadFromSystem(id: Long) {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             retryUploadFromSystemUseCase.execute(

diff --git a/...s/usecases/ClearFailedTransfersUseCase.kt → ...rs/uploads/ClearFailedTransfersUseCase.kt b/...s/usecases/ClearFailedTransfersUseCase.kt → ...rs/uploads/ClearFailedTransfersUseCase.kt
@@ -18,15 +18,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.owncloud.android.domain.transfers.usecases
+package com.owncloud.android.usecases.transfers.uploads
 
+import androidx.work.WorkManager
 import com.owncloud.android.domain.BaseUseCase
 import com.owncloud.android.domain.transfers.TransferRepository
 
 class ClearFailedTransfersUseCase(
+    private val workManager: WorkManager,
     private val transferRepository: TransferRepository,
 ) : BaseUseCase<Unit, Unit>() {
-    override fun run(params: Unit): Unit =
+    override fun run(params: Unit) {
+        val failedTransfers = transferRepository.getFailedTransfers()
+        failedTransfers.forEach { failedTransfer ->
+            workManager.cancelAllWorkByTag(failedTransfer.id.toString())
+        }
         transferRepository.clearFailedTransfers()
-
+    }
 }
diff --git a/...c/main/java/com/owncloud/android/domain/transfers/usecases/DeleteTransferWithIdUseCase.kt b/...c/main/java/com/owncloud/android/domain/transfers/usecases/DeleteTransferWithIdUseCase.kt