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

BugFix Loading one thread after another crashed the app

Browse Source
This commit is contained in:
Vitor Pamplona
2023-02-24 17:23:17 -05:00
parent 951a4be615
commit 3cdc77a277
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,10 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>): ViewModel() {
return localFilter.loadTop() return localFilter.loadTop()
} }
fun clearFeed() {
_feedContent.update { FeedState.Loading }
}
fun refresh() { fun refresh() {
val scope = CoroutineScope(Job() + Dispatchers.Default) val scope = CoroutineScope(Job() + Dispatchers.Default)
scope.launch { scope.launch {

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

@@ -80,7 +80,9 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
is FeedState.Loaded -> { is FeedState.Loaded -> {
LaunchedEffect(noteId) { LaunchedEffect(noteId) {
val noteForPosition = state.feed.value.filter { it.idHex == noteId}.firstOrNull() val noteForPosition = state.feed.value.filter { it.idHex == noteId}.firstOrNull()
listState.animateScrollToItem(state.feed.value.indexOf(noteForPosition), 0) val position = state.feed.value.indexOf(noteForPosition)
if (position > 0)
listState.animateScrollToItem(position, 0)
} }
LazyColumn( LazyColumn(

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt
View File

@@ -28,7 +28,8 @@ fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navControl
if (account != null && noteId != null) { if (account != null && noteId != null) {
val feedViewModel: NostrThreadFeedViewModel = viewModel() val feedViewModel: NostrThreadFeedViewModel = viewModel()
LaunchedEffect(Unit) { LaunchedEffect(noteId) {
feedViewModel.clearFeed()
ThreadFeedFilter.loadThread(noteId) ThreadFeedFilter.loadThread(noteId)
NostrThreadDataSource.loadThread(noteId) NostrThreadDataSource.loadThread(noteId)
feedViewModel.invalidateData() feedViewModel.invalidateData()