fix bookmarks decryption

pull/543/head
greenart7c3 2023-09-13 08:38:20 -03:00
rodzic 5001e58c2b
commit b8808a17b5
2 zmienionych plików z 25 dodań i 5 usunięć

Wyświetl plik

@ -83,6 +83,16 @@ object AmberUtils {
}
}
fun decryptBookmark(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
openAmber(
encryptedContent,
signerType,
IntentUtils.activityResultLauncher,
pubKey,
id
)
}
fun decryptGossip(event: Event) {
if (IntentUtils.eventCache.get(event.id) == null) {
IntentUtils.eventCache.put(event.id, event)

Wyświetl plik

@ -17,14 +17,24 @@ object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
val bookmarks = account.userProfile().latestBookmarkList
if (account.loginWithAmber) {
if (AmberUtils.content.isBlank()) {
AmberUtils.decrypt(bookmarks?.content ?: "", account.keyPair.pubKey.toHexKey(), "")
bookmarks?.decryptedContent = AmberUtils.content
val id = bookmarks?.id
if (id != null) {
val decryptedContent = AmberUtils.cachedDecryptedContent[id]
if (decryptedContent == null) {
AmberUtils.decryptBookmark(
bookmarks.content,
account.keyPair.pubKey.toHexKey(),
id
)
} else {
bookmarks.decryptedContent = decryptedContent
}
}
val decryptedContent = AmberUtils.cachedDecryptedContent[id] ?: ""
val notes = bookmarks?.privateTaggedEvents(bookmarks.decryptedContent)
val notes = bookmarks?.privateTaggedEvents(decryptedContent)
?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
val addresses = bookmarks?.privateTaggedAddresses(bookmarks.decryptedContent)
val addresses = bookmarks?.privateTaggedAddresses(decryptedContent)
?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
return notes.plus(addresses).toSet()