reya/coop-mobile
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

fix

Browse Source
This commit is contained in:
Ren Amamiya
2026-06-12 10:21:56 +07:00
parent 28550f8e25
commit 8e7a1e6d7c
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt
View File

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

19
composeApp/src/androidMain/kotlin/su/reya/coop/ExternalSignerLauncher.kt
View File

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

25
shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt
View File

@@ -412,23 +412,16 @@ class Nostr {
val cachedRumor = getCachedRumor(event.id()) val cachedRumor = getCachedRumor(event.id())
if (cachedRumor != null) return cachedRumor 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 // Try to unwrap the gift with each signer
for (signer in signers) { try {
try { val gift = UnwrappedGift.fromGiftWrapAsync(signer = signer, giftWrap = event)
val gift = UnwrappedGift.fromGiftWrapAsync(signer = signer, giftWrap = event) val rumor = gift.rumor()
val rumor = gift.rumor() // Save the rumor to the database
// Save the rumor to the database setCachedRumor(event.id(), rumor)
setCachedRumor(event.id(), rumor) // Return the rumor
// Return the rumor return rumor
return rumor } catch (e: Exception) {
} catch (e: Exception) { println("Failed to unwrap gift: ${e.message}")
println("Failed to unwrap gift: ${e.message}")
continue
}
} }
return null return null