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

Fix attachment upload progress indicators.

Browse Source
This commit is contained in:
Matthew Chen 2020-03-30 12:41:29 -03:00
parent 6683c09f81
commit 85aa6ee682
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SignalServiceKit/src/Network/API/OWSUploadV2.m
View File

@ -224,7 +224,10 @@ void AppendMultipartFormPath(id<AFMultipartFormData> formData, NSString *name, N
self.urlPath = form.key;
NSString *uploadUrlPath = @"";
return [OWSUploadV2 uploadObjcWithData:self.avatarData uploadForm:form uploadUrlPath:uploadUrlPath];
return [OWSUploadV2 uploadObjcWithData:self.avatarData
uploadForm:form
uploadUrlPath:uploadUrlPath
progressBlock:progressBlock];
}
@end
@ -373,7 +376,10 @@ void AppendMultipartFormPath(id<AFMultipartFormData> formData, NSString *name, N
self.serverId = serverId;
NSString *uploadUrlPath = @"attachments/";
return [OWSUploadV2 uploadObjcWithData:self.attachmentData uploadForm:form uploadUrlPath:uploadUrlPath];
return [OWSUploadV2 uploadObjcWithData:self.attachmentData
uploadForm:form
uploadUrlPath:uploadUrlPath
progressBlock:progressBlock];
}
@end

27
SignalServiceKit/src/Network/API/OWSUploadV2.swift
View File

@ -8,8 +8,14 @@ import PromiseKit
@objc
public class OWSUploadV2: NSObject {
@objc
public class func uploadObjc(data: Data, uploadForm: OWSUploadForm, uploadUrlPath: String) -> AnyPromise {
return AnyPromise(upload(data: data, uploadForm: uploadForm, uploadUrlPath: uploadUrlPath))
public class func uploadObjc(data: Data,
uploadForm: OWSUploadForm,
uploadUrlPath: String,
progressBlock: ((Progress) -> Void)?) -> AnyPromise {
return AnyPromise(upload(data: data,
uploadForm: uploadForm,
uploadUrlPath: uploadUrlPath,
progressBlock: progressBlock))
}
}
@ -25,12 +31,15 @@ public extension OWSUploadV2 {
// MARK: -
class func upload(data: Data, uploadForm: OWSUploadForm, uploadUrlPath: String) -> Promise<String> {
class func upload(data: Data,
uploadForm: OWSUploadForm,
uploadUrlPath: String,
progressBlock: ((Progress) -> Void)? = nil) -> Promise<String> {
let (promise, resolver) = Promise<String>.pending()
DispatchQueue.global().async {
self.uploadSessionManager.post(uploadUrlPath,
parameters: nil,
constructingBodyWith: { (formData: AFMultipartFormData) -> Void in
parameters: nil,
constructingBodyWith: { (formData: AFMultipartFormData) -> Void in
// We have to build up the form manually vs. simply passing in a parameters dict
// because AWS is sensitive to the order of the form params (at least the "key"
@ -43,10 +52,14 @@ public extension OWSUploadV2 {
formData.appendPart(withForm: data, name: "file")
},
progress: { progress in
progress: { progress in
Logger.verbose("progress: \(progress.fractionCompleted)")
if let progressBlock = progressBlock {
progressBlock(progress)
}
},
success: { (_, _) in
success: { (_, _) in
Logger.verbose("Success.")
let uploadedUrlPath = uploadForm.key
resolver.fulfill(uploadedUrlPath)