Merge pull request #157 from Infomaniak/fix-remove-old-data

fix: Remove old data with db data
Infomaniak · Nov 13, 2024 · ff90f33 · ff90f33
2 parents b451d8b + 40e4715
commit ff90f33
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt
@@ -92,7 +92,7 @@ class ImportFilesViewModel @Inject constructor(
                 isFirstViewModelCreation = false
                 // Remove old imported files in case it would've crashed or similar to start with a clean slate. This is required
                 // for already imported files restoration to not pick up old files in some extreme cases.
-                importationFilesManager.removeLocalCopyFolder()
+                removeOldData()
             } else {
                 importationFilesManager.restoreAlreadyImportedFiles()
             }
@@ -129,6 +129,11 @@ class ImportFilesViewModel @Inject constructor(
         }
     }
 
+    private suspend fun removeOldData() {
+        importationFilesManager.removeLocalCopyFolder()
+        uploadManager.removeAllUploadSession()
+    }
+
     private fun generateNewUploadSession(): NewUploadSession {
         return NewUploadSession(
             duration = "30",

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadProgressViewModel.kt b/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadProgressViewModel.kt
@@ -67,7 +67,7 @@ class UploadProgressViewModel @Inject constructor(
 
         viewModelScope.launch(ioDispatcher) {
             uploadManager.getLastUpload()?.let {
-                uploadManager.deleteUploadSession(it.uuid)
+                uploadManager.removeUploadSession(it.uuid)
             }
         }
     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/workers/UploadFileTask.kt b/app/src/main/java/com/infomaniak/swisstransfer/workers/UploadFileTask.kt
@@ -135,7 +135,7 @@ class UploadFileTask(
     }
 
     private suspend inline fun throwAndDestroyUpload(uploadUuid: String, throwMessage: String): Nothing {
-        uploadManager.deleteUploadSession(uploadUuid)
+        uploadManager.removeUploadSession(uploadUuid)
         error(throwMessage)
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ qrose = "1.0.1"
 recaptcha = "18.6.1"
 sentry = "4.12.0"
 serialization = "1.7.1"
-swisstransfer = "0.7.1"
+swisstransfer = "0.7.2"
 workmanager = "2.9.1"
 
 [libraries]