Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

use roomId for audioPlayerId, remove dead code, make functions private.

Browse source
This commit is contained in:
David Langley 2021-09-23 10:55:35 +01:00
parent c1fd40c5bb
commit eb92cc9cf8
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Riot/Modules/Room/VoiceMessages/VoiceMessageController.swift
View file

@ -54,12 +54,6 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
return dateFormatter return dateFormatter
}() }()
private static let fileNameDateFormatter: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = Constants.fileNameDateFormat
return dateFormatter
}()
private var temporaryFileURL: URL? { private var temporaryFileURL: URL? {
guard let roomId = roomId else { guard let roomId = roomId else {
return nil return nil
@ -106,18 +100,6 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
updateUI() updateUI()
} }
func checkForRecording() {
guard let temporaryFileURL = temporaryFileURL else {
return
}
if FileManager.default.fileExists(atPath: temporaryFileURL.path) {
isInLockedMode = true
loadDraftRecording()
}
updateUI()
}
// MARK: - VoiceMessageToolbarViewDelegate // MARK: - VoiceMessageToolbarViewDelegate
func voiceMessageToolbarViewDidRequestRecordingStart(_ toolbarView: VoiceMessageToolbarView) { func voiceMessageToolbarViewDidRequestRecordingStart(_ toolbarView: VoiceMessageToolbarView) {
@ -254,6 +236,18 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
// MARK: - Private // MARK: - Private
private func checkForRecording() {
guard let temporaryFileURL = temporaryFileURL else {
return
}
if FileManager.default.fileExists(atPath: temporaryFileURL.path) {
isInLockedMode = true
loadDraftRecording()
}
updateUI()
}
private func finishRecording() { private func finishRecording() {
guard let temporaryFileURL = temporaryFileURL else { guard let temporaryFileURL = temporaryFileURL else {
return return
@ -274,11 +268,12 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
updateUI() updateUI()
} }
func loadDraftRecording() { private func loadDraftRecording() {
guard let temporaryFileURL = temporaryFileURL else { guard let temporaryFileURL = temporaryFileURL,
let roomId = roomId else {
return return
} }
audioPlayer = mediaServiceProvider.audioPlayerForIdentifier(UUID().uuidString) audioPlayer = mediaServiceProvider.audioPlayerForIdentifier(roomId)
audioPlayer?.registerDelegate(self) audioPlayer?.registerDelegate(self)
audioPlayer?.loadContentFromURL(temporaryFileURL) audioPlayer?.loadContentFromURL(temporaryFileURL)
@ -490,4 +485,3 @@ public class VoiceMessageController: NSObject, VoiceMessageToolbarViewDelegate,
audioSamples = audioSamples + [Float](repeating: 0.0, count: delta) audioSamples = audioSamples + [Float](repeating: 0.0, count: delta)
} }
} }