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

Use signerSync inside signerprovider

Browse Source
This commit is contained in:
greenart7c3
2024-09-20 07:35:57 -03:00
parent 059910fe6d
commit 6d498fc548
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
+32 -23
View File
@@ -5,6 +5,7 @@ import android.content.ContentValues
import android.database.Cursor
import android.database.MatrixCursor
import android.net.Uri
import android.util.Log
import com.greenart7c3.nostrsigner.database.HistoryEntity
import com.greenart7c3.nostrsigner.models.SignerType
import com.greenart7c3.nostrsigner.models.TimeUtils
@@ -166,9 +167,10 @@ class SignerProvider : ContentProvider() {
}
}
var cursor: MatrixCursor? = null
val signedEvent = account.signer.signerSync.sign<Event>(event.createdAt, event.kind, event.tags, event.content)
account.signer.sign<Event>(event.createdAt, event.kind, event.tags, event.content) { signedEvent ->
if (signedEvent == null) {
Log.d("SignerProvider", "Failed to sign event from $packageName")
database.applicationDao().addHistory(
HistoryEntity(
0,
@@ -176,31 +178,38 @@ class SignerProvider : ContentProvider() {
"SIGN_EVENT",
event.kind,
TimeUtils.now(),
true,
false,
),
)
return null
}
val localCursor =
MatrixCursor(arrayOf("signature", "event")).also {
val signature =
if (event is LnZapRequestEvent &&
event.tags.any {
tag ->
tag.any { t -> t == "anon" }
}
) {
signedEvent.toJson()
} else {
signedEvent.sig
database.applicationDao().addHistory(
HistoryEntity(
0,
sortOrder ?: packageName,
"SIGN_EVENT",
event.kind,
TimeUtils.now(),
true,
),
)
val cursor =
MatrixCursor(arrayOf("signature", "event")).also {
val signature =
if (event is LnZapRequestEvent &&
event.tags.any {
tag ->
tag.any { t -> t == "anon" }
}
it.addRow(arrayOf(signature, signedEvent.toJson()))
}
cursor = localCursor
}
while (cursor == null) {
// do nothing
}
) {
signedEvent.toJson()
} else {
signedEvent.sig
}
it.addRow(arrayOf(signature, signedEvent.toJson()))
}
return cursor
}
app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt
+1 -2
View File
@@ -5,13 +5,12 @@ import androidx.compose.runtime.Stable
import androidx.lifecycle.LiveData
import com.vitorpamplona.quartz.crypto.KeyPair
import com.vitorpamplona.quartz.events.RelayAuthEvent
import com.vitorpamplona.quartz.signers.NostrSigner
import com.vitorpamplona.quartz.signers.NostrSignerInternal
@Stable
class Account(
val keyPair: KeyPair,
val signer: NostrSigner = NostrSignerInternal(keyPair),
val signer: NostrSignerInternal = NostrSignerInternal(keyPair),
var name: String,
var useProxy: Boolean,
var proxyPort: Int,