Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
ebd5bf5
set UIDesignRequiresCompatibility to YES
caldrian Oct 2, 2025
15708f1
attempt to fix polls not working
caldrian Oct 2, 2025
f00e811
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 2, 2025
8328450
access core data entity properties on the correct queue
caldrian Oct 2, 2025
a242250
update package
caldrian Oct 6, 2025
148fb0d
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 6, 2025
0cf40d9
minor adjustments
caldrian Oct 6, 2025
2e9b3d9
prepare for updating composite content
caldrian Oct 6, 2025
a3040a0
revert changes
caldrian Oct 6, 2025
b9326b7
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 6, 2025
8f74bb3
attempt to fix dangling core data objects
caldrian Oct 6, 2025
9ce9909
delete redundant line
caldrian Oct 6, 2025
070465b
add workaround
caldrian Oct 7, 2025
44d0c81
recreate cell descriptions only for composite messages
caldrian Oct 7, 2025
00c3648
add comment
caldrian Oct 7, 2025
70e2da4
Merge branch 'develop' of github.com:wireapp/wire-ios into fix/polls-…
caldrian Oct 7, 2025
595c3cf
revert some changes
caldrian Oct 7, 2025
429a840
format code
caldrian Oct 7, 2025
d9e7b98
Merge branch 'develop' into fix/polls-proteus-WPB-19765
caldrian Oct 7, 2025
692392b
fix ticket number in comment
caldrian Oct 7, 2025
463ca66
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 7, 2025
65e911d
Merge branch 'fix/polls-proteus-WPB-19765' into feat/handle-composite…
caldrian Oct 7, 2025
814ff1a
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 7, 2025
fe3ebf8
handle button action event
caldrian Oct 8, 2025
10846a8
delete redundant type
caldrian Oct 8, 2025
307a523
select button on press
caldrian Oct 8, 2025
438e226
fix bug
caldrian Oct 8, 2025
fcf7b2b
add TODO
caldrian Oct 8, 2025
f978ebf
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 8, 2025
d2e54a0
cleanup
caldrian Oct 8, 2025
8839841
Merge branch 'develop' into fix/polls-proteus-WPB-19765
caldrian Oct 8, 2025
0da6f6e
Merge branch 'fix/polls-proteus-WPB-19765' into feat/handle-composite…
caldrian Oct 8, 2025
280e0f9
fix dealing with optional ButtonAction's buttonID
caldrian Oct 8, 2025
ea47425
minor fix
caldrian Oct 8, 2025
b7bf0d1
cleanup
caldrian Oct 9, 2025
9efc5cf
Merge branch 'feat/handle-composite-messages-WPB-17921' into feat/sup…
caldrian Oct 9, 2025
10afca7
prepare handling composite edits
caldrian Oct 9, 2025
b81d3ee
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/suppo…
caldrian Oct 9, 2025
e96b3e9
Composite.applyEdit
caldrian Oct 9, 2025
5d62420
cleanup
caldrian Oct 9, 2025
2911e30
Merge branch 'develop' into fix/polls-proteus-WPB-19765
caldrian Oct 9, 2025
b6d424c
Merge branch 'fix/polls-proteus-WPB-19765' into feat/handle-composite…
caldrian Oct 9, 2025
7429d1c
fixes
caldrian Oct 9, 2025
27f9e6a
Merge remote-tracking branch 'github/gh-readonly-queue/develop/pr-369…
caldrian Oct 9, 2025
83755f0
Merge branch 'fix/polls-proteus-WPB-19765' into feat/handle-composite…
caldrian Oct 9, 2025
666ddb7
Merge remote-tracking branch 'github/gh-readonly-queue/develop/pr-372…
caldrian Oct 10, 2025
2a4a031
fix build errors
caldrian Oct 10, 2025
b9f8060
fix test
caldrian Oct 10, 2025
89c3a04
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 10, 2025
661250b
Merge branch 'develop' into feat/handle-composite-messages-WPB-17921
caldrian Oct 10, 2025
28b0d1c
Merge branch 'develop' of github.com:wireapp/wire-ios into feat/handl…
caldrian Oct 13, 2025
3bed4d4
Merge branch 'feat/handle-composite-messages-WPB-17921' into feat/sup…
caldrian Oct 13, 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
Original file line number Diff line number Diff line change
Expand Up @@ -1055,18 +1055,29 @@ public final class MessageLocalStore: MessageLocalStoreProtocol {
) -> Bool {
guard
let messageNonce = UUID(uuidString: genericMessage.messageID),
let originalText = clientMessage.underlyingMessage?.textData,
case .text? = messageEdit.content,
let messageEditContent = messageEdit.content,
senderID == clientMessage.sender?.remoteIdentifier
else {
return false
}
else { return false }

do {
let genericMessage = GenericMessage(
content: originalText.applyEdit(from: messageEdit.text),
let genericMessage: GenericMessage
switch messageEditContent {

case let .text(newText):
guard let originalText = clientMessage.underlyingMessage?.textData else { return false }
genericMessage = GenericMessage(
content: originalText.applyEdit(from: newText),
nonce: messageNonce
)

case let .composite(newComposite):
guard clientMessage.underlyingMessage?.compositeData != nil else { return false }
genericMessage = GenericMessage(
content: newComposite,
nonce: messageNonce
)
}

do {
try clientMessage.setUnderlyingMessage(genericMessage)
} catch {
WireLogger.messageProcessing.warn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@ extension ZMClientMessage {
///
/// - parameter messageEdit: Message edit update
/// - parameter updateEvent: Update event which delivered the message edit update
/// - Returns: true if edit was succesfully applied
/// - Returns: true if edit was successfully applied

func processMessageEdit(_ messageEdit: MessageEdit, from updateEvent: ZMUpdateEvent) -> Bool {
guard
let nonce = updateEvent.messageNonce,
let senderUUID = updateEvent.senderUUID,
let originalText = underlyingMessage?.textData,
case .text? = messageEdit.content,
senderUUID == sender?.remoteIdentifier
else {
return false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,17 @@ public extension GenericMessage {
}

var compositeData: Composite? {
guard let content else { return nil }
switch content {
case let .composite(data):
return data
case let .edited(messageEdit):
if case let .composite(composite)? = messageEdit.content {
return composite
}
default:
return nil
break
}
return nil
}

var imageAssetData: ImageAsset? {
Expand Down Expand Up @@ -547,9 +551,7 @@ public extension Text {
}

func updateLinkPreview(from text: Text) -> Text {
guard !text.linkPreview.isEmpty else {
return self
}
guard !text.linkPreview.isEmpty else { return self }
do {
let data = try serializedData()
var updatedText = try Text(serializedBytes: data)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ extension MessageBackupModel.Content {
switch messageEdit.content {
case let .text(text):
self.init(text)
case .composite, .none:
case .composite:
fallthrough // composite messages are not supported in backups yet
case .none:
return nil
}
}
Expand Down
Loading