fix: nostr operations cause app crashing (#20)

Reviewed-on: #20

composeApp/build.gradle.kts

@@ -24,7 +24,7 @@ kotlin {
             implementation(libs.jetbrains.navigation3.ui)
             implementation(libs.jetbrains.lifecycle.viewmodelNavigation3)
             implementation(libs.androidx.core.splashscreen)
-            implementation("su.reya:nostr-sdk-kmp:0.2.6")
+            implementation("su.reya:nostr-sdk-kmp:0.2.7")
             implementation("io.coil-kt.coil3:coil-compose:3.4.0")
             implementation("io.coil-kt.coil3:coil-network-okhttp:3.4.0")
             implementation("io.github.kalinjul.easyqrscan:scanner:0.7.0")

composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt

@@ -61,7 +61,7 @@ class AndroidExternalSigner(
     ): String? {
         // Try Content Resolver first
         queryContentResolver(type, payload, pubkey, currentUser)?.let {
-            return it.result
+            return if (resultKey == "event") it.event else it.result
         }
 
         // Fall back to Intent

composeApp/src/androidMain/kotlin/su/reya/coop/ExternalSignerLauncher.kt

@@ -4,23 +4,30 @@ import android.content.Intent
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 
 class ExternalSignerLauncher {
     private var launcher: ActivityResultLauncher<Intent>? = null
     private var pendingResult: CompletableDeferred<ActivityResult>? = null
+    private val mutex = Mutex()
 
     fun register(launcher: ActivityResultLauncher<Intent>) {
         this.launcher = launcher
     }
 
-    suspend fun launch(intent: Intent): ActivityResult {
-        val deferred = CompletableDeferred<ActivityResult>()
-        pendingResult = deferred
-        launcher?.launch(intent)
-            ?: throw IllegalStateException("ExternalSignerLauncher not registered")
-        return deferred.await()
+    suspend fun launch(intent: Intent): ActivityResult = mutex.withLock {
+        withContext(Dispatchers.Main) {
+            val deferred = CompletableDeferred<ActivityResult>()
+            pendingResult = deferred
+            launcher?.launch(intent) ?: throw IllegalStateException("Signer not registered")
+            deferred.await()
+        }
     }
 
+
     fun onResult(result: ActivityResult) {
         pendingResult?.complete(result)
         pendingResult = null

composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt

@@ -110,17 +110,17 @@ fun ChatScreen(id: Long) {
         // Start loading spinner
         loading = true
 
-        // Get msg relays for each member
-        viewModel.chatRoomConnect(id)
-
         // Get messages
         val initialMessages = viewModel.getChatRoomMessages(id)
         messages.clear()
         messages.addAll(initialMessages)
-        
+
         // Stop loading spinner
         loading = false
 
+        // Get msg relays for each member
+        viewModel.chatRoomConnect(id)
+
         // Handle new messages
         viewModel.newEvents.collect { event ->
             if (event.roomId() == id) {