@@ -33,7 +33,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
33
33
var searchBar : KMCustomSearchBar !
34
34
lazy var resultVC = ALKSearchResultViewController ( configuration: configuration)
35
35
36
- public var dbService = ALMessageDBService ( )
36
+ public var dbService = KMCoreMessageDBService ( )
37
37
public var viewModel = ALKConversationListViewModel ( )
38
38
39
39
var isSingleThreadedEnabled = KMCoreSettings . getIsSingleThreadedEnabled ( )
@@ -273,7 +273,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
273
273
}
274
274
275
275
@objc func addMessages( notification: NSNotification ) {
276
- guard let msgArray = notification. object as? [ ALMessage ] else { return }
276
+ guard let msgArray = notification. object as? [ KMCoreMessage ] else { return }
277
277
print ( " new notification received: " , msgArray. first? . message ?? " " )
278
278
guard let list = notification. object as? [ Any ] , !list. isEmpty else { return }
279
279
viewModel. addMessages ( messages: list)
@@ -305,7 +305,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
305
305
contactId = object
306
306
}
307
307
308
- let message = ALMessage ( )
308
+ let message = KMCoreMessage ( )
309
309
message. contactIds = contactId
310
310
message. groupId = groupId
311
311
let info = notification. userInfo
@@ -353,12 +353,12 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
353
353
}
354
354
355
355
@objc func conversationDeleted( notification: NSNotification ) {
356
- guard let conversation = notification. object as? ALMessage else { return }
356
+ guard let conversation = notification. object as? KMCoreMessage else { return }
357
357
deleteConversation ( conversation: conversation)
358
358
}
359
359
360
- private func deleteConversation( conversation: ALMessage ) {
361
- ALMessageService ( ) . deleteMessageThread ( nil , orChannelKey: conversation. groupId, withCompletion: {
360
+ private func deleteConversation( conversation: KMCoreMessage ) {
361
+ KMCoreMessageService ( ) . deleteMessageThread ( nil , orChannelKey: conversation. groupId, withCompletion: {
362
362
_, error in
363
363
guard error == nil else {
364
364
print ( " Failed to delete the conversation: \( error. debugDescription) " )
@@ -466,7 +466,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
466
466
createConversationAndLaunch ( )
467
467
}
468
468
469
- func sync( message: ALMessage ) {
469
+ func sync( message: KMCoreMessage ) {
470
470
if let viewController = conversationViewController,
471
471
ALPushAssist ( ) . topViewController is KMConversationViewController ,
472
472
viewController. viewModel != nil ,
@@ -638,7 +638,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
638
638
}
639
639
}
640
640
641
- extension KMConversationListViewController : ALMessagesDelegate {
641
+ extension KMConversationListViewController : KMCoreMessagesDelegate {
642
642
public func getMessagesArray( _ messagesArray: NSMutableArray ! ) {
643
643
guard let messages = messagesArray as? [ Any ] , !messages. isEmpty else {
644
644
viewModel. delegate? . listUpdated ( )
@@ -705,7 +705,7 @@ extension KMConversationListViewController: ALMQTTConversationDelegate {
705
705
}
706
706
}
707
707
708
- public func isNewMessageForActiveThread( alMessage: ALMessage , vm: ALKConversationViewModel ) -> Bool {
708
+ public func isNewMessageForActiveThread( alMessage: KMCoreMessage , vm: ALKConversationViewModel ) -> Bool {
709
709
let isGroupMessage = alMessage. groupId != nil && alMessage. groupId == vm. channelKey
710
710
let isOneToOneMessage = alMessage. groupId == nil && vm. channelKey == nil && alMessage. contactId == vm. contactId
711
711
if isGroupMessage || isOneToOneMessage {
@@ -714,14 +714,14 @@ extension KMConversationListViewController: ALMQTTConversationDelegate {
714
714
return false
715
715
}
716
716
717
- func isMessageSentByLoggedInUser( alMessage: ALMessage ) -> Bool {
717
+ func isMessageSentByLoggedInUser( alMessage: KMCoreMessage ) -> Bool {
718
718
if alMessage. isSentMessage ( ) {
719
719
return true
720
720
}
721
721
return false
722
722
}
723
723
724
- open func syncCall( _ alMessage: ALMessage ! , andMessageList _: NSMutableArray ! ) {
724
+ open func syncCall( _ alMessage: KMCoreMessage ! , andMessageList _: NSMutableArray ! ) {
725
725
print ( " sync call: " , alMessage. message ?? " empty " )
726
726
guard let message = alMessage else { return }
727
727
let viewController = navigationController? . visibleViewController as? KMConversationViewController
@@ -825,7 +825,7 @@ extension KMConversationListViewController: ALKConversationListTableViewDelegate
825
825
viewModel. userBlockNotification ( userId: userId, isBlocked: isBlocked)
826
826
}
827
827
828
- public func muteNotification( conversation: ALMessage , isMuted: Bool ) {
828
+ public func muteNotification( conversation: KMCoreMessage , isMuted: Bool ) {
829
829
viewModel. muteNotification ( conversation: conversation, isMuted: isMuted)
830
830
}
831
831
0 commit comments