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

Fix private zaps

Browse Source
This commit is contained in:
greenart7c3
2024-10-27 15:22:12 -03:00
parent a85836a7f0
commit d61b59a7ed
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
+2 -18
View File
@@ -12,7 +12,6 @@ import com.greenart7c3.nostrsigner.models.TimeUtils
import com.greenart7c3.nostrsigner.models.kindToNip
import com.greenart7c3.nostrsigner.service.AmberUtils
import com.greenart7c3.nostrsigner.service.IntentUtils
import com.greenart7c3.nostrsigner.service.model.AmberEvent
import com.vitorpamplona.quartz.crypto.CryptoUtils
import com.vitorpamplona.quartz.encoders.toHexKey
import com.vitorpamplona.quartz.encoders.toNpub
@@ -112,27 +111,12 @@ class SignerProvider : ContentProvider() {
if (!LocalPreferences.containsAccount(context!!, npub)) return null
val account = LocalPreferences.loadFromEncryptedStorage(context!!, npub) ?: return null
val event = try {
AmberEvent.toEvent(AmberEvent.fromJson(json))
IntentUtils.getUnsignedEvent(json, account)
} catch (e: Exception) {
Log.d("SignerProvider", "Failed to parse event from $packageName", e)
return null
}
if (event.pubKey.isBlank()) {
Log.d("SignerProvider", "Event from $packageName has no pubkey")
return null
}
if (event.pubKey != account.keyPair.pubKey.toHexKey()) {
Log.d("SignerProvider", "Event from $packageName has incorrect pubkey")
return null
}
if (!event.hasCorrectIDHash()) {
Log.d("SignerProvider", "Event from $packageName has incorrect ID hash")
return null
}
val database = NostrSigner.getInstance().getDatabase(account.keyPair.pubKey.toNpub())
var permission =
database
@@ -211,7 +195,7 @@ class SignerProvider : ContentProvider() {
val cursor =
MatrixCursor(arrayOf("signature", "event", "result")).also {
val signature =
if (event is LnZapRequestEvent &&
if (event.kind == LnZapRequestEvent.KIND &&
event.tags.any {
tag ->
tag.any { t -> t == "anon" }