laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

check if pubkey of the event is empty and fill pubkey and event id

Browse Source
This commit is contained in:
greenart7c3
2023-08-04 15:09:22 -03:00
parent 1affaa3d7c
commit 1ddaaf598b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/service/model/Event.kt
+9
View File
@@ -296,6 +296,15 @@ open class Event(
return CryptoUtils.sha256(rawEventJson.toByteArray())
}
fun setPubKeyIfEmpty(event: Event, pubKey: HexKey): Event {
if (event.pubKey.isEmpty()) {
val id = generateId(pubKey, event.createdAt, event.kind, event.tags, event.content)
return Event(id.toHexKey(), pubKey, event.createdAt, event.kind, event.tags, event.content, "")
}
return event
}
fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = TimeUtils.now()): Event {
val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
val id = generateId(pubKey, createdAt, kind, tags, content)
app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
+4 -2
View File
@@ -116,7 +116,9 @@ fun MainScreen(account: Account, accountStateViewModel: AccountStateViewModel, j
return@EventData
}
if (event.value!!.pubKey != account.keyPair.pubKey.toHexKey()) {
val localEvent = Event.setPubKeyIfEmpty(event.value!!, account.keyPair.pubKey.toHexKey())
if (localEvent.pubKey != account.keyPair.pubKey.toHexKey()) {
coroutineScope.launch {
Toast.makeText(
context,
@@ -127,7 +129,7 @@ fun MainScreen(account: Account, accountStateViewModel: AccountStateViewModel, j
return@EventData
}
val id = event.value!!.id.hexToByteArray()
val id = localEvent.id.hexToByteArray()
val sig = CryptoUtils.sign(id, account.keyPair.privKey!!).toHexKey()
clipboardManager.setText(AnnotatedString(sig))