oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-03-14 10:21:59 -03:00
parent 43857a4c78
commit 1c95eb5d51
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/view controllers/AttachmentApprovalViewController.swift
View File

@ -24,7 +24,7 @@ class AttachmentApprovalViewController: UIViewController {
assert(false)
}
required init(attachment: SignalAttachment!, successCompletion : @escaping () -> Void) {
required init(attachment: SignalAttachment, successCompletion : @escaping () -> Void) {
assert(!attachment.hasError)
self.attachment = attachment
self.successCompletion = successCompletion

41
Signal/src/view controllers/SignalAttachment.swift
View File

@ -213,19 +213,28 @@ class SignalAttachment: NSObject {
let pasteboardUTISet = Set<String>(pasteboardUTITypes[0])
for dataUTI in inputImageUTISet {
if pasteboardUTISet.contains(dataUTI) {
let data = UIPasteboard.general.data(forPasteboardType:dataUTI, inItemSet:itemSet)![0] as! Data
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
return imageAttachment(data : data, dataUTI : dataUTI)
}
}
for dataUTI in videoUTISet {
if pasteboardUTISet.contains(dataUTI) {
let data = UIPasteboard.general.data(forPasteboardType:dataUTI, inItemSet:itemSet)![0] as! Data
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
return videoAttachment(data : data, dataUTI : dataUTI)
}
}
for dataUTI in audioUTISet {
if pasteboardUTISet.contains(dataUTI) {
let data = UIPasteboard.general.data(forPasteboardType:dataUTI, inItemSet:itemSet)![0] as! Data
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
return audioAttachment(data : data, dataUTI : dataUTI)
}
}
@ -234,6 +243,25 @@ class SignalAttachment: NSObject {
return nil
}
// This method should only be called for dataUTIs that
// are appropriate for the first pasteboard item.
private class func dataForFirstPasteboardItem(dataUTI: String) -> Data? {
let itemSet = IndexSet(integer:0)
guard let datas = UIPasteboard.general.data(forPasteboardType:dataUTI, inItemSet:itemSet) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
guard datas.count > 0 else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
guard let data = datas[0] as? Data else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
return nil
}
return data
}
// MARK: Image Attachments
// Factory method for an image attachment.
@ -289,9 +317,10 @@ class SignalAttachment: NSObject {
}
private class func defaultImageUploadQuality() -> TSImageQuality {
// Always default to the highest possible image quality and
// not converting the image if possible.
return .uncropped
// Currently default to a middling image quality and size.
//
// TODO: We're likely to change this behavior soon.
return .medium
}
// If the proposed attachment already conforms to the