Merge pull request #22 from breez/savage-connect-lock-fix

Prevent UI thread lock on calling connect
breez · Mar 13, 2024 · 59b4ba2 · 59b4ba2
2 parents 1b0eb85 + bea7e82
commit 59b4ba2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "breez-sdk-rn-generator"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/gen_kotlin/templates/module.kt b/src/gen_kotlin/templates/module.kt
@@ -63,14 +63,16 @@ class BreezSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
     {%- endfor %}  
     @ReactMethod
     fun setLogStream(promise: Promise) {
-        try {
-            val emitter = reactApplicationContext.getJSModule(RCTDeviceEventEmitter::class.java)
-
-            setLogStream(BreezSDKLogStream(emitter))
-            promise.resolve(readableMapOf("status" to "ok"))
-        } catch (e: Exception) {
-            e.printStackTrace()
-            promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e)
+        executor.execute {
+            try {
+                val emitter = reactApplicationContext.getJSModule(RCTDeviceEventEmitter::class.java)
+
+                setLogStream(BreezSDKLogStream(emitter))
+                promise.resolve(readableMapOf("status" to "ok"))
+            } catch (e: Exception) {
+                e.printStackTrace()
+                promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e)
+            }
         }
     }
 
@@ -81,17 +83,19 @@ class BreezSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
             return
         }
 
-        try {
-            val connectRequest = asConnectRequest(req) ?: run { throw SdkException.Generic(errMissingMandatoryField("req", "ConnectRequest")) }
-            val emitter = reactApplicationContext.getJSModule(RCTDeviceEventEmitter::class.java)
+        executor.execute {
+            try {
+                val connectRequest = asConnectRequest(req) ?: run { throw SdkException.Generic(errMissingMandatoryField("req", "ConnectRequest")) }
+                val emitter = reactApplicationContext.getJSModule(RCTDeviceEventEmitter::class.java)
 
-            ensureWorkingDir(connectRequest.config.workingDir)
+                ensureWorkingDir(connectRequest.config.workingDir)
 
-            breezServices = connect(connectRequest, BreezSDKListener(emitter))
-            promise.resolve(readableMapOf("status" to "ok"))
-        } catch (e: Exception) {
-            e.printStackTrace()
-            promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e)
+                breezServices = connect(connectRequest, BreezSDKListener(emitter))
+                promise.resolve(readableMapOf("status" to "ok"))
+            } catch (e: Exception) {
+                e.printStackTrace()
+                promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e)
+            }
         }
     }
     {%- include "Objects.kt" %}