chore: update check for isDefaultTestDescriptor

aanorbel · aanorbel · commit 1323b3b5f947 · 2024-12-04T17:10:06.000+01:00
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt
@@ -42,6 +42,10 @@ enum class OoniTest(val id: Long, val key: String) {
         private val map = entries.associateBy(OoniTest::id)
 
         fun fromId(id: Long) = map[id]
+
+        fun isValidId(id: Long): Boolean {
+            return entries.any { it.id == id }
+        }
     }
 }
 
@@ -72,7 +76,7 @@ data class InstalledTestDescriptorModel(
 
     val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now()
 
-    val isDefaultTestDescriptor get() = id.value in 10470..10474 // TODO(aanorbel): switch to OONI reserved namespace
+    val isDefaultTestDescriptor get() = OoniTest.isValidId(id.value)
 
     val key get() = OoniTest.fromId(id.value)?.key ?: id.value.toString()
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ enum class OoniTest(val id: Long, val key: String) {`
`42`	`42`	`private val map = entries.associateBy(OoniTest::id)`
`43`	`43`
`44`	`44`	`fun fromId(id: Long) = map[id]`
	`45`	`+`
	`46`	`+ fun isValidId(id: Long): Boolean {`
	`47`	`+ return entries.any { it.id == id }`
	`48`	`+ }`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`
`@@ -72,7 +76,7 @@ data class InstalledTestDescriptorModel(`
`72`	`76`
`73`	`77`	`val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now()`
`74`	`78`
`75`		`- val isDefaultTestDescriptor get() = id.value in 10470..10474 // TODO(aanorbel): switch to OONI reserved namespace`
	`79`	`+ val isDefaultTestDescriptor get() = OoniTest.isValidId(id.value)`
`76`	`80`
`77`	`81`	`val key get() = OoniTest.fromId(id.value)?.key ?: id.value.toString()`
`78`	`82`