Persist rejected descriptor updates (#425)

Co-authored-by: Norbel Ambanumben <[email protected]>

Author: sdsantos

composeApp/src/androidMain/kotlin/org/ooni/probe/AndroidApplication.kt

@@ -52,7 +52,7 @@ class AndroidApplication : Application() {
             startSingleRunInner = appWorkerManager::startSingleRun,
             configureAutoRun = appWorkerManager::configureAutoRun,
             configureDescriptorAutoUpdate = appWorkerManager::configureDescriptorAutoUpdate,
-            fetchDescriptorUpdate = appWorkerManager::fetchDescriptorUpdate,
+            startDescriptorsUpdate = appWorkerManager::startDescriptorsUpdate,
             launchAction = ::launchAction,
             batteryOptimization = batteryOptimization,
             flavorConfig = FlavorConfig(),

composeApp/src/androidMain/kotlin/org/ooni/probe/background/AppWorkerManager.kt

@@ -78,7 +78,7 @@ class AppWorkerManager(
         }
     }
 
-    suspend fun fetchDescriptorUpdate(descriptors: List<InstalledTestDescriptorModel>?) {
+    suspend fun startDescriptorsUpdate(descriptors: List<InstalledTestDescriptorModel>?) {
         withContext(backgroundDispatcher) {
             workManager
                 .enqueueUniqueWork(

composeApp/src/commonMain/composeResources/drawable-hdpi/.gitignore

@@ -1,5 +1,4 @@
 
 onboarding1.webp
 onboarding2.webp
-onboarding3.webp
-onboarding.webp
+onboarding3.webp

composeApp/src/commonMain/composeResources/drawable-hdpi/onboarding.webp

@@ -1,5 +1,4 @@
 
 onboarding1.webp
 onboarding2.webp
-onboarding3.webp
-onboarding.webp
+onboarding3.webp

composeApp/src/commonMain/composeResources/drawable-mdpi/.gitignore

@@ -1,5 +1,4 @@
 
 onboarding1.webp
 onboarding2.webp
-onboarding3.webp
-onboarding.webp
+onboarding3.webp

composeApp/src/commonMain/composeResources/drawable-mdpi/onboarding.webp

@@ -1,5 +1,4 @@
 
 onboarding1.webp
 onboarding2.webp
-onboarding3.webp
-onboarding.webp
+onboarding3.webp

composeApp/src/commonMain/composeResources/drawable-xhdpi/.gitignore

@@ -1,5 +1,4 @@
 
 onboarding1.webp
 onboarding2.webp
-onboarding3.webp
-onboarding.webp
+onboarding3.webp

composeApp/src/commonMain/composeResources/drawable-xhdpi/onboarding.webp

@@ -327,10 +327,13 @@
     <string name="Modal_EnableNotifications_Title">Get updates on internet censorship</string>
 
     <string name="Dashboard_Runv2_Overview_LastUpdated">Last updated %1$s</string>
+    <string name="Dashboard_Runv2_Overview_RejectedUpdate">Rejected update</string>
+    <string name="Dashboard_Runv2_Overview_UndoRejectedUpdate">Undo</string>
     <string name="Dashboard_RunTests_RunButton_Label_One">Run %1$d test</string>
     <string name="Dashboard_RunTests_RunButton_Label_Other">Run %1$d tests</string>
     <string name="Dashboard_Update_Ready">The app update has just been downloaded</string>
     <string name="Dashboard_Update_Restart">Restart</string>
+    <string name="Dashboard_ReviewDescriptor_Reject">Reject Update</string>
 
     <string name="AddDescriptor_Toasts_Unsupported_Url">Unsupported URL</string>
 

composeApp/src/commonMain/composeResources/drawable-xxhdpi/.gitignore

@@ -99,7 +99,7 @@ fun App(
         dependencies.bootstrapTestDescriptors()
         dependencies.bootstrapPreferences()
         dependencies.configureDescriptorAutoUpdate()
-        dependencies.fetchDescriptorUpdate(null)
+        dependencies.startDescriptorsUpdate(null)
         dependencies.startSingleRunInner(RunSpecification.OnlyUploadMissingResults)
     }
     LaunchedEffect(Unit) {

composeApp/src/commonMain/composeResources/drawable-xxhdpi/onboarding.webp

@@ -34,14 +34,8 @@ data class Descriptor(
 
     val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now()
 
-    val updatable get() = updatedDescriptor != null
-
     val updatedDescriptor
-        get() = when (updateStatus) {
-            is UpdateStatus.Updatable -> updateStatus.updatedDescriptor
-            is UpdateStatus.UpdateRejected -> updateStatus.updatedDescriptor
-            else -> null
-        }
+        get() = (updateStatus as? UpdateStatus.Updatable)?.updatedDescriptor
 
     val key: String
         get() = when (source) {

composeApp/src/commonMain/composeResources/drawable-xxxhdpi/.gitignore

@@ -0,0 +1,7 @@
+package org.ooni.probe.data.models
+
+enum class DescriptorUpdateOperationState {
+    Idle,
+    FetchingUpdates,
+    ReviewNecessaryNotice,
+}

composeApp/src/commonMain/composeResources/drawable-xxxhdpi/onboarding.webp

@@ -0,0 +1,15 @@
+package org.ooni.probe.data.models
+
+data class DescriptorsUpdateState(
+    val availableUpdates: List<InstalledTestDescriptorModel> = emptyList(),
+    val autoUpdated: List<InstalledTestDescriptorModel> = emptyList(),
+    val operationState: DescriptorUpdateOperationState = DescriptorUpdateOperationState.Idle,
+) {
+    private val availableUpdatesMap = availableUpdates.associateBy { it.id.value }
+    private val autoUpdatesMap = autoUpdated.associateBy { it.id.value }
+
+    fun getStatusOf(id: InstalledTestDescriptorModel.Id): UpdateStatus =
+        autoUpdatesMap[id.value]?.let { UpdateStatus.AutoUpdated }
+            ?: availableUpdatesMap[id.value]?.let { UpdateStatus.Updatable(it) }
+            ?: UpdateStatus.NoNewUpdate
+}

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

@@ -44,6 +44,7 @@ data class InstalledTestDescriptorModel(
     val dateCreated: LocalDateTime?,
     val dateUpdated: LocalDateTime?,
     val revisions: List<String>? = emptyList(),
+    val rejectedRevision: Long? = null,
     val autoUpdate: Boolean,
 ) {
     @Serializable
@@ -145,4 +146,5 @@ fun InstalledTestDescriptorModel.toDb(json: Json) =
             Logger.e(e) { "Failed to encode revisions" }
             null
         },
+        rejected_revision = rejectedRevision,
     )

composeApp/src/commonMain/kotlin/org/ooni/probe/App.kt

@@ -1,15 +1,13 @@
 package org.ooni.probe.data.models
 
-sealed class UpdateStatus {
-    data object Unknown : UpdateStatus()
+sealed interface UpdateStatus {
+    data object Unknown : UpdateStatus
 
-    data object UpToDate : UpdateStatus()
+    data object NoNewUpdate : UpdateStatus
 
-    data class Updatable(val updatedDescriptor: InstalledTestDescriptorModel) : UpdateStatus()
+    data class Updatable(val updatedDescriptor: InstalledTestDescriptorModel) : UpdateStatus
 
-    data object AutoUpdated : UpdateStatus()
+    data object AutoUpdated : UpdateStatus
 
-    data object NotApplicable : UpdateStatus()
-
-    data class UpdateRejected(val updatedDescriptor: InstalledTestDescriptorModel) : UpdateStatus()
+    data object NotApplicable : UpdateStatus
 }

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/Descriptor.kt

@@ -73,6 +73,7 @@ class TestDescriptorRepository(
                         date_updated = installedModel.date_updated,
                         auto_update = installedModel.auto_update,
                         revisions = installedModel.revisions,
+                        rejected_revision = installedModel.rejected_revision,
                     )
                 }
             }
@@ -103,6 +104,7 @@ class TestDescriptorRepository(
                         date_updated = installedModel.date_updated,
                         auto_update = installedModel.auto_update,
                         revisions = installedModel.revisions,
+                        rejected_revision = installedModel.rejected_revision,
                     )
                     database.testDescriptorQueries.clearOldNetTests(
                         installedModel.runId,
@@ -125,6 +127,18 @@ class TestDescriptorRepository(
         }
     }
 
+    suspend fun updateRejectedRevision(
+        runId: InstalledTestDescriptorModel.Id,
+        rejectedRevision: Long?,
+    ) {
+        withContext(backgroundContext) {
+            database.testDescriptorQueries.updateRejectedRevision(
+                runId = runId.value,
+                rejected_revision = rejectedRevision,
+            )
+        }
+    }
+
     suspend fun deleteByRunId(runId: InstalledTestDescriptorModel.Id) {
         withContext(backgroundContext) {
             database.testDescriptorQueries.deleteByRunId(runId.value)
@@ -160,5 +174,6 @@ class TestDescriptorRepository(
                     emptyList()
                 }
             },
+            rejectedRevision = rejected_revision,
         )
 }