#4090 - Fixed the AttachmentCacheManager's serial nature.

element-hq · Jul 16, 2021 · 79bb35d · 79bb35d
1 parent 427e77e
commit 79bb35d
Showing 1 changed file with 29 additions and 16 deletions.
diff --git a/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift b/Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift
@@ -106,9 +106,15 @@ class VoiceMessageAttachmentCacheManager {
             completionCallbacks[callbackKey] = [CompletionWrapper(completion)]
         }
 
+        let dispatchGroup = DispatchGroup()
+
         func sampleFileAtURL(_ url: URL, duration: TimeInterval) {
             let analyser = WaveformAnalyzer(audioAssetURL: url)
+
+            dispatchGroup.enter()
             analyser?.samples(count: numberOfSamples, completionHandler: { samples in
+                dispatchGroup.leave()
+
                 // Dispatch back from the WaveformAnalyzer's internal queue
                 self.workQueue.async {
                     guard let samples = samples else {
@@ -141,26 +147,31 @@ class VoiceMessageAttachmentCacheManager {
             let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
             let newURL = temporaryDirectoryURL.appendingPathComponent(ProcessInfo().globallyUniqueString).appendingPathExtension("m4a")
 
+            dispatchGroup.enter()
             VoiceMessageAudioConverter.convertToMPEG4AAC(sourceURL: URL(fileURLWithPath: filePath), destinationURL: newURL) { result in
-                switch result {
-                case .success:
-                    self.finalURLs[identifier] = newURL
-                    VoiceMessageAudioConverter.mediaDurationAt(newURL) { result in
-                        switch result {
-                        case .success:
-                            if let duration = try? result.get() {
-                                self.durations[identifier] = duration
-                                sampleFileAtURL(newURL, duration: duration)
-                            } else {
-                                MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: Failed to retrieve media duration")
+                dispatchGroup.leave()
+
+                self.workQueue.async {
+                    switch result {
+                    case .success:
+                        self.finalURLs[identifier] = newURL
+                        VoiceMessageAudioConverter.mediaDurationAt(newURL) { result in
+                            switch result {
+                            case .success:
+                                if let duration = try? result.get() {
+                                    self.durations[identifier] = duration
+                                    sampleFileAtURL(newURL, duration: duration)
+                                } else {
+                                    MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: Failed to retrieve media duration")
+                                }
+                            case .failure(let error):
+                                MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: failed getting audio duration with: \(error)")
                             }
-                        case .failure(let error):
-                            MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: failed getting audio duration with: \(error)")
                         }
+                    case .failure(let error):
+                        self.invokeFailureCallbacksForIdentifier(identifier, error: VoiceMessageAttachmentCacheManagerError.conversionError(error))
+                        MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: failed decoding audio message with: \(error)")
                     }
-                case .failure(let error):
-                    self.invokeFailureCallbacksForIdentifier(identifier, error: VoiceMessageAttachmentCacheManagerError.conversionError(error))
-                    MXLog.error("[VoiceMessageAttachmentCacheManager] enqueueLoadAttachment: failed decoding audio message with: \(error)")
                 }
             }
         }
@@ -186,6 +197,8 @@ class VoiceMessageAttachmentCacheManager {
                 }
             })
         }
+
+        dispatchGroup.wait()
     }
 
     private func invokeSuccessCallbacksForIdentifier(_ identifier: String, url: URL, duration: TimeInterval, samples: [Float]) {