Merge pull request #552 from ooni/fix-null-test-keys-crash

Handle invalid test_keys values. Do not store empty test_keys map.

Author: sdsantos

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

@@ -2,6 +2,7 @@ package org.ooni.probe.data.repositories
 
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
+import co.touchlab.kermit.Logger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
@@ -180,7 +181,7 @@ class MeasurementRepository(
             id = MeasurementModel.Id(id),
             resultId = result_id?.let(ResultModel::Id) ?: return null,
             testName = test_name,
-            testKeys = test_keys?.let { json.decodeFromString<TestKeys>(it) },
+            testKeys = test_keys?.let(::decodeTestKeys),
             descriptorName = descriptor_name,
             descriptorRunId = descriptor_runId?.let(InstalledTestDescriptorModel::Id),
         )
@@ -191,9 +192,19 @@ class MeasurementRepository(
             id = MeasurementModel.Id(id),
             resultId = result_id?.let(ResultModel::Id) ?: return null,
             testName = test_name,
-            testKeys = test_keys?.let { json.decodeFromString<TestKeys>(it) },
+            testKeys = test_keys?.let(::decodeTestKeys),
             descriptorName = descriptor_name,
             descriptorRunId = descriptor_runId?.let(InstalledTestDescriptorModel::Id),
         )
     }
+
+    private fun decodeTestKeys(value: String): TestKeys? {
+        if (value == "null") return null // Due to a past bug
+        return try {
+            json.decodeFromString<TestKeys>(value)
+        } catch (e: Exception) {
+            Logger.e("Invalid stored test_keys", e)
+            null
+        }
+    }
 }

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

@@ -178,7 +178,11 @@ class RunNetTest(
                         event.result.testKeys?.let {
                             val testKeys = extractTestKeysPropertiesToJson(it)
                             measurement = measurement.copy(
-                                testKeys = json.encodeToString(testKeys),
+                                testKeys = if (testKeys.isEmpty()) {
+                                    null
+                                } else {
+                                    json.encodeToString(testKeys)
+                                },
                             )
                         }