ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vector-im/element-x-ios/issues/53 - Converted most callback based methods to async/await

Browse Source
This commit is contained in:
Stefan Ceriu
2022-05-24 16:59:01 +03:00
committed by Stefan Ceriu
parent f2fe39eca7
commit dde7786152
23 changed files with 407 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Media/MediaProvider.swift
+37 -42
View File
@@ -29,46 +29,6 @@ struct MediaProvider: MediaProviderProtocol {
return imageCache.retrieveImageInMemoryCache(forKey: source.underlyingSource.url(), options: nil)
}
func loadImageFromSource(_ source: MediaSource, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void) {
if let image = imageFromSource(source) {
completion(.success(image))
return
}
imageCache.retrieveImage(forKey: source.underlyingSource.url()) { result in
if case let .success(cacheResult) = result,
let image = cacheResult.image {
completion(.success(image))
return
}
processingQueue.async {
do {
let imageData = try client.getMediaContent(source: source.underlyingSource)
guard let image = UIImage(data: Data(bytes: imageData, count: imageData.count)) else {
MXLog.error("Invalid image data")
DispatchQueue.main.async {
completion(.failure(.invalidImageData))
}
return
}
imageCache.store(image, forKey: source.underlyingSource.url())
DispatchQueue.main.async {
completion(.success(image))
}
} catch {
MXLog.error("Failed retrieving image with error: \(error)")
DispatchQueue.main.async {
completion(.failure(.failedRetrievingImage))
}
}
}
}
}
func imageFromURL(_ url: String?) -> UIImage? {
guard let url = url else {
return nil
@@ -77,7 +37,42 @@ struct MediaProvider: MediaProviderProtocol {
return imageFromSource(MediaSource(source: mediaSourceFromUrl(url: url)))
}
func loadImageFromURL(_ url: String, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void) {
return loadImageFromSource(MediaSource(source: mediaSourceFromUrl(url: url)), completion)
func loadImageFromURL(_ url: String) async -> Result<UIImage, MediaProviderError> {
await loadImageFromSource(MediaSource(source: mediaSourceFromUrl(url: url)))
}
func loadImageFromSource(_ source: MediaSource) async -> Result<UIImage, MediaProviderError> {
if let image = imageFromSource(source) {
return .success(image)
}
return await withCheckedContinuation { continuation in
imageCache.retrieveImage(forKey: source.underlyingSource.url()) { result in
if case let .success(cacheResult) = result,
let image = cacheResult.image {
continuation.resume(returning: .success(image))
return
}
processingQueue.async {
do {
let imageData = try client.getMediaContent(source: source.underlyingSource)
guard let image = UIImage(data: Data(bytes: imageData, count: imageData.count)) else {
MXLog.error("Invalid image data")
continuation.resume(returning: .failure(.invalidImageData))
return
}
imageCache.store(image, forKey: source.underlyingSource.url())
continuation.resume(returning: .success(image))
} catch {
MXLog.error("Failed retrieving image with error: \(error)")
continuation.resume(returning: .failure(.failedRetrievingImage))
}
}
}
}
}
}
ElementX/Sources/Services/Media/MediaProviderProtocol.swift
+2 -2
View File
@@ -17,9 +17,9 @@ enum MediaProviderError: Error {
protocol MediaProviderProtocol {
func imageFromSource(_ source: MediaSource?) -> UIImage?
func loadImageFromSource(_ source: MediaSource, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void)
func loadImageFromSource(_ source: MediaSource) async -> Result<UIImage, MediaProviderError>
func imageFromURL(_ url: String?) -> UIImage?
func loadImageFromURL(_ url: String, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void)
func loadImageFromURL(_ url: String) async -> Result<UIImage, MediaProviderError>
}
ElementX/Sources/Services/Media/MockMediaProvider.swift
+6 -2
View File
@@ -19,8 +19,8 @@ struct MockMediaProvider: MediaProviderProtocol {
return nil
}
func loadImageFromSource(_ source: MediaSource, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void) {
func loadImageFromSource(_ source: MediaSource) async -> Result<UIImage, MediaProviderError> {
return .failure(.failedRetrievingImage)
}
func imageFromURL(_ url: String?) -> UIImage? {
@@ -30,4 +30,8 @@ struct MockMediaProvider: MediaProviderProtocol {
func loadImageFromURL(_ url: String, _ completion: @escaping (Result<UIImage, MediaProviderError>) -> Void) {
}
func loadImageFromURL(_ url: String) async -> Result<UIImage, MediaProviderError> {
return .failure(.failedRetrievingImage)
}
}