fix

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,22 +4,29 @@ 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 {
+    suspend fun launch(intent: Intent): ActivityResult = mutex.withLock {
+        withContext(Dispatchers.Main) {
             val deferred = CompletableDeferred<ActivityResult>()
             pendingResult = deferred
-        launcher?.launch(intent)
+            launcher?.launch(intent) ?: throw IllegalStateException("Signer not registered")
-            ?: throw IllegalStateException("ExternalSignerLauncher not registered")
+            deferred.await()
-        return deferred.await()
         }
+    }
+
 
     fun onResult(result: ActivityResult) {
         pendingResult?.complete(result)

shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt

@@ -412,12 +412,7 @@ class Nostr {
         val cachedRumor = getCachedRumor(event.id())
         if (cachedRumor != null) return cachedRumor
 
-        // Get all signers
-        val signers = listOfNotNull(signer, deviceSigner)
-        if (signers.isEmpty()) return null
-
         // Try to unwrap the gift with each signer
-        for (signer in signers) {
         try {
             val gift = UnwrappedGift.fromGiftWrapAsync(signer = signer, giftWrap = event)
             val rumor = gift.rumor()
@@ -427,8 +422,6 @@ class Nostr {
             return rumor
         } catch (e: Exception) {
             println("Failed to unwrap gift: ${e.message}")
-                continue
-            }
         }
 
         return null