Skip to content

Don't add .pgp to file list when attaching files on compose screen #615

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
tomholub merged 2 commits into from
Oct 5, 2021
Merged

Don't add .pgp to file list when attaching files on compose screen #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c15459f
Adding .pgp extension to attachments right before sending them
ekievsky Oct 5, 2021
cc56fee
Merge branch 'master' into bugfix/issue-538-dont-add-pgp-to-attchment…
flowcrypt-machine-user Oct 5, 2021
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
6 changes: 3 additions & 3 deletions FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageAttachment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extension ComposeMessageAttachment {
guard let url = librarySourceMediaInfo[urlKey] as? URL else { return nil }
let data = try Data(contentsOf: url)

self.name = "\(url.lastPathComponent).pgp"
self.name = url.lastPathComponent
self.data = data
self.size = data.count
self.type = url.lastPathComponent.mimeType
Expand All @@ -50,7 +50,7 @@ extension ComposeMessageAttachment {
return nil
}

self.name = "\(UUID().uuidString).jpg.pgp"
self.name = "\(UUID().uuidString).jpg"
self.data = data
self.size = data.count
self.type = "image/jpg"
Expand All @@ -61,7 +61,7 @@ extension ComposeMessageAttachment {
return nil
}

self.name = "\(fileURL.lastPathComponent).pgp"
self.name = fileURL.lastPathComponent
self.data = data
self.size = data.count
self.type = fileURL.mimeType
Expand Down
2 changes: 1 addition & 1 deletion FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ final class ComposeMessageService {
let sendableAttachments: [SendableMsg.Attachment] = contextToSend.attachments
.map { composeAttachment in
return SendableMsg.Attachment(
name: composeAttachment.name,
name: "\(composeAttachment.name).pgp",
type: composeAttachment.type,
base64: composeAttachment.data.base64EncodedString()
)
Expand Down