highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-17 21:31:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes displaying an old result when coming back to a DVM screen

Browse Source
This commit is contained in:
Vitor Pamplona 2024-12-10 14:17:50 -05:00
parent 83235dab69
commit 8b80ac13db
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
View File

@ -236,8 +236,8 @@ class NostrBookmarkPrivateFeedViewModel(
@Stable
class NostrNIP90ContentDiscoveryFeedViewModel(
val account: Account,
val dvmkey: String,
val requestid: String,
dvmkey: String,
requestid: String,
) : FeedViewModel(NIP90ContentDiscoveryResponseFilter(account, dvmkey, requestid)) {
class Factory(
val account: Account,

8
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/dvms/DvmContentDiscoveryScreen.kt
View File

@ -204,11 +204,13 @@ fun ObserverContentDiscoveryResponse(
}
val latestResponse by resultFlow.collectAsStateWithLifecycle()
val myResponse = latestResponse
if (latestResponse != null) {
if (myResponse != null) {
PrepareViewContentDiscoveryModels(
noteAuthor,
dvmRequestId.idHex,
myResponse,
onRefresh,
accountViewModel,
nav,
@ -236,6 +238,7 @@ fun ObserverDvmStatusResponse(
}
val latestStatus by statusFlow.collectAsStateWithLifecycle()
// TODO: Make a good splash screen with loading animation for this DVM.
if (latestStatus != null) {
// TODO: Make a good splash screen with loading animation for this DVM.
@ -252,6 +255,7 @@ fun ObserverDvmStatusResponse(
fun PrepareViewContentDiscoveryModels(
dvm: User,
dvmRequestId: String,
latestResponse: NIP90ContentDiscoveryResponseEvent,
onRefresh: () -> Unit,
accountViewModel: AccountViewModel,
nav: INav,
@ -262,7 +266,7 @@ fun PrepareViewContentDiscoveryModels(
factory = NostrNIP90ContentDiscoveryFeedViewModel.Factory(accountViewModel.account, dvmkey = dvm.pubkeyHex, requestid = dvmRequestId),
)
LaunchedEffect(key1 = dvmRequestId) {
LaunchedEffect(key1 = dvmRequestId, latestResponse.id) {
resultFeedViewModel.invalidateData()
}

2
commons/src/main/java/com/vitorpamplona/amethyst/commons/data/LargeCache.kt
View File

@ -307,7 +307,7 @@ class BiMaxOfCollector<K, V>(
v: V,
) {
if (filter.filter(k, v)) {
if (maxK == null || comparator.compare(v, maxV) > 1) {
if (maxK == null || comparator.compare(v, maxV) > 0) {
maxK = k
maxV = v
}