Develop #19

Merged
wt merged 107 commits from develop into main 2026-10-13 09:42:23 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 711d0cb1fc - Show all commits

No files matched your search

+2 -2
View File
@@ -2270,7 +2270,7 @@ final class AppModel: ObservableObject {
}
guard !messages[index].isRetracted else { return }
var updatedMessage = messages[index]
let updatedMessage = messages[index]
let existingIndex = updatedMessage.reactions.firstIndex { reaction in
reactionSenderMatches(
reaction.senderJID,
@@ -2502,7 +2502,7 @@ final class AppModel: ObservableObject {
updateConversationPreview(for: messages[index], incrementUnread: false)
return false
}
var merged = message
let merged = message
if previous.direction == .outgoing && message.direction == .outgoing {
merged.localFilename = previous.localFilename ?? message.localFilename
merged.mimeType = previous.mimeType ?? message.mimeType
@@ -35,7 +35,7 @@ final class LumaConnectionStatsModule: XmppModuleBase, XmppModule, XmppStanzaFil
func processIncoming(stanza: Stanza) -> Bool {
if stanza.xmlns == Self.smNamespace, stanza.name == "a" {
if let raw = stanza.getAttribute("h"), let value = UInt32(raw) {
if let raw = stanza.attribute("h"), let value = UInt32(raw) {
lock.lock()
acknowledged = value
lock.unlock()
+2 -2
View File
@@ -1,7 +1,7 @@
import Combine
import Foundation
import Martin
import MartinOMEMO
@preconcurrency import Martin
@preconcurrency import MartinOMEMO
import WebRTC
private struct BufferedArchiveStanza {