Fix concurrency tests

librespeed · May 15, 2024 · 29b73bf · 29b73bf
1 parent b787fab
commit 29b73bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main/kotlin/core/Service.kt b/src/main/kotlin/core/Service.kt
@@ -47,6 +47,7 @@ object Service {
 
     var goToResult : () -> Unit = {}
     var onError : (String?) -> Unit = {}
+    var onEnableAbort : () -> Unit = {}
 
     fun init () {
         speedTestHandler = SpeedTestHandler()
@@ -80,10 +81,9 @@ object Service {
 
     fun startFetchServers (finished : () -> Unit) {
         CoroutineScope(Dispatchers.IO).launch {
-            speedTestHandler.startup()
             speedTestHandler.setOnServerSelectListener(object : SpeedTestHandler.OnServerSelectListener{
                 override fun onError() {
-
+                    println("Error")
                 }
                 override fun onServerSelected(testPoint: TestPoint?) {
                     this@Service.testPoint.value = testPoint
@@ -92,6 +92,7 @@ object Service {
                     }
                 }
             })
+            speedTestHandler.startup()
         }
     }
 
@@ -139,6 +140,7 @@ object Service {
                         this@Service.jitter.value = jitter.roundPlace(1).toString()
                         pingChart.add(ping)
                         jitterChart.add(jitter)
+                        onEnableAbort.invoke()
                     }
                     override fun onIPInfoUpdate(ipInfo: String?) {
                         this@Service.ipInfo.value = ipInfo.toString()

diff --git a/src/main/kotlin/core/SpeedTestHandler.kt b/src/main/kotlin/core/SpeedTestHandler.kt
@@ -64,12 +64,8 @@ class SpeedTestHandler {
         }
         if (data.startsWith("\"") || data.startsWith("'")) { //fetch server list from URL
             if (!libreSpeed!!.loadServerList(data.subSequence(1, data.length - 1).toString())) {
-                try {
-                    throw Exception("Failed to load server list")
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
                 onServerSelectListener?.onError()
+                return
             }
         } else {
             val testPoints = JSONArray(data)

diff --git a/src/main/kotlin/routes/sections/home/TestStage.kt b/src/main/kotlin/routes/sections/home/TestStage.kt
@@ -15,9 +15,10 @@ import components.SpeedMeterView
 import core.Service
 import core.Service.toValidString
 import dev.icerock.moko.mvvm.livedata.compose.observeAsState
-import kotlinx.coroutines.delay
 import theme.ColorBox
 import util.Utils.roundPlace
+import java.util.Timer
+import java.util.TimerTask
 
 @Composable
 fun TestStage(onCancel : () -> Unit,goToResult : () -> Unit) {
@@ -48,8 +49,13 @@ fun TestStage(onCancel : () -> Unit,goToResult : () -> Unit) {
         Service.onError = {
             onCancel.invoke()
         }
-        delay(3000)
-        enablecancelation = true
+        Service.onEnableAbort = {
+            Timer().schedule(object : TimerTask() {
+                override fun run() {
+                    enablecancelation = true
+                }
+            },2000)
+        }
     }
 
     Box(Modifier.fillMaxSize()) {