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

Concurrent modification exception bugfix

Browse Source
This commit is contained in:
Vitor Pamplona
2023-01-25 19:09:18 -03:00
parent a9788cfa63
commit bd7a4a8372
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
View File

@@ -25,8 +25,11 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
} }
fun createLoadEventsIfNotLoadedFilter(): JsonFilter? { fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
val eventsToLoad = eventsToWatch val nodes = synchronized(eventsToWatch) {
.map { LocalCache.notes[it] } eventsToWatch.map { LocalCache.notes[it] }
}
val eventsToLoad = nodes
.filterNotNull() .filterNotNull()
.filter { it.event == null } .filter { it.event == null }
.map { it.idHex.substring(0, 8) } .map { it.idHex.substring(0, 8) }
@@ -85,7 +88,9 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
thread.add(note) thread.add(note)
threadSet.add(note) threadSet.add(note)
note.replies.forEach { synchronized(note.replies) {
note.replies.toList()
}.forEach {
loadDown(it, thread, threadSet) loadDown(it, thread, threadSet)
} }
} }

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
View File

@@ -79,8 +79,6 @@ fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController)
1 -> FeedView(feedViewModelReplies, accountViewModel, navController) 1 -> FeedView(feedViewModelReplies, accountViewModel, navController)
} }
} }
} }
} }
} }