Skip to content

[trello.com/c/lwOnjxPQ] clear draft before send message #845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 8, 2025
Merged

[trello.com/c/lwOnjxPQ] clear draft before send message #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2751663
[trello.com/c/lwOnjxPQ] clear draft before send message to remove del…
vovameister May 1, 2025
6b839dd
[trello.com/c/lwOnjxPQ] fix double remote noti after read
vovameister May 5, 2025
a10da72
Revert "[trello.com/c/lwOnjxPQ] fix double remote noti after read"
vovameister May 5, 2025
5856b71
[trello.com/c/lwOnjxPQ] fix typo
vovameister May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Adamant/Modules/Chat/ViewModel/ChatPreservationProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import CommonKit
protocol ChatPreservationProtocol: AnyObject, Sendable {
var updateNotifier: ObservableSender<Void> { get }
var forceUpdateNotifier: ObservableSender<Void> { get }
func clearPreservedMessagesForSingleChat(address: String)
func getPreservedMessageFor(address: String) -> String?
func getReplyMessage(address: String) -> MessageModel?
func preserveChatState(message: String?, replyMessage: MessageModel?, files: [FileResult]?, forAddress address: String, isForsedUpdate: Bool)
Expand Down
1 change: 1 addition & 0 deletions Adamant/Modules/Chat/ViewModel/ChatViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ final class ChatViewModel: NSObject {

func sendMessage(text: String) {
guard let partnerAddress = chatroom?.partner?.address else { return }
chatPreservation.clearPreservedMessagesForSingleChat(address: partnerAddress)

guard chatroom?.partner?.isDummy != true else {
dialog.send(.dummy(partnerAddress))
Expand Down
13 changes: 9 additions & 4 deletions Adamant/ServiceProtocols/ChatPreservation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,25 @@ final class ChatPreservation: ChatPreservationProtocol, @unchecked Sendable {
NotificationCenter.default
.notifications(named: .AdamantAccountService.userLoggedOut)
.sink { [weak self] _ in
self?.clearPreservedMessages()
self?.clearAllPreservedMessages()
}
.store(in: &notificationsSet)
}

// MARK: Notification actions

private func clearPreservedMessages() {
private func clearAllPreservedMessages() {
preservedMessages = [:]
preservedReplayMessage = [:]
preservedFiles = [:]

updateNotifier.send()
}

func clearPreservedMessagesForSingleChat(address: String) {
preservedMessages.removeValue(forKey: address)
preservedReplayMessage.removeValue(forKey: address)
preservedFiles.removeValue(forKey: address)
}


func preserveChatState(
message: String?,
Expand Down
Loading