mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 16:30:49 +00:00
Fixes a bug with signature-null in the sig
of events.
This commit is contained in:
parent
b046fd91cb
commit
9ce14e08fd
@ -125,20 +125,20 @@ class ExternalSignerLauncher(
|
|||||||
val localResults: Array<Result> = Result.fromJsonArray(results)
|
val localResults: Array<Result> = Result.fromJsonArray(results)
|
||||||
localResults.forEach {
|
localResults.forEach {
|
||||||
val signature = it.signature ?: ""
|
val signature = it.signature ?: ""
|
||||||
val packageName = it.`package` ?: ""
|
val packageName = it.`package`?.let { "-$it" } ?: ""
|
||||||
val id = it.id ?: ""
|
val id = it.id ?: ""
|
||||||
if (id.isNotBlank()) {
|
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)
|
val contentCache = contentCache.get(id)
|
||||||
contentCache?.invoke(result)
|
contentCache?.invoke(result)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
val signature = data.getStringExtra("signature") ?: ""
|
val signature = data.getStringExtra("signature") ?: ""
|
||||||
val packageName = data.getStringExtra("package") ?: ""
|
val packageName = data.getStringExtra("package")?.let { "-$it" } ?: ""
|
||||||
val id = data.getStringExtra("id") ?: ""
|
val id = data.getStringExtra("id") ?: ""
|
||||||
if (id.isNotBlank()) {
|
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)
|
val contentCache = contentCache.get(id)
|
||||||
contentCache?.invoke(result)
|
contentCache?.invoke(result)
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ class NostrSignerExternal(
|
|||||||
event.kind,
|
event.kind,
|
||||||
event.tags,
|
event.tags,
|
||||||
event.content,
|
event.content,
|
||||||
signature,
|
signature.split("-")[0],
|
||||||
) as? T?
|
) as? T?
|
||||||
)
|
)
|
||||||
?.let { onReady(it) }
|
?.let { onReady(it) }
|
||||||
|
Loading…
Reference in New Issue
Block a user