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

Moving attestations local cache to a flow

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-05 13:24:31 -04:00
parent 53e6677558
commit 3c1a918b2d
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
View File

@@ -340,7 +340,7 @@ object LocalPreferences {
putString( putString(
PrefKeys.PENDING_ATTESTATIONS, PrefKeys.PENDING_ATTESTATIONS,
Event.mapper.writeValueAsString(account.pendingAttestations), Event.mapper.writeValueAsString(account.pendingAttestations.value),
) )
} }
.apply() .apply()
@@ -604,7 +604,7 @@ object LocalPreferences {
filterSpamFromStrangers = filterSpam, filterSpamFromStrangers = filterSpam,
lastReadPerRoute = lastReadPerRoute, lastReadPerRoute = lastReadPerRoute,
hasDonatedInVersion = hasDonatedInVersion, hasDonatedInVersion = hasDonatedInVersion,
pendingAttestations = pendingAttestations ?: emptyMap(), pendingAttestations = MutableStateFlow(pendingAttestations ?: emptyMap()),
) )
// Loads from DB // Loads from DB

17
app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -126,6 +126,7 @@ import kotlinx.coroutines.flow.flattenMerge
import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.transformLatest import kotlinx.coroutines.flow.transformLatest
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -202,7 +203,7 @@ class Account(
var filterSpamFromStrangers: Boolean = true, var filterSpamFromStrangers: Boolean = true,
var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>(), var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>(),
var hasDonatedInVersion: Set<String> = setOf<String>(), var hasDonatedInVersion: Set<String> = setOf<String>(),
var pendingAttestations: Map<HexKey, String> = mapOf<HexKey, String>(), var pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
val scope: CoroutineScope = Amethyst.instance.applicationIOScope, val scope: CoroutineScope = Amethyst.instance.applicationIOScope,
) { ) {
var transientHiddenUsers: ImmutableSet<String> = persistentSetOf() var transientHiddenUsers: ImmutableSet<String> = persistentSetOf()
@@ -1014,9 +1015,9 @@ class Account(
} }
suspend fun updateAttestations() { suspend fun updateAttestations() {
Log.d("Pending Attestations", "Updating ${pendingAttestations.size} pending attestations") Log.d("Pending Attestations", "Updating ${pendingAttestations.value.size} pending attestations")
pendingAttestations.toMap().forEach { pair -> pendingAttestations.value.forEach { pair ->
val newAttestation = OtsEvent.upgrade(pair.value, pair.key) val newAttestation = OtsEvent.upgrade(pair.value, pair.key)
if (pair.value != newAttestation) { if (pair.value != newAttestation) {
@@ -1024,7 +1025,9 @@ class Account(
LocalCache.justConsume(it, null) LocalCache.justConsume(it, null)
Client.send(it) Client.send(it)
pendingAttestations = pendingAttestations - pair.key pendingAttestations.update {
it - pair.key
}
} }
} }
} }
@@ -1032,7 +1035,7 @@ class Account(
fun hasPendingAttestations(note: Note): Boolean { fun hasPendingAttestations(note: Note): Boolean {
val id = note.event?.id() ?: note.idHex val id = note.event?.id() ?: note.idHex
return pendingAttestations.get(id) != null return pendingAttestations.value[id] != null
} }
fun timestamp(note: Note) { fun timestamp(note: Note) {
@@ -1041,7 +1044,9 @@ class Account(
val id = note.event?.id() ?: note.idHex val id = note.event?.id() ?: note.idHex
pendingAttestations = pendingAttestations + Pair(id, OtsEvent.stamp(id)) pendingAttestations.update {
it + Pair(id, OtsEvent.stamp(id))
}
saveable.invalidateData() saveable.invalidateData()
} }

7
app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
View File

@@ -29,6 +29,7 @@ import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.fonfon.kgeohash.toGeoHash import com.fonfon.kgeohash.toGeoHash
import com.vitorpamplona.amethyst.model.AddressableNote import com.vitorpamplona.amethyst.model.AddressableNote
import com.vitorpamplona.amethyst.model.Channel import com.vitorpamplona.amethyst.model.Channel
@@ -176,8 +177,10 @@ fun LoadOts(
(earliestDate as? GenericLoadable.Loaded)?.let { (earliestDate as? GenericLoadable.Loaded)?.let {
whenConfirmed(it.loaded) whenConfirmed(it.loaded)
} ?: run { } ?: run {
val account = accountViewModel.account.saveable.observeAsState() val pendingAttestations by accountViewModel.account.pendingAttestations.collectAsStateWithLifecycle()
if (account.value?.account?.hasPendingAttestations(note) == true) { val id = note.event?.id() ?: note.idHex
if (pendingAttestations[id] != null) {
whenPending() whenPending()
} }
} }