Delete all results

composeApp/src/commonMain/composeResources/drawable/ic_delete_all.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M376,660L480,556L584,660L640,604L536,500L640,396L584,340L480,444L376,340L320,396L424,500L320,604L376,660ZM280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>

composeApp/src/commonMain/composeResources/values/strings-common.xml

@@ -40,6 +40,7 @@
 
     <string name="TestResults_Overview_Title">Test Results</string>
     <string name="TestResults_Overview_Tab_Label">Test Results</string>
+    <string name="TestResults_Overview_NoTestsHaveBeenRun">No tests have been run yet. Try running one!</string>
     <string name="TestResults_UnknownASN">Unknown</string>
     <string name="TestResults_NotAvailable">N/A</string>
 
@@ -162,6 +163,8 @@
     <string name="Modal_Retry">Retry</string>
     <string name="Modal_Cancel">Cancel</string>
     <string name="Modal_OK">OK</string>
+    <string name="Modal_DoYouWantToDeleteAllTests">Do you want to delete all test results?</string>
+    <string name="Modal_Delete">Delete</string>
 
     <string name="Modal_Error_CantDownloadURLs">Unable to download URL list. Please try again.</string>
 

composeApp/src/commonMain/kotlin/org/ooni/probe/data/disk/DeleteFile.kt → composeApp/src/commonMain/kotlin/org/ooni/probe/data/disk/DeleteFiles.kt

@@ -4,15 +4,15 @@ import okio.FileSystem
 import okio.Path
 import okio.Path.Companion.toPath
 
