nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes https://github.com/vitorpamplona/amethyst/issues/1422

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-22 16:29:49 -04:00
parent 0d3c60b9c2
commit c1d8aac030
12 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+25 -4
View File
@@ -212,6 +212,7 @@ import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.math.BigDecimal import java.math.BigDecimal
import java.util.Locale import java.util.Locale
import kotlin.coroutines.cancellation.CancellationException
@OptIn(DelicateCoroutinesApi::class) @OptIn(DelicateCoroutinesApi::class)
@Stable @Stable
@@ -1140,7 +1141,19 @@ class Account(
return event return event
} }
suspend fun createAndSendDraft( suspend fun createAndSendDraftIgnoreErrors(
draftTag: String,
template: EventTemplate<out Event>,
broadcast: Set<Event> = emptySet(),
) {
try {
createAndSendDraftInner(draftTag, template, broadcast)
} catch (e: Exception) {
if (e is CancellationException) throw e
}
}
suspend fun createAndSendDraftInner(
draftTag: String, draftTag: String,
template: EventTemplate<out Event>, template: EventTemplate<out Event>,
broadcast: Set<Event> = emptySet(), broadcast: Set<Event> = emptySet(),
@@ -1164,7 +1177,15 @@ class Account(
} }
} }
suspend fun deleteDraft(draftTag: String) { suspend fun deleteDraftIgnoreErrors(draftTag: String) {
try {
deleteDraftInner(draftTag)
} catch (e: Exception) {
if (e is CancellationException) throw e
}
}
suspend fun deleteDraftInner(draftTag: String) {
if (!isWriteable()) return if (!isWriteable()) return
val extraRelays = cache.getAddressableNoteIfExists(DraftWrapEvent.createAddressTag(signer.pubKey, draftTag))?.relays ?: emptyList() val extraRelays = cache.getAddressableNoteIfExists(DraftWrapEvent.createAddressTag(signer.pubKey, draftTag))?.relays ?: emptyList()
@@ -1293,7 +1314,7 @@ class Account(
} }
if (draftTag != null) { if (draftTag != null) {
createAndSendDraft(draftTag, template) createAndSendDraftIgnoreErrors(draftTag, template)
} else { } else {
val it = signer.sign(template) val it = signer.sign(template)
cache.justConsumeMyOwnEvent(it) cache.justConsumeMyOwnEvent(it)
@@ -1338,7 +1359,7 @@ class Account(
val broadcastNotes = mapEntitiesToNotes(quotes).toSet() val broadcastNotes = mapEntitiesToNotes(quotes).toSet()
if (draftTag != null) { if (draftTag != null) {
createAndSendDraft(draftTag, template) createAndSendDraftIgnoreErrors(draftTag, template)
} else { } else {
val it = signer.sign(template) val it = signer.sign(template)
cache.justConsumeMyOwnEvent(it) cache.justConsumeMyOwnEvent(it)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/CommentPostViewModel.kt
+5 -3
View File
@@ -317,12 +317,14 @@ open class CommentPostViewModel :
cancel() cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast) accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.account.deleteDraft(version) accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
if (message.text.isBlank()) { if (message.text.isBlank()) {
accountViewModel.account.deleteDraft(draftTag.current) accountViewModel.account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
val attachments = mutableSetOf<Event>() val attachments = mutableSetOf<Event>()
nip95attachments.forEach { nip95attachments.forEach {
@@ -331,7 +333,7 @@ open class CommentPostViewModel :
} }
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.createAndSendDraft(draftTag.current, template, attachments) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag.current, template, attachments)
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
+3 -5
View File
@@ -45,7 +45,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
@@ -86,7 +85,6 @@ import com.vitorpamplona.amethyst.ui.theme.replyModifier
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@Composable @Composable
@@ -144,16 +142,16 @@ fun GenericCommentPostScreen(
onCancel = { onCancel = {
// uses the accountViewModel scope to avoid cancelling this // uses the accountViewModel scope to avoid cancelling this
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.viewModelScope.launch(Dispatchers.IO) { accountViewModel.runIOCatching {
postViewModel.sendDraftSync() postViewModel.sendDraftSync()
nav.popBack()
postViewModel.cancel() postViewModel.cancel()
} }
nav.popBack()
}, },
onPost = { onPost = {
// uses the accountViewModel scope to avoid cancelling this // uses the accountViewModel scope to avoid cancelling this
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.viewModelScope.launch(Dispatchers.IO) { accountViewModel.runIOCatching {
postViewModel.sendPostSync() postViewModel.sendPostSync()
nav.popBack() nav.popBack()
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
+6 -4
View File
@@ -351,12 +351,14 @@ class ChatNewMessageViewModel :
val version = draftTag.current val version = draftTag.current
innerSendPost(null) innerSendPost(null)
cancel() cancel()
accountViewModel.account.deleteDraft(version) accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
if (message.text.isBlank()) { if (message.text.isBlank()) {
account.deleteDraft(draftTag.current) account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
innerSendPost(draftTag.current) innerSendPost(draftTag.current)
} }
@@ -471,7 +473,7 @@ class ChatNewMessageViewModel :
} }
if (draftTag != null) { if (draftTag != null) {
accountViewModel.account.createAndSendDraft(draftTag, template) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag, template)
} else { } else {
accountViewModel.account.sendNip17PrivateMessage(template) accountViewModel.account.sendNip17PrivateMessage(template)
} }
@@ -488,7 +490,7 @@ class ChatNewMessageViewModel :
) )
if (draftTag != null) { if (draftTag != null) {
accountViewModel.account.createAndSendDraft(draftTag, template) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag, template)
} else { } else {
accountViewModel.account.sendNip04PrivateMessage(template) accountViewModel.account.sendNip04PrivateMessage(template)
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt
+1 -3
View File
@@ -175,10 +175,9 @@ fun NewGroupDMScreen(
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.runIOCatching { accountViewModel.runIOCatching {
postViewModel.sendDraftSync() postViewModel.sendDraftSync()
delay(100)
nav.popBack()
postViewModel.cancel() postViewModel.cancel()
} }
nav.popBack()
}, },
onPost = { onPost = {
// uses the accountViewModel scope to avoid cancelling this // uses the accountViewModel scope to avoid cancelling this
@@ -188,7 +187,6 @@ fun NewGroupDMScreen(
postViewModel.room?.let { postViewModel.room?.let {
nav.nav(routeToMessage(it, null, null, null, accountViewModel)) nav.nav(routeToMessage(it, null, null, null, accountViewModel))
} }
postViewModel.cancel()
} }
nav.popBack() nav.popBack()
}, },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
+5 -3
View File
@@ -276,12 +276,14 @@ open class ChannelNewMessageViewModel :
cancel() cancel()
accountViewModel.account.signAndSendPrivately(template, channelRelays) accountViewModel.account.signAndSendPrivately(template, channelRelays)
accountViewModel.account.deleteDraft(version) accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
if (message.text.isBlank()) { if (message.text.isBlank()) {
account.deleteDraft(draftTag.current) account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
val attachments = mutableSetOf<Event>() val attachments = mutableSetOf<Event>()
nip95attachments.forEach { nip95attachments.forEach {
@@ -290,7 +292,7 @@ open class ChannelNewMessageViewModel :
} }
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.createAndSendDraft(draftTag.current, template, attachments) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag.current, template, attachments)
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt
+6 -9
View File
@@ -142,22 +142,19 @@ fun NewProductScreen(
titleRes = R.string.new_product, titleRes = R.string.new_product,
isActive = postViewModel::canPost, isActive = postViewModel::canPost,
onCancel = { onCancel = {
try { // uses the accountViewModel scope to avoid cancelling this
accountViewModel.viewModelScope.launch(Dispatchers.IO) { // function when the postViewModel is released
postViewModel.sendDraftSync() accountViewModel.runIOCatching {
nav.popBack() postViewModel.sendDraftSync()
postViewModel.cancel() postViewModel.cancel()
}
} catch (e: SignerExceptions.ReadOnlyException) {
// do nothing.
} }
nav.popBack()
}, },
onPost = { onPost = {
try { try {
accountViewModel.viewModelScope.launch(Dispatchers.IO) { accountViewModel.viewModelScope.launch(Dispatchers.IO) {
postViewModel.sendPostSync() postViewModel.sendPostSync()
nav.popBack() nav.popBack()
postViewModel.cancel()
} }
} catch (e: SignerExceptions.ReadOnlyException) { } catch (e: SignerExceptions.ReadOnlyException) {
accountViewModel.toastManager.toast( accountViewModel.toastManager.toast(
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
+8 -9
View File
@@ -293,24 +293,23 @@ open class NewProductViewModel :
val accountViewModel = accountViewModel ?: return val accountViewModel = accountViewModel ?: return
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.signAndSendPrivatelyOrBroadcast( val version = draftTag.current
template,
relayList = { relayList },
)
accountViewModel.account.deleteDraft(draftTag.current)
cancel() cancel()
accountViewModel.account.signAndSendPrivatelyOrBroadcast(template, relayList = { relayList })
accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
val accountViewModel = accountViewModel ?: return val accountViewModel = accountViewModel ?: return
if (message.text.isBlank()) { if (message.text.isBlank()) {
accountViewModel.account.deleteDraft(draftTag.current) accountViewModel.account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.createAndSendDraft(draftTag.current, template) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag.current, template)
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt
+1 -3
View File
@@ -98,7 +98,6 @@ import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) @OptIn(ExperimentalMaterial3Api::class, FlowPreview::class)
@@ -174,7 +173,6 @@ private fun NewPostScreenInner(
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.runIOCatching { accountViewModel.runIOCatching {
postViewModel.sendPostSync() postViewModel.sendPostSync()
delay(100)
nav.popBack() nav.popBack()
} }
}, },
@@ -183,9 +181,9 @@ private fun NewPostScreenInner(
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.runIOCatching { accountViewModel.runIOCatching {
postViewModel.sendDraftSync() postViewModel.sendDraftSync()
nav.popBack()
postViewModel.cancel() postViewModel.cancel()
} }
nav.popBack()
}, },
) )
}, },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
+5 -3
View File
@@ -483,12 +483,14 @@ open class ShortNotePostViewModel :
cancel() cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast) accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.account.deleteDraft(version) accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
if (message.text.isBlank()) { if (message.text.isBlank()) {
accountViewModel.account.deleteDraft(draftTag.current) accountViewModel.account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
val attachments = mutableSetOf<Event>() val attachments = mutableSetOf<Event>()
nip95attachments.forEach { nip95attachments.forEach {
@@ -497,7 +499,7 @@ open class ShortNotePostViewModel :
} }
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.createAndSendDraft(draftTag.current, template, attachments) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag.current, template, attachments)
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt
+1 -4
View File
@@ -138,10 +138,9 @@ fun NewPublicMessageScreen(
// function when the postViewModel is released // function when the postViewModel is released
accountViewModel.runIOCatching { accountViewModel.runIOCatching {
postViewModel.sendDraftSync() postViewModel.sendDraftSync()
delay(100)
nav.popBack()
postViewModel.cancel() postViewModel.cancel()
} }
nav.popBack()
}, },
onPost = { onPost = {
// uses the accountViewModel scope to avoid cancelling this // uses the accountViewModel scope to avoid cancelling this
@@ -149,9 +148,7 @@ fun NewPublicMessageScreen(
accountViewModel.runIOCatching { accountViewModel.runIOCatching {
postViewModel.sendPostSync() postViewModel.sendPostSync()
nav.popBack() nav.popBack()
postViewModel.cancel()
} }
nav.popBack()
}, },
) )
}, },
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
+5 -3
View File
@@ -321,12 +321,14 @@ class NewPublicMessageViewModel :
cancel() cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast) accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.account.deleteDraft(version) accountViewModel.viewModelScope.launch {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
} }
suspend fun sendDraftSync() { suspend fun sendDraftSync() {
if (message.text.isBlank()) { if (message.text.isBlank()) {
accountViewModel.account.deleteDraft(draftTag.current) accountViewModel.account.deleteDraftIgnoreErrors(draftTag.current)
} else { } else {
val broadcast = mutableSetOf<Event>() val broadcast = mutableSetOf<Event>()
nip95attachments.forEach { nip95attachments.forEach {
@@ -335,7 +337,7 @@ class NewPublicMessageViewModel :
} }
val template = createTemplate() ?: return val template = createTemplate() ?: return
accountViewModel.account.createAndSendDraft(draftTag.current, template, broadcast) accountViewModel.account.createAndSendDraftIgnoreErrors(draftTag.current, template, broadcast)
} }
} }