Add onError callback to handle errors in protocol threads

2026-06-22 02:01:08 +07:00 · 2023-12-05 13:47:12 +03:00
parent 5c3e253067
commit 5835a756ce
5 changed files with 28 additions and 27 deletions
@@ -345,18 +345,19 @@ class AmneziaVpnService : VpnService() {
                "openvpn" -> OpenVpn()
                "cloak" -> Cloak()
                else -> throw IllegalArgumentException("Protocol '$protocolName' not found")
-            }.apply { initialize(applicationContext, protocolState) }
+            }.apply { initialize(applicationContext, protocolState, ::onError) }
                .also { protocolCache[protocolName] = it }

    /**
     * Utils methods
     */
-    @MainThread
    private fun onError(msg: String) {
        Log.e(TAG, msg)
-        clientMessenger.send {
-            ServiceEvent.ERROR.packToMessage {
-                putString(ERROR_MSG, msg)
+        mainScope.launch {
+            clientMessenger.send {
+                ServiceEvent.ERROR.packToMessage {
+                    putString(ERROR_MSG, msg)
+                }
            }
        }
    }