chore: change type of SessionCongig

ooni · Aug 5, 2024 · a36fba3 · a36fba3
1 parent e1441cc
commit a36fba3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 49 deletions.
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/engine/Engine.kt b/composeApp/src/commonMain/kotlin/org/ooni/engine/Engine.kt
@@ -66,41 +66,31 @@ class Engine(
 
     fun session(finalSettings: TaskSettings): OonimkallBridge.Session {
         return bridge.newSession(
-            object : OonimkallBridge.SessionConfig {
-                override val softwareName: String
-                    get() = finalSettings.options.softwareName
-                override val softwareVersion: String
-                    get() = finalSettings.options.softwareVersion
-                override val proxy: String?
-                    get() = null
-                override val probeServicesURL: String?
-                    get() = "https://api.prod.ooni.io"
-                override val assetsDir: String
-                    get() = finalSettings.assetsDir.toString()
-                override val stateDir: String
-                    get() = finalSettings.stateDir.toString()
-                override val tempDir: String
-                    get() = finalSettings.tempDir.toString()
-                override val tunnelDir: String
-                    get() = finalSettings.tunnelDir.toString()
-                override val logger: OonimkallBridge.Logger?
-                    get() =
-                        object : OonimkallBridge.Logger {
-                            override fun debug(msg: String?) {
-                                println("DEBUG: $msg")
-                            }
-
-                            override fun info(msg: String?) {
-                                println("INFO: $msg")
-                            }
-
-                            override fun warn(msg: String?) {
-                                println("WARN: $msg")
-                            }
+            OonimkallBridge.SessionConfig(
+                softwareName = finalSettings.options.softwareName,
+                softwareVersion = finalSettings.options.softwareVersion,
+                proxy = null,
+                probeServicesURL = "https://api.prod.ooni.io",
+                assetsDir = finalSettings.assetsDir.toString(),
+                stateDir = finalSettings.stateDir.toString(),
+                tempDir = finalSettings.tempDir.toString(),
+                tunnelDir = finalSettings.tunnelDir.toString(),
+                logger =
+                    object : OonimkallBridge.Logger {
+                        override fun debug(msg: String?) {
+                            msg?.let { Logger.d(it) }
                         }
-                override val verbose: Boolean
-                    get() = true
-            },
+
+                        override fun info(msg: String?) {
+                            msg?.let { Logger.d(it) }
+                        }
+
+                        override fun warn(msg: String?) {
+                            msg?.let { Logger.d(it) }
+                        }
+                    },
+                verbose = true,
+            ),
         )
     }
 

diff --git a/composeApp/src/commonMain/kotlin/org/ooni/engine/OonimkallBridge.kt b/composeApp/src/commonMain/kotlin/org/ooni/engine/OonimkallBridge.kt
@@ -23,21 +23,18 @@ interface OonimkallBridge {
         fun warn(msg: String?)
     }
 
-    interface SessionConfig {
-        val softwareName: String
-        val softwareVersion: String
-
-        val proxy: String?
-        val probeServicesURL: String?
-
-        val assetsDir: String
-        val stateDir: String
-        val tempDir: String
-        val tunnelDir: String
-
-        val logger: Logger?
-        val verbose: Boolean
-    }
+    data class SessionConfig(
+        val softwareName: String,
+        val softwareVersion: String,
+        val proxy: String?,
+        val probeServicesURL: String?,
+        val assetsDir: String,
+        val stateDir: String,
+        val tempDir: String,
+        val tunnelDir: String,
+        val logger: Logger?,
+        val verbose: Boolean,
+    )
 
     interface Session {
         @Throws(Exception::class)