Skip to content

Commit 21344f4

Browse files
ioanatflowcryptIoan Moldovan
andauthored
fix: sending a secure reply using the created draft produces a new thread issue (#2677)
Co-authored-by: Ioan Moldovan <mobilestar108@outlook.com>
1 parent 788ed25 commit 21344f4

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ extension GmailService: MessageProvider {
2121

2222
let query = createMessageQuery(identifier: identifier, format: kGTLRGmailFormatFull)
2323
return try await withCheckedThrowingContinuation { continuation in
24-
self.gmailService.executeQuery(query) { _, data, error in
24+
self.gmailService.executeQuery(query) {
25+
_,
26+
data,
27+
error in
2528
if let error {
2629
return continuation.resume(throwing: GmailApiError.providerError(error))
2730
}

FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+MessageExtension.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ extension Message {
4444
var replyTo: String?
4545
var inReplyTo: String?
4646
var rfc822MsgId: String?
47+
var replyToMsgId: String?
4748
var isSuspicious = false
4849

4950
for messageHeader in messageHeaders.compactMap({ $0 }) {
@@ -58,7 +59,9 @@ extension Message {
5859
case .cc: cc = value
5960
case .bcc: bcc = value
6061
case .replyTo: replyTo = value
61-
case .inReplyTo: inReplyTo = value
62+
case .inReplyTo:
63+
inReplyTo = value
64+
replyToMsgId = value
6265
case .receivedSPF: isSuspicious = value.contains("softfail")
6366
case .identifier: rfc822MsgId = value
6467
default: break
@@ -84,6 +87,7 @@ extension Message {
8487
bcc: bcc,
8588
replyTo: replyTo,
8689
inReplyTo: inReplyTo,
90+
replyToMsgId: replyToMsgId,
8791
isSuspicious: isSuspicious
8892
)
8993
}

0 commit comments

Comments
 (0)