Skip to content

Commit

Permalink
Merge pull request #162 from ooni/fix-test-keys-json
Browse files Browse the repository at this point in the history
Fix TestKeys Tampering json deserialization
  • Loading branch information
sdsantos authored Oct 9, 2024
2 parents 5da6e1c + ad1821b commit 81bad09
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.SerializationException
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonDecoder
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.booleanOrNull
import kotlinx.serialization.json.decodeFromJsonElement
import org.ooni.probe.di.Dependencies

@Serializable
data class TestKeys(
Expand Down Expand Up @@ -112,7 +112,8 @@ object TamperingSerializer : KSerializer<TestKeys.Tampering> {
TestKeys.Tampering(element.booleanOrNull == true)

is JsonObject -> {
val keys = Json.decodeFromJsonElement<TestKeys.TamperingKeys>(element)
val keys = Dependencies.buildJson()
.decodeFromJsonElement<TestKeys.TamperingKeys>(element)
TestKeys.Tampering(keys.value)
}

Expand Down

0 comments on commit 81bad09

Please sign in to comment.