From 204eaa4606787c033881659446fd753f5110dc2a Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Mon, 18 Mar 2024 11:16:13 -0300 Subject: [PATCH] fix crash when loading draft from channels or lives --- .../amethyst/ui/actions/NewPostViewModel.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt index de7299964..38fc5862a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt @@ -335,12 +335,8 @@ open class NewPostViewModel() : ViewModel() { } eTags = - draft.event?.tags()?.filter { it.size > 1 && it[0] == "e" && it.getOrNull(3) != "fork" }?.map { - val forked = it[3] == "fork" - val note = LocalCache.getOrCreateNote(it[1]) - if (forked) { - forkedFromNote = note - } + draft.event?.tags()?.filter { it.size > 1 && it[0] == "e" && it.getOrNull(3) != "fork" }?.mapNotNull { + val note = LocalCache.checkGetOrCreateNote(it[1]) note } @@ -350,13 +346,13 @@ open class NewPostViewModel() : ViewModel() { } draft.event?.tags()?.filter { it.size > 1 && it[0] == "e" && it.getOrNull(3) == "fork" }?.forEach { - val note = LocalCache.getOrCreateNote(it[1]) + val note = LocalCache.checkGetOrCreateNote(it[1]) forkedFromNote = note } originalNote = draft.event?.tags()?.filter { it.size > 1 && it[0] == "e" && it.getOrNull(3) == "root" }?.map { - LocalCache.getOrCreateNote(it[1]) + LocalCache.checkGetOrCreateNote(it[1]) }?.firstOrNull() canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null