highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 23:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix location being added to note even after deselecting it

Browse Source
This commit is contained in:
greenart7c3
2025-10-31 06:34:49 -03:00
parent 3c7104fb6a
commit bdb2637803
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
View File

@@ -441,7 +441,7 @@ class ChatNewMessageViewModel :
val urls = findURLs(message.text) val urls = findURLs(message.text)
val usedAttachments = iMetaAttachments.filterIsIn(urls.toSet()) val usedAttachments = iMetaAttachments.filterIsIn(urls.toSet())
val emojis = findEmoji(message.text, accountViewModel.account.emoji.myEmojis.value) val emojis = findEmoji(message.text, accountViewModel.account.emoji.myEmojis.value)
val geoHash = (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() val geoHash = if (wantsToAddGeoHash) (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() else null
val message = message.text val message = message.text
val contentWarningReason = if (wantsToMarkAsSensitive) "" else null val contentWarningReason = if (wantsToMarkAsSensitive) "" else null

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
View File

@@ -385,7 +385,7 @@ open class ChannelNewMessageViewModel :
val emojis = findEmoji(message.text, accountViewModel.account.emoji.myEmojis.value) val emojis = findEmoji(message.text, accountViewModel.account.emoji.myEmojis.value)
val channelRelays = channel.relays() val channelRelays = channel.relays()
val geoHash = (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() val geoHash = if (wantsToAddGeoHash) (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() else null
return if (channel is PublicChatChannel) { return if (channel is PublicChatChannel) {
val replyingToEvent = replyTo.value?.toEventHint<ChannelMessageEvent>() val replyingToEvent = replyTo.value?.toEventHint<ChannelMessageEvent>()

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
View File

@@ -327,7 +327,7 @@ open class NewProductViewModel :
val urls = findURLs(tagger.message) val urls = findURLs(tagger.message)
val usedAttachments = iMetaDescription.filterIsIn(urls.toSet()) + productImages.map { it.toIMeta() } val usedAttachments = iMetaDescription.filterIsIn(urls.toSet()) + productImages.map { it.toIMeta() }
val geoHash = (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() val geoHash = if (wantsToAddGeoHash) (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() else null
val zapReceiver = if (wantsForwardZapTo) forwardZapTo.value.toZapSplitSetup() else null val zapReceiver = if (wantsForwardZapTo) forwardZapTo.value.toZapSplitSetup() else null
val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount.value else null val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount.value else null

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
View File

@@ -515,7 +515,7 @@ open class ShortNotePostViewModel :
val zapReceiver = if (wantsForwardZapTo) forwardZapTo.value.toZapSplitSetup() else null val zapReceiver = if (wantsForwardZapTo) forwardZapTo.value.toZapSplitSetup() else null
val geoHash = (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() val geoHash = if (wantsToAddGeoHash) (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString() else null
val localZapRaiserAmount = if (wantsZapRaiser) zapRaiserAmount.value else null val localZapRaiserAmount = if (wantsZapRaiser) zapRaiserAmount.value else null
val emojis = findEmoji(tagger.message, account.emoji.myEmojis.value) val emojis = findEmoji(tagger.message, account.emoji.myEmojis.value)