From d2900419baca035b66d53b859056f2d9b5cf1dec Mon Sep 17 00:00:00 2001 From: "benoit.martins" Date: Wed, 14 Jun 2023 23:01:23 +0200 Subject: [PATCH] Remove ControlsViewModel subclassing --- .../Chat/ViewModels/ChatConversationTableViewModel.swift | 6 +----- .../Swift/Chat/ViewModels/ChatConversationViewModel.swift | 6 +----- Classes/Swift/Util/AudioPlayer.swift | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Classes/Swift/Chat/ViewModels/ChatConversationTableViewModel.swift b/Classes/Swift/Chat/ViewModels/ChatConversationTableViewModel.swift index 332077426..3255bda45 100644 --- a/Classes/Swift/Chat/ViewModels/ChatConversationTableViewModel.swift +++ b/Classes/Swift/Chat/ViewModels/ChatConversationTableViewModel.swift @@ -22,7 +22,7 @@ import Foundation import linphonesw -class ChatConversationTableViewModel: ControlsViewModel { +class ChatConversationTableViewModel { static let sharedModel = ChatConversationTableViewModel() @@ -40,10 +40,6 @@ class ChatConversationTableViewModel: ControlsViewModel { var messageListSelected = MutableLiveData<[Bool]>([]) var messageListToDelete : [EventLog] = [] - - override init() { - super.init() - } func getMessage(index: Int) -> EventLog? { if (chatRoom != nil) { diff --git a/Classes/Swift/Chat/ViewModels/ChatConversationViewModel.swift b/Classes/Swift/Chat/ViewModels/ChatConversationViewModel.swift index 4b0d6568b..6ee77b0b1 100644 --- a/Classes/Swift/Chat/ViewModels/ChatConversationViewModel.swift +++ b/Classes/Swift/Chat/ViewModels/ChatConversationViewModel.swift @@ -22,7 +22,7 @@ import Foundation import linphonesw -class ChatConversationViewModel: ControlsViewModel { +class ChatConversationViewModel { static let sharedModel = ChatConversationViewModel() @@ -77,10 +77,6 @@ class ChatConversationViewModel: ControlsViewModel { var shareFileURL = MutableLiveData() var shareFileName = MutableLiveData() - override init() { - super.init() - } - func resetViewModel(){ chatRoom?.removeDelegate(delegate: chatRoomDelegate!) mediaURLCollection = [] diff --git a/Classes/Swift/Util/AudioPlayer.swift b/Classes/Swift/Util/AudioPlayer.swift index 3f78e1f33..850b8bd33 100644 --- a/Classes/Swift/Util/AudioPlayer.swift +++ b/Classes/Swift/Util/AudioPlayer.swift @@ -21,7 +21,7 @@ import Foundation import linphonesw -class AudioPlayer: ControlsViewModel { +class AudioPlayer { static let sharedModel = AudioPlayer() static var linphonePlayer : Player? = nil