felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 08:03:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

#4094 - Caching layer work queue fixes and preventing sampling division by 0.

Browse Source
This commit is contained in:
Stefan Ceriu
2021-06-25 13:18:40 +03:00
parent 3f7d821c69
commit e353f01c5c
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift
+23 -21
View File
@@ -23,6 +23,7 @@ enum VoiceMessageAttachmentCacheManagerError: Error {
case decryptionError(Error)
case preparationError(Error)
case conversionError(Error)
case invalidNumberOfSamples
case samplingError
}
@@ -52,33 +53,32 @@ class VoiceMessageAttachmentCacheManager {
}
func loadAttachment(_ attachment: MXKAttachment, numberOfSamples: Int, completion: @escaping (Result<(URL, [Float]), Error>) -> Void) {
workQueue.async {
self.enqueueLoadAttachment(attachment, numberOfSamples: numberOfSamples, completion: completion)
}
}
func enqueueLoadAttachment(_ attachment: MXKAttachment, numberOfSamples: Int, completion: @escaping (Result<(URL, [Float]), Error>) -> Void) {
guard attachment.type == MXKAttachmentTypeVoiceMessage else {
DispatchQueue.main.async {
completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidAttachmentType))
}
completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidAttachmentType))
return
}
guard let identifier = attachment.eventId else {
DispatchQueue.main.async {
completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidEventId))
}
completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidEventId))
return
}
guard numberOfSamples > 0 else {
completion(Result.failure(VoiceMessageAttachmentCacheManagerError.invalidNumberOfSamples))
return
}
if let finalURL = finalURLs[identifier], let samples = samples[identifier]?[numberOfSamples] {
DispatchQueue.main.async {
completion(Result.success((finalURL, samples)))
}
completion(Result.success((finalURL, samples)))
return
}
workQueue.async {
self.enqueueLoadAttachment(attachment, identifier: identifier, numberOfSamples: numberOfSamples, completion: completion)
}
}
private func enqueueLoadAttachment(_ attachment: MXKAttachment, identifier: String, numberOfSamples: Int, completion: @escaping (Result<(URL, [Float]), Error>) -> Void) {
if var callbacks = completionCallbacks[identifier] {
callbacks.append(CompletionWrapper(completion))
completionCallbacks[identifier] = callbacks
@@ -160,13 +160,14 @@ class VoiceMessageAttachmentCacheManager {
return
}
for wrapper in callbacks {
DispatchQueue.main.async {
let copy = callbacks.map { $0 }
DispatchQueue.main.async {
for wrapper in copy {
wrapper.completion(Result.success((url, samples)))
}
}
completionCallbacks[identifier] = nil
self.completionCallbacks[identifier] = nil
}
private func invokeFailureCallbacksForIdentifier(_ identifier: String, error: Error) {
@@ -174,12 +175,13 @@ class VoiceMessageAttachmentCacheManager {
return
}
for wrapper in callbacks {
DispatchQueue.main.async {
let copy = callbacks.map { $0 }
DispatchQueue.main.async {
for wrapper in copy {
wrapper.completion(Result.failure(error))
}
}
completionCallbacks[identifier] = nil
self.completionCallbacks[identifier] = nil
}
}