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

Merge branch 'charlesmchen/arbitraryAttachments'

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 72eb632874 70ac0acc68
commit c1f2ae61b6
1 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File

77
Signal/src/ViewControllers/SignalAttachment.swift
Unescape Escape View File

@ -54,8 +54,6 @@ enum TSImageQuality {
// [SignalAttachment hasError] will be true for non-valid attachments.
//
// TODO: Perhaps do conversion off the main thread?
// TODO: Show error on error.
// TODO: Show progress on upload.
class SignalAttachment: NSObject {
static let TAG = "[SignalAttachment]"
@ -195,8 +193,6 @@ class SignalAttachment: NSObject {
return fileExtension.takeRetainedValue() as String
}
private static let allowArbitraryAttachments = false
// Returns the set of UTIs that correspond to valid _input_ image formats
// for Signal attachments.
//
@ -209,17 +205,7 @@ class SignalAttachment: NSObject {
// Returns the set of UTIs that correspond to valid _output_ image formats
// for Signal attachments.
private class var outputImageUTISet: Set<String> {
if allowArbitraryAttachments {
return MIMETypeUtil.supportedImageUTITypes().union(animatedImageUTISet)
} else {
// Until Android client can handle arbitrary attachments,
// restrict output.
return [
kUTTypeJPEG as String,
kUTTypeGIF as String,
kUTTypePNG as String
]
}
return MIMETypeUtil.supportedImageUTITypes().union(animatedImageUTISet)
}
// Returns the set of UTIs that correspond to valid animated image formats
@ -231,32 +217,13 @@ class SignalAttachment: NSObject {
// Returns the set of UTIs that correspond to valid video formats
// for Signal attachments.
private class var videoUTISet: Set<String> {
if allowArbitraryAttachments {
return MIMETypeUtil.supportedVideoUTITypes()
} else {
return [
kUTTypeMPEG4 as String
]
}
return MIMETypeUtil.supportedVideoUTITypes()
}
// Returns the set of UTIs that correspond to valid audio formats
// for Signal attachments.
private class var audioUTISet: Set<String> {
if allowArbitraryAttachments {
return MIMETypeUtil.supportedAudioUTITypes()
} else {
return [
kUTTypeMP3 as String,
kUTTypeMPEG4Audio as String
]
}
}
// Returns the set of UTIs that correspond to valid input formats
// for Signal attachments.
public class var validInputUTISet: Set<String> {
return inputImageUTISet.union(videoUTISet.union(audioUTISet))
return MIMETypeUtil.supportedAudioUTITypes()
}
public var isImage: Bool {
@ -276,16 +243,7 @@ class SignalAttachment: NSObject {
}
public class func pasteboardHasPossibleAttachment() -> Bool {
guard UIPasteboard.general.numberOfItems >= 1 else {
return false
}
// If pasteboard contains multiple items, use only the first.
let itemSet = IndexSet(integer:0)
guard let pasteboardUTITypes = UIPasteboard.general.types(forItemSet:itemSet) else {
return false
}
let pasteboardUTISet = Set<String>(pasteboardUTITypes[0])
return pasteboardUTISet.intersection(validInputUTISet).count > 0
return UIPasteboard.general.numberOfItems > 0
}
// Returns an attachment from the pasteboard, or nil if no attachment
@ -306,7 +264,8 @@ class SignalAttachment: NSObject {
for dataUTI in inputImageUTISet {
if pasteboardUTISet.contains(dataUTI) {
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
return imageAttachment(data : data, dataUTI : dataUTI)
@ -315,7 +274,8 @@ class SignalAttachment: NSObject {
for dataUTI in videoUTISet {
if pasteboardUTISet.contains(dataUTI) {
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
return videoAttachment(data : data, dataUTI : dataUTI)
@ -324,15 +284,21 @@ class SignalAttachment: NSObject {
for dataUTI in audioUTISet {
if pasteboardUTISet.contains(dataUTI) {
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
return audioAttachment(data : data, dataUTI : dataUTI)
}
}
// TODO: We could handle generic attachments at this point.
return nil
let dataUTI = pasteboardUTISet[pasteboardUTISet.startIndex]
guard let data = dataForFirstPasteboardItem(dataUTI:dataUTI) else {
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
return genericAttachment(data : data, dataUTI : dataUTI)
}
// This method should only be called for dataUTIs that
@ -340,15 +306,18 @@ class SignalAttachment: NSObject {
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)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
guard datas.count > 0 else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
guard let data = datas[0] as? Data else {
Logger.verbose("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
Logger.error("\(TAG) Missing expected pasteboard data for UTI: \(dataUTI)")
assertionFailure()
return nil
}
return data

Write Preview
Loading…
Cancel
Save