-interface DeleteFile {
+interface DeleteFiles {
     suspend operator fun invoke(path: Path)
 }
 
-class DeleteFileOkio(
+class DeleteFilesOkio(
     private val fileSystem: FileSystem,
     private val baseFilesDir: String,
-) : DeleteFile {
+) : DeleteFiles {
     override suspend fun invoke(path: Path) {
-        fileSystem.delete(baseFilesDir.toPath().resolve(path))
+        fileSystem.deleteRecursively(baseFilesDir.toPath().resolve(path))
     }
 }

composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/ResultRepository.kt

@@ -92,6 +92,16 @@ class ResultRepository(
             database.resultQueries.deleteByRunId(resultId.value)
         }
 
+    suspend fun deleteAll() {
+        withContext(backgroundDispatcher) {
+            database.transaction {
+                database.measurementQueries.deleteAll()
+                database.resultQueries.deleteAll()
+                database.networkQueries.deleteAll()
+            }
+        }
+    }
+
     private fun Result.toModel(): ResultModel? {
         return ResultModel(
             id = ResultModel.Id(id),

composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt

@@ -21,8 +21,8 @@ import org.ooni.engine.NetworkTypeFinder
 import org.ooni.engine.OonimkallBridge
 import org.ooni.engine.TaskEventMapper
 import org.ooni.probe.Database
-import org.ooni.probe.data.disk.DeleteFile
-import org.ooni.probe.data.disk.DeleteFileOkio
+import org.ooni.probe.data.disk.DeleteFiles
+import org.ooni.probe.data.disk.DeleteFilesOkio
 import org.ooni.probe.data.disk.ReadFile
 import org.ooni.probe.data.disk.ReadFileOkio
 import org.ooni.probe.data.disk.WriteFile
@@ -39,6 +39,7 @@ import org.ooni.probe.data.repositories.ResultRepository
 import org.ooni.probe.data.repositories.TestDescriptorRepository
 import org.ooni.probe.data.repositories.UrlRepository
 import org.ooni.probe.domain.BootstrapTestDescriptors
+import org.ooni.probe.domain.DeleteAllResults
 import org.ooni.probe.domain.DeleteTestDescriptor
 import org.ooni.probe.domain.DownloadUrls
 import org.ooni.probe.domain.FetchDescriptor
@@ -109,7 +110,7 @@ class Dependencies(
 
     private val readFile: ReadFile by lazy { ReadFileOkio(FileSystem.SYSTEM, baseFileDir) }
     private val writeFile: WriteFile by lazy { WriteFileOkio(FileSystem.SYSTEM, baseFileDir) }
-    private val deleteFile: DeleteFile by lazy { DeleteFileOkio(FileSystem.SYSTEM, baseFileDir) }
+    private val deleteFiles: DeleteFiles by lazy { DeleteFilesOkio(FileSystem.SYSTEM, baseFileDir) }
 
     // Engine
 
@@ -147,6 +148,9 @@ class Dependencies(
             urlRepository::createOrUpdateByUrl,
         )
     }
+    private val deleteAllResults by lazy {
+        DeleteAllResults(resultRepository::deleteAll, deleteFiles::invoke)
+    }
     private val fetchDescriptor by lazy {
         FetchDescriptor(
             engineHttpDo = engine::httpDo,
@@ -202,7 +206,7 @@ class Dependencies(
             storeMeasurement = measurementRepository::createOrUpdate,
             storeNetwork = networkRepository::createIfNew,
             writeFile = writeFile,
-            deleteFile = deleteFile,
+            deleteFiles = deleteFiles,
             json = json,
             spec = spec,
         )
@@ -235,7 +239,7 @@ class Dependencies(
             deleteMeasurementByResultRunId = measurementRepository::deleteByResultRunId,
             selectMeasurementsByResultRunId = measurementRepository::selectByResultRunId,
             deleteResultByRunId = resultRepository::deleteByRunId,
-            deleteFile = deleteFile::invoke,
+            deleteFile = deleteFiles::invoke,
         )
     }
 
@@ -253,7 +257,7 @@ class Dependencies(
             getMeasurementsNotUploaded = measurementRepository.listNotUploaded(),
             submitMeasurement = engine::submitMeasurements,
             readFile = readFile,
-            deleteFile = deleteFile,
+            deleteFiles = deleteFiles,
             updateMeasurement = measurementRepository::createOrUpdate,
         )
     }
@@ -299,6 +303,7 @@ class Dependencies(
         goToResult = goToResult,
         goToUpload = goToUpload,
         getResults = getResults::invoke,
+        deleteAllResults = deleteAllResults::invoke,
     )
 
     fun runningViewModel(

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/DeleteAllResults.kt

@@ -0,0 +1,14 @@
+package org.ooni.probe.domain
+
+import okio.Path
+import okio.Path.Companion.toPath
+
+class DeleteAllResults(
+    private val deleteAllResultsFromDatabase: suspend () -> Unit,
+    private val deleteFiles: suspend (Path) -> Unit,
+) {
+    suspend operator fun invoke() {
+        deleteAllResultsFromDatabase()
+        deleteFiles("Measurement".toPath())
+    }
+}

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/RunNetTest.kt

@@ -9,7 +9,7 @@ import kotlinx.serialization.json.Json
 import org.ooni.engine.models.TaskEvent
 import org.ooni.engine.models.TaskEventResult
 import org.ooni.engine.models.TaskOrigin
-import org.ooni.probe.data.disk.DeleteFile
+import org.ooni.probe.data.disk.DeleteFiles
 import org.ooni.probe.data.disk.WriteFile
 import org.ooni.probe.data.models.Descriptor
 import org.ooni.probe.data.models.InstalledTestDescriptorModel
@@ -29,7 +29,7 @@ class RunNetTest(
     private val storeResult: suspend (ResultModel) -> ResultModel.Id,
     private val setCurrentTestState: ((TestRunState) -> TestRunState) -> Unit,
     private val writeFile: WriteFile,
-    private val deleteFile: DeleteFile,
+    private val deleteFiles: DeleteFiles,
     private val json: Json,
     private val spec: Specification,
 ) {
@@ -252,7 +252,7 @@ class RunNetTest(
             is TaskEvent.TaskTerminated -> {
                 val measurement = measurements[event.index] ?: return
                 if (measurement.isUploaded) {
-                    measurement.reportFilePath?.let { deleteFile(it) }
+                    measurement.reportFilePath?.let { deleteFiles(it) }
                 }
             }
         }

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/UploadMissingMeasurements.kt

@@ -6,15 +6,15 @@ import kotlinx.coroutines.flow.first
 import org.ooni.engine.Engine.MkException
 import org.ooni.engine.OonimkallBridge.SubmitMeasurementResults
 import org.ooni.engine.models.Result
-import org.ooni.probe.data.disk.DeleteFile
+import org.ooni.probe.data.disk.DeleteFiles
 import org.ooni.probe.data.disk.ReadFile
 import org.ooni.probe.data.models.MeasurementModel
 
 class UploadMissingMeasurements(
     private val getMeasurementsNotUploaded: Flow<List<MeasurementModel>>,
     private val submitMeasurement: suspend (String) -> Result<SubmitMeasurementResults, MkException>,
     private val readFile: ReadFile,
-    private val deleteFile: DeleteFile,
+    private val deleteFiles: DeleteFiles,
     private val updateMeasurement: suspend (MeasurementModel) -> Unit,
 ) {
     operator fun invoke(): Flow<State> =
@@ -49,7 +49,7 @@ class UploadMissingMeasurements(
                                 reportId = MeasurementModel.ReportId(submitResult.updatedReportId),
                             ),
                         )
-                        deleteFile(reportFilePath)
+                        deleteFiles(reportFilePath)
                     }
                     .onFailure { exception ->
                         failedToUpload++