highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-03 09:28:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moves loading of an embed event to thread.

Browse Source
This commit is contained in:
Vitor Pamplona 2024-04-08 18:33:11 -04:00
parent bbbb614718
commit 31958215be
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
View File

@ -171,6 +171,22 @@ object LocalCache {
return channels.get(key)
}
fun getNoteIfExists(event: Event): Note? {
return if (event is AddressableEvent) {
getAddressableNoteIfExists(event.addressTag())
} else {
getNoteIfExists(event.id)
}
}
fun getOrCreateNote(event: Event): Note {
return if (event is AddressableEvent) {
getOrCreateAddressableNote(event.address())
} else {
getOrCreateNote(event.id)
}
}
fun checkGetOrCreateNote(key: String): Note? {
checkNotInMainThread()

18
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@ -1035,13 +1035,6 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View
}
}
fun loadNEmbedIfNeeded(nembed: Event) {
val baseNote = LocalCache.getNoteIfExists(nembed.id)
if (baseNote?.event == null) {
LocalCache.verifyAndConsume(nembed, null)
}
}
fun checkIsOnline(
media: String?,
onDone: (Boolean) -> Unit,
@ -1374,11 +1367,14 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View
is Nip19Bech32.NEvent -> withContext(Dispatchers.IO) { LocalCache.checkGetOrCreateNote(parsed.hex)?.let { note -> returningNote = note } }
is Nip19Bech32.NEmbed ->
withContext(Dispatchers.IO) {
accountViewModel.loadNEmbedIfNeeded(parsed.event)
LocalCache.checkGetOrCreateNote(parsed.event.id)?.let { note ->
returningNote = note
val baseNote = LocalCache.getOrCreateNote(parsed.event)
if (baseNote.event == null) {
launch(Dispatchers.IO) {
LocalCache.verifyAndConsume(parsed.event, null)
}
}
returningNote = baseNote
}
is Nip19Bech32.NRelay -> {}
is Nip19Bech32.NAddress -> withContext(Dispatchers.IO) { LocalCache.checkGetOrCreateNote(parsed.atag)?.let { note -> returningNote = note } }