mirror
/
amethyst
kopia lustrzana https://github.com/vitorpamplona/amethyst
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixes a bug with signature-null in the `sig` of events.

pull/835/head
Vitor Pamplona 2024-04-12 10:56:38 -04:00
rodzic b046fd91cb
commit 9ce14e08fd
2 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
Wyświetl plik

@ -125,20 +125,20 @@ class ExternalSignerLauncher(
val localResults: Array<Result> = Result.fromJsonArray(results)
localResults.forEach {
val signature = it.signature ?: ""
val packageName = it.`package` ?: ""
val packageName = it.`package`?.let { "-$it" } ?: ""
val id = it.id ?: ""
if (id.isNotBlank()) {
val result = if (packageName.isNotBlank()) "$signature-$packageName" else signature
val result = if (packageName.isNotBlank()) "$signature$packageName" else signature
val contentCache = contentCache.get(id)
contentCache?.invoke(result)
}
}
} else {
val signature = data.getStringExtra("signature") ?: ""
val packageName = data.getStringExtra("package") ?: ""
val packageName = data.getStringExtra("package")?.let { "-$it" } ?: ""
val id = data.getStringExtra("id") ?: ""
if (id.isNotBlank()) {
val result = if (packageName.isNotBlank()) "$signature-$packageName" else signature
val result = if (packageName.isNotBlank()) "$signature$packageName" else signature
val contentCache = contentCache.get(id)
contentCache?.invoke(result)
}

2
quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt
Wyświetl plik

@ -79,7 +79,7 @@ class NostrSignerExternal(
event.kind,
event.tags,
event.content,
signature,
signature.split("-")[0],
) as? T?
)
?.let { onReady(it) }