nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Protects against exceptions when creating keys with invalid bytearrays.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-05-12 14:13:08 -04:00
parent fc2408b526
commit db9a0ebfa1
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+16 -11
View File
@@ -877,23 +877,28 @@ class Account(
null null
} }
if (altPrivateKeyToUse != null && altPubkeyToUse != null) { try {
val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey() if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
if (altPubKeyFromPrivate == event.pubKey) { if (altPubKeyFromPrivate == event.pubKey) {
val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse) val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
if (result == null) { if (result == null) {
Log.w( Log.w(
"Private ZAP Decrypt", "Private ZAP Decrypt",
"Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}" "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}"
) )
}
result
} else {
null
} }
result
} else { } else {
null null
} }
} else { } catch (e: Exception) {
Log.e("Account", "Failed to create pubkey for ZapRequest ${event.id}", e)
null null
} }
} }