Skip to content

#2675 Fix: duplicated signature after draft save issue #2684

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
sosnovsky merged 3 commits into from
Sep 10, 2025
Merged

#2675 Fix: duplicated signature after draft save issue #2684

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf620cd
fix: duplicated signature after draft save
ioanatflowcrypt Aug 19, 2025
17b2d31
fixed signature raw
ioanatflowcrypt Aug 19, 2025
7a71b60
fix: pr reviews
ioanatflowcrypt Sep 8, 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
18 changes: 16 additions & 2 deletions FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,22 @@ extension ComposeViewController {
mutableString.append(styledQuote)
}

if let signature = getSignature(), !mutableString.string.replacingOccurrences(of: "\r", with: "").contains(signature) {
mutableString.append(signature.attributed(.regular(17)))
if let signatureRaw = getSignature() {
func normalize(_ s: String) -> String {
return s
.replacingOccurrences(of: "\r\n", with: "\n")
.replacingOccurrences(of: "\r", with: "\n")
// fix html signature duplicate issue
// https://github.com/FlowCrypt/flowcrypt-ios/pull/2684#discussion_r2318361291
.replacingOccurrences(of: "\u{00A0}", with: " ")
.trimmingCharacters(in: .whitespacesAndNewlines)
}
let body = normalize(mutableString.string)
let signature = normalize(signatureRaw)
let alreadyHasSig = body.contains(signature)
if !alreadyHasSig {
mutableString.append(signatureRaw.attributed(.regular(17)))
}
}

let height = max(decorator.frame(for: mutableString).height, 40)
Expand Down