#4090 - Update after review

Riot/Modules/Room/VoiceMessages/VoiceMessageAttachmentCacheManager.swift

@@ -42,16 +42,13 @@ class VoiceMessageAttachmentCacheManager {
     
     static let sharedManager = VoiceMessageAttachmentCacheManager()
     
-//    private let workQueue: DispatchQueue
-    
     private var completionCallbacks = [String: [CompletionWrapper]]()
     private var samples = [String: [Int: [Float]]]()
     private var durations = [String: TimeInterval]()
     private var finalURLs = [String: URL]()
     
-//    private init() {
-//        workQueue = DispatchQueue(label: "io.element.VoiceMessageAttachmentCacheManager.queue", qos: .userInitiated)
-//    }
+    private init() {
+    }
     
     func loadAttachment(_ attachment: MXKAttachment, numberOfSamples: Int, completion: @escaping (Result<(String, URL, TimeInterval, [Float]), Error>) -> Void) {
         guard attachment.type == MXKAttachmentTypeVoiceMessage else {
@@ -74,9 +71,7 @@ class VoiceMessageAttachmentCacheManager {
             return
         }
         
-//        workQueue.async {
-            self.enqueueLoadAttachment(attachment, identifier: identifier, numberOfSamples: numberOfSamples, completion: completion)
-//        }
+        self.enqueueLoadAttachment(attachment, identifier: identifier, numberOfSamples: numberOfSamples, completion: completion)
     }
     
     private func enqueueLoadAttachment(_ attachment: MXKAttachment, identifier: String, numberOfSamples: Int, completion: @escaping (Result<(String, URL, Double, [Float]), Error>) -> Void) {

Riot/Modules/Room/VoiceMessages/VoiceMessageAudioConverter.swift

@@ -34,13 +34,35 @@ struct VoiceMessageAudioConverter {
     }
     
     static func mediaDurationAt(_ sourceURL: URL, completion: @escaping (Result<TimeInterval, VoiceMessageAudioConverterError>) -> Void) {
-        DispatchQueue.global(qos: .userInteractive).async {
-            let mediaInfoSession = FFprobeKit.getMediaInformation(sourceURL.path)
-            let mediaInfo = mediaInfoSession?.getMediaInformation()
-            if let duration = try? TimeInterval(value: mediaInfo?.getDuration() ?? "0") {
-                completion(.success(duration))
-            } else {
-                completion(.failure(.generic("Failed to get media duration")))
+        FFprobeKit.getMediaInformationAsync(sourceURL.path) { session in
+            guard let session = session as? MediaInformationSession else {
+                completion(.failure(.generic("Invalid session")))
+                return
+            }
+            
+            guard let returnCode = session.getReturnCode() else {
+                completion(.failure(.generic("Invalid return code")))
+                return
+            }
+            
+            DispatchQueue.main.async {
+                if returnCode.isSuccess() {
+                    let mediaInfo = session.getMediaInformation()
+                    if let duration = try? TimeInterval(value: mediaInfo?.getDuration() ?? "0") {
+                        completion(.success(duration))
+                    } else {
+                        completion(.failure(.generic("Failed to get media duration")))
+                    }
+                } else if returnCode.isCancel() {
+                    completion(.failure(.cancelled))
+                } else {
+                    completion(.failure(.generic(String(returnCode.getValue()))))
+                    MXLog.error("""
+                        getMediaInformationAsync failed with state: \(String(describing: FFmpegKitConfig.sessionState(toString: session.getState()))), \
+                        returnCode: \(String(describing: returnCode)), \
+                        stackTrace: \(String(describing: session.getFailStackTrace()))
+                        """)
+                }
             }
         }
     }

Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift

@@ -65,7 +65,7 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
         
         _voiceMessageToolbarView.delegate = self
         
-        displayLink = CADisplayLink(target: WeakDisplayLinkTarget(self, selector: #selector(handleDisplayLinkTick)), selector: WeakDisplayLinkTarget.triggerSelector)
+        displayLink = CADisplayLink(target: WeakTarget(self, selector: #selector(handleDisplayLinkTick)), selector: WeakTarget.triggerSelector)
         displayLink.isPaused = true
         displayLink.add(to: .current, forMode: .common)
         

Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackController.swift

@@ -65,7 +65,7 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
         
         playbackView.delegate = self
         
-        displayLink = CADisplayLink(target: WeakDisplayLinkTarget(self, selector: #selector(handleDisplayLinkTick)), selector: WeakDisplayLinkTarget.triggerSelector)
+        displayLink = CADisplayLink(target: WeakTarget(self, selector: #selector(handleDisplayLinkTick)), selector: WeakTarget.triggerSelector)
         displayLink.isPaused = true
         displayLink.add(to: .current, forMode: .common)
         

Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift

@@ -102,6 +102,7 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
             return
         }
         
+        self.backgroundColor = theme.colors.background
         playButton.backgroundColor = theme.colors.separator
         backgroundView.backgroundColor = theme.colors.quinaryContent
         _waveformView.primarylineColor =  theme.colors.quarterlyContent