diff --git a/Podfile.lock b/Podfile.lock index 3ff7141db..9619ab8eb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - AFNetworking (3.2.1): - - AFNetworking/NSURLSession (= 3.2.1) - - AFNetworking/Reachability (= 3.2.1) - - AFNetworking/Security (= 3.2.1) - - AFNetworking/Serialization (= 3.2.1) - - AFNetworking/UIKit (= 3.2.1) - - AFNetworking/NSURLSession (3.2.1): + - AFNetworking (4.0.1): + - AFNetworking/NSURLSession (= 4.0.1) + - AFNetworking/Reachability (= 4.0.1) + - AFNetworking/Security (= 4.0.1) + - AFNetworking/Serialization (= 4.0.1) + - AFNetworking/UIKit (= 4.0.1) + - AFNetworking/NSURLSession (4.0.1): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (3.2.1) - - AFNetworking/Security (3.2.1) - - AFNetworking/Serialization (3.2.1) - - AFNetworking/UIKit (3.2.1): + - AFNetworking/Reachability (4.0.1) + - AFNetworking/Security (4.0.1) + - AFNetworking/Serialization (4.0.1) + - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession - CocoaLumberjack (3.6.2): - CocoaLumberjack/Core (= 3.6.2) @@ -21,24 +21,24 @@ PODS: - Curve25519Kit (2.1.0): - CocoaLumberjack - SignalCoreKit - - FeedKit (8.1.1) + - FeedKit (9.1.2) - GRKOpenSSLFramework (1.0.2.20) - HKDFKit (0.0.3) - libPhoneNumber-iOS (0.9.15) - Mantle (2.1.0): - Mantle/extobjc (= 2.1.0) - Mantle/extobjc (2.1.0) - - NVActivityIndicatorView (4.8.0): - - NVActivityIndicatorView/Presenter (= 4.8.0) - - NVActivityIndicatorView/Presenter (4.8.0) - - PromiseKit (6.5.3): - - PromiseKit/CorePromise (= 6.5.3) - - PromiseKit/Foundation (= 6.5.3) - - PromiseKit/UIKit (= 6.5.3) - - PromiseKit/CorePromise (6.5.3) - - PromiseKit/Foundation (6.5.3): + - NVActivityIndicatorView (5.0.1): + - NVActivityIndicatorView/Base (= 5.0.1) + - NVActivityIndicatorView/Base (5.0.1) + - PromiseKit (6.13.1): + - PromiseKit/CorePromise (= 6.13.1) + - PromiseKit/Foundation (= 6.13.1) + - PromiseKit/UIKit (= 6.13.1) + - PromiseKit/CorePromise (6.13.1) + - PromiseKit/Foundation (6.13.1): - PromiseKit/CorePromise - - PromiseKit/UIKit (6.5.3): + - PromiseKit/UIKit (6.13.1): - PromiseKit/CorePromise - PureLayout (3.1.6) - Reachability (3.2) @@ -206,17 +206,17 @@ CHECKOUT OPTIONS: :git: https://github.com/signalapp/YYImage SPEC CHECKSUMS: - AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 + AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce CocoaLumberjack: bd155f2dd06c0e0b03f876f7a3ee55693122ec94 CryptoSwift: 093499be1a94b0cae36e6c26b70870668cb56060 Curve25519Kit: e63f9859ede02438ae3defc5e1a87e09d1ec7ee6 - FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9 + FeedKit: 71653273ab08e618cd6fd1301ca08fc02dca6a9e GRKOpenSSLFramework: dc635b0a9d4cd8af2a9ff80a61e779e21b69dfd8 HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b - NVActivityIndicatorView: d24b7ebcf80af5dcd994adb650e2b6c93379270f - PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd + NVActivityIndicatorView: 738e843cb8924e9e4fc3e559d0728031624bf860 + PromiseKit: 28fda91c973cc377875d8c0ea4f973013c05b6db PureLayout: bd3c4ec3a3819ad387c99ebb72c6b129c3ed4d2d Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c diff --git a/Pods b/Pods index bf52f4d72..7c538fbeb 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit bf52f4d72e2b84cdc1bd4a90785223602542230a +Subproject commit 7c538fbeb0acf79d9f84dce16f556c39f1409928 diff --git a/Session/Signal/ConversationView/ConversationViewItem.m b/Session/Signal/ConversationView/ConversationViewItem.m index 8cc2f8d14..c3fa1eaca 100644 --- a/Session/Signal/ConversationView/ConversationViewItem.m +++ b/Session/Signal/ConversationView/ConversationViewItem.m @@ -2,6 +2,7 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // +#import #import "ConversationViewItem.h" #import "OWSContactOffersCell.h" #import "OWSMessageCell.h" diff --git a/Session/Signal/GiphyAPI.swift b/Session/Signal/GiphyAPI.swift index 64304fca9..4692ca98a 100644 --- a/Session/Signal/GiphyAPI.swift +++ b/Session/Signal/GiphyAPI.swift @@ -4,6 +4,7 @@ import Foundation import PromiseKit +import CoreServices // There's no UTI type for webp! enum GiphyFormat { @@ -300,6 +301,7 @@ extension GiphyError: LocalizedError { let (promise, resolver) = Promise<[GiphyImageInfo]>.pending() sessionManager.get(urlString, parameters: [String: AnyObject](), + headers:nil, progress: nil, success: { _, value in Logger.error("search request succeeded") @@ -347,6 +349,7 @@ extension GiphyError: LocalizedError { sessionManager.get(urlString, parameters: [String: AnyObject](), + headers: nil, progress: nil, success: { _, value in Logger.error("search request succeeded") diff --git a/Session/Signal/Pastelog.m b/Session/Signal/Pastelog.m index b774ab1fc..8596239ff 100644 --- a/Session/Signal/Pastelog.m +++ b/Session/Signal/Pastelog.m @@ -79,6 +79,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error NSString *urlString = @"https://debuglogs.org/"; [sessionManager GET:urlString parameters:nil + headers:nil progress:nil success:^(NSURLSessionDataTask *task, id _Nullable responseObject) { DebugLogUploader *strongSelf = weakSelf; @@ -158,6 +159,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error sessionManager.responseSerializer = [AFHTTPResponseSerializer serializer]; [sessionManager POST:uploadUrl parameters:@{} + headers:nil constructingBodyWithBlock:^(id formData) { for (NSString *fieldName in fields) { NSString *fieldValue = fields[fieldName]; diff --git a/Session/Signal/PhotoCapture.swift b/Session/Signal/PhotoCapture.swift index 9234bc0a8..385f4b63c 100644 --- a/Session/Signal/PhotoCapture.swift +++ b/Session/Signal/PhotoCapture.swift @@ -4,6 +4,7 @@ import Foundation import PromiseKit +import CoreServices protocol PhotoCaptureDelegate: AnyObject { func photoCapture(_ photoCapture: PhotoCapture, didFinishProcessingAttachment attachment: SignalAttachment) diff --git a/Session/Signal/PhotoLibrary.swift b/Session/Signal/PhotoLibrary.swift index ce2e66eb2..c2a93136e 100644 --- a/Session/Signal/PhotoLibrary.swift +++ b/Session/Signal/PhotoLibrary.swift @@ -5,6 +5,7 @@ import Foundation import Photos import PromiseKit +import CoreServices protocol PhotoLibraryDelegate: class { func photoLibraryDidChange(_ photoLibrary: PhotoLibrary) diff --git a/SessionMessagingKit/Utilities/DotNetAPI.swift b/SessionMessagingKit/Utilities/DotNetAPI.swift index 1baf4b7d5..609003b17 100644 --- a/SessionMessagingKit/Utilities/DotNetAPI.swift +++ b/SessionMessagingKit/Utilities/DotNetAPI.swift @@ -102,7 +102,6 @@ public class DotNetAPI : NSObject { } public static func downloadAttachment(from url: String) -> Promise { - var error: NSError? var host = "https://\(URL(string: url)!.host!)" let sanitizedURL: String if FileServerAPI.fileStorageBucketURL.contains(host) { @@ -111,8 +110,10 @@ public class DotNetAPI : NSObject { } else { sanitizedURL = url.replacingOccurrences(of: host, with: "\(host)/loki/v1") } - let request = AFHTTPRequestSerializer().request(withMethod: "GET", urlString: sanitizedURL, parameters: nil, error: &error) - if let error = error { + let request: NSMutableURLRequest + do { + request = try AFHTTPRequestSerializer().request(withMethod: "GET", urlString: sanitizedURL, parameters: nil) + } catch { SNLog("Couldn't download attachment due to error: \(error).") return Promise(error: error) } diff --git a/SessionShareExtension/ShareViewController.swift b/SessionShareExtension/ShareViewController.swift index c86928e8b..c2b757a9a 100644 --- a/SessionShareExtension/ShareViewController.swift +++ b/SessionShareExtension/ShareViewController.swift @@ -7,6 +7,7 @@ import UIKit import PureLayout import PromiseKit import SessionUIKit +import CoreServices @objc public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailedViewDelegate, AppModeManagerDelegate { diff --git a/SignalUtilitiesKit/AttachmentApprovalViewController.swift b/SignalUtilitiesKit/AttachmentApprovalViewController.swift index 6b90e61b8..7c06c23f3 100644 --- a/SignalUtilitiesKit/AttachmentApprovalViewController.swift +++ b/SignalUtilitiesKit/AttachmentApprovalViewController.swift @@ -7,6 +7,7 @@ import AVFoundation import MediaPlayer import PromiseKit import SessionUIKit +import CoreServices @objc public protocol AttachmentApprovalViewControllerDelegate: class { diff --git a/SignalUtilitiesKit/OWSLinkPreview.swift b/SignalUtilitiesKit/OWSLinkPreview.swift index 80faf4545..656f43657 100644 --- a/SignalUtilitiesKit/OWSLinkPreview.swift +++ b/SignalUtilitiesKit/OWSLinkPreview.swift @@ -647,6 +647,7 @@ public class OWSLinkPreview: MTLModel { let (promise, resolver) = Promise.pending() sessionManager.get(urlString, parameters: [String: AnyObject](), + headers: nil, progress: nil, success: { task, value in diff --git a/SignalUtilitiesKit/TSNetworkManager.m b/SignalUtilitiesKit/TSNetworkManager.m index a257cbc1d..20c39fb0b 100644 --- a/SignalUtilitiesKit/TSNetworkManager.m +++ b/SignalUtilitiesKit/TSNetworkManager.m @@ -115,28 +115,33 @@ dispatch_queue_t NetworkManagerQueue() if ([request.HTTPMethod isEqualToString:@"GET"]) { [self.sessionManager GET:request.URL.absoluteString parameters:request.parameters + headers:request.allHTTPHeaderFields progress:nil success:success failure:failure]; } else if ([request.HTTPMethod isEqualToString:@"POST"]) { [self.sessionManager POST:request.URL.absoluteString parameters:request.parameters + headers:request.allHTTPHeaderFields progress:nil success:success failure:failure]; } else if ([request.HTTPMethod isEqualToString:@"PUT"]) { [self.sessionManager PUT:request.URL.absoluteString parameters:request.parameters + headers:request.allHTTPHeaderFields success:success failure:failure]; } else if ([request.HTTPMethod isEqualToString:@"DELETE"]) { [self.sessionManager DELETE:request.URL.absoluteString parameters:request.parameters + headers:request.allHTTPHeaderFields success:success failure:failure]; } else if ([request.HTTPMethod isEqualToString:@"PATCH"]) { [self.sessionManager PATCH:request.URL.absoluteString parameters:request.parameters + headers:request.allHTTPHeaderFields success:success failure:failure]; } else {