signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

include file size

Browse Source
This commit is contained in:
Michael Kirk 2019-04-23 12:46:36 -07:00
parent d90e7362b3
commit fffff04135
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Signal/src/ViewControllers/MessageDetailViewController.swift
View File

@ -42,7 +42,6 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
var contentView: UIView?
var attachment: TSAttachment?
var dataSource: DataSource?
var attachmentStream: TSAttachmentStream?
var messageBody: String?
@ -439,6 +438,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
return true
}
private let byteCountFormatter: ByteCountFormatter = ByteCountFormatter()
private func addAttachmentMetadataRows() -> [UIView] {
guard hasMediaAttachment else {
return []
@ -447,26 +448,26 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
var rows = [UIView]()
if let attachment = self.attachment {
// Only show MIME types in DEBUG builds.
if _isDebugAssertConfiguration() {
let contentType = attachment.contentType
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_MIME_TYPE",
comment: "Label for the MIME type of attachments in the 'message metadata' view."),
value: contentType))
}
if let sourceFilename = attachment.sourceFilename {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_SOURCE_FILENAME",
comment: "Label for the original filename of any attachment in the 'message metadata' view."),
value: sourceFilename))
}
}
if let dataSource = self.dataSource {
let fileSize = dataSource.dataLength()
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE",
comment: "Label for file size of attachments in the 'message metadata' view."),
value: OWSFormat.formatFileSize(UInt(fileSize))))
if _isDebugAssertConfiguration() {
let contentType = attachment.contentType
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_MIME_TYPE",
comment: "Label for the MIME type of attachments in the 'message metadata' view."),
value: contentType))
if let formattedByteCount = byteCountFormatter.string(for: attachment.byteCount) {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE",
comment: "Label for file size of attachments in the 'message metadata' view."),
value: formattedByteCount))
} else {
owsFailDebug("formattedByteCount was unexpectedly nil")
}
}
}
return rows