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

Download picked GIF faster: cancel pending request 

// FREEBIE
This commit is contained in:
Michael Kirk 2017-10-19 14:12:50 -07:00
parent b8ce636afc
commit 3939e8a6ac
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Signal/src/ViewControllers/GifPicker/GifPickerCell.swift
View File

@ -208,7 +208,7 @@ class GifPickerCell: UICollectionViewCell {
self.backgroundColor = nil
}
public func fetchRenditionForSending() -> Promise<GiphyAsset> {
public func requestRenditionForSending() -> Promise<GiphyAsset> {
guard let renditionForSending = self.renditionForSending else {
owsFail("\(TAG) renditionForSending was unexpectedly nil")
return Promise(error: GifPickerCellError.assertionError(description: "renditionForSending was unexpectedly nil"))
@ -218,15 +218,16 @@ class GifPickerCell: UICollectionViewCell {
// We don't retain a handle on the asset request, since there will only ever
// be one selected asset, and we never want to cancel it.
_ = GiphyDownloader.sharedInstance.requestAsset(rendition: renditionForSending,
priority: .high,
success: { _, asset in
fulfill(asset)
_ = GiphyDownloader
.sharedInstance.requestAsset(rendition: renditionForSending,
priority: .high,
success: { _, asset in
fulfill(asset)
},
failure: { _ in
// TODO GiphyDownloader API shoudl pass through a useful failing error
// so we can pass it through here
reject(GifPickerCellError.fetchFailure)
failure: { _ in
// TODO GiphyDownloader API shoudl pass through a useful failing error
// so we can pass it through here
reject(GifPickerCellError.fetchFailure)
})

3
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
View File

@ -333,7 +333,8 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
self.collectionView.isUserInteractionEnabled = false
cell.fetchRenditionForSending().then { (asset: GiphyAsset) -> Void in
GiphyDownloader.sharedInstance.cancelAllRequests()
cell.requestRenditionForSending().then { (asset: GiphyAsset) -> Void in
let filePath = asset.filePath
guard let dataSource = DataSourcePath.dataSource(withFilePath: filePath) else {
owsFail("\(self.TAG) couldn't load asset.")

4
Signal/src/network/GiphyDownloader.swift
View File

@ -237,6 +237,10 @@ extension URLSessionTask {
return assetRequest
}
public func cancelAllRequests() {
self.assetRequestQueue.forEach { $0.cancel() }
}
private func assetRequestDidSucceed(assetRequest: GiphyAssetRequest, asset: GiphyAsset) {
DispatchQueue.main.async {
self.assetMap.set(key:assetRequest.rendition.url, value:asset)