Skip to content

Commit ad4c98d

Browse files
Migrated Code From ALMessage to KMCoreMessage
1 parent 3ffbe34 commit ad4c98d

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

Example/Tests/KommunicateTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class KommunicateTests: XCTestCase {
3939
override func getLatestMessages(_: Bool, withCompletionHandler completion: ((NSMutableArray?, Error?) -> Void)!) {
4040
let messageList: NSMutableArray = []
4141
for _ in 0 ..< KommunicateClientMock.messageCount {
42-
let message = ALMessage()
42+
let message = KMCoreMessage()
4343
messageList.add(message)
4444
}
4545
completion(messageList, nil)

Sources/Kommunicate/Classes/KMConversationListViewController.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
3333
var searchBar: KMCustomSearchBar!
3434
lazy var resultVC = ALKSearchResultViewController(configuration: configuration)
3535

36-
public var dbService = ALMessageDBService()
36+
public var dbService = KMCoreMessageDBService()
3737
public var viewModel = ALKConversationListViewModel()
3838

3939
var isSingleThreadedEnabled = KMCoreSettings.getIsSingleThreadedEnabled()
@@ -273,7 +273,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
273273
}
274274

275275
@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 }
277277
print("new notification received: ", msgArray.first?.message ?? "")
278278
guard let list = notification.object as? [Any], !list.isEmpty else { return }
279279
viewModel.addMessages(messages: list)
@@ -305,7 +305,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
305305
contactId = object
306306
}
307307

308-
let message = ALMessage()
308+
let message = KMCoreMessage()
309309
message.contactIds = contactId
310310
message.groupId = groupId
311311
let info = notification.userInfo
@@ -353,12 +353,12 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
353353
}
354354

355355
@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 }
357357
deleteConversation(conversation: conversation)
358358
}
359359

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: {
362362
_, error in
363363
guard error == nil else {
364364
print("Failed to delete the conversation: \(error.debugDescription)")
@@ -466,7 +466,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
466466
createConversationAndLaunch()
467467
}
468468

469-
func sync(message: ALMessage) {
469+
func sync(message: KMCoreMessage) {
470470
if let viewController = conversationViewController,
471471
ALPushAssist().topViewController is KMConversationViewController,
472472
viewController.viewModel != nil,
@@ -638,7 +638,7 @@ public class KMConversationListViewController: ALKBaseViewController, Localizabl
638638
}
639639
}
640640

641-
extension KMConversationListViewController: ALMessagesDelegate {
641+
extension KMConversationListViewController: KMCoreMessagesDelegate {
642642
public func getMessagesArray(_ messagesArray: NSMutableArray!) {
643643
guard let messages = messagesArray as? [Any], !messages.isEmpty else {
644644
viewModel.delegate?.listUpdated()
@@ -705,7 +705,7 @@ extension KMConversationListViewController: ALMQTTConversationDelegate {
705705
}
706706
}
707707

708-
public func isNewMessageForActiveThread(alMessage: ALMessage, vm: ALKConversationViewModel) -> Bool {
708+
public func isNewMessageForActiveThread(alMessage: KMCoreMessage, vm: ALKConversationViewModel) -> Bool {
709709
let isGroupMessage = alMessage.groupId != nil && alMessage.groupId == vm.channelKey
710710
let isOneToOneMessage = alMessage.groupId == nil && vm.channelKey == nil && alMessage.contactId == vm.contactId
711711
if isGroupMessage || isOneToOneMessage {
@@ -714,14 +714,14 @@ extension KMConversationListViewController: ALMQTTConversationDelegate {
714714
return false
715715
}
716716

717-
func isMessageSentByLoggedInUser(alMessage: ALMessage) -> Bool {
717+
func isMessageSentByLoggedInUser(alMessage: KMCoreMessage) -> Bool {
718718
if alMessage.isSentMessage() {
719719
return true
720720
}
721721
return false
722722
}
723723

724-
open func syncCall(_ alMessage: ALMessage!, andMessageList _: NSMutableArray!) {
724+
open func syncCall(_ alMessage: KMCoreMessage!, andMessageList _: NSMutableArray!) {
725725
print("sync call: ", alMessage.message ?? "empty")
726726
guard let message = alMessage else { return }
727727
let viewController = navigationController?.visibleViewController as? KMConversationViewController
@@ -825,7 +825,7 @@ extension KMConversationListViewController: ALKConversationListTableViewDelegate
825825
viewModel.userBlockNotification(userId: userId, isBlocked: isBlocked)
826826
}
827827

828-
public func muteNotification(conversation: ALMessage, isMuted: Bool) {
828+
public func muteNotification(conversation: KMCoreMessage, isMuted: Bool) {
829829
viewModel.muteNotification(conversation: conversation, isMuted: isMuted)
830830
}
831831

Sources/Kommunicate/Classes/KMConversationViewController.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ open class KMConversationViewController: ALKConversationViewController, KMUpdate
2020
private var kmBusinessHoursDataArray: [KMBusinessHoursViewModel]?
2121
let kmBotService = KMBotService()
2222
private var assigneeUserId: String?
23-
var messageArray = [ALMessage]()
23+
var messageArray = [KMCoreMessage]()
2424
var timer = Timer()
2525
var count = 0
26-
var currentMessage = ALMessage()
26+
var currentMessage = KMCoreMessage()
2727
var delayInterval = 0
2828
private var isWaitingQueueFetching: Bool = false
2929

@@ -193,7 +193,7 @@ open class KMConversationViewController: ALKConversationViewController, KMUpdate
193193
}
194194

195195
open override func addMessagesToList(_ messageList: [Any]) {
196-
guard var messages = messageList as? [ALMessage] else { return }
196+
guard var messages = messageList as? [KMCoreMessage] else { return }
197197

198198
if KMConversationScreenConfiguration.showTypingIndicatorWhileFetchingResponse {
199199
updateTyingStatus(status: false, userId: "")
@@ -385,7 +385,7 @@ open class KMConversationViewController: ALKConversationViewController, KMUpdate
385385
// This method is used to delay the bot message as well as to show typing indicator
386386
func showDelayAndTypingIndicatorForMessage() {
387387
if count >= messageArray.count {
388-
currentMessage = ALMessage()
388+
currentMessage = KMCoreMessage()
389389
return
390390
}
391391

@@ -740,7 +740,7 @@ open class KMConversationViewController: ALKConversationViewController, KMUpdate
740740
subscribeChannelToMqtt()
741741
viewModel.prepareController()
742742
self.updatePlaceholder()
743-
ALMessageService.syncMessages()
743+
KMCoreMessageService.syncMessages()
744744
syncAutoSuggestionMessage(message: viewModel?.lastMessage)
745745
}
746746

Sources/Kommunicate/Classes/KMPushNotificationHelper.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class KMPushNotificationHelper {
5555
///
5656
/// - Parameter message: message of notification
5757
/// - Returns: `NotificationData` containing information about groupId
58-
public func notificationData(message: ALMessage) -> NotificationData {
58+
public func notificationData(message: KMCoreMessage) -> NotificationData {
5959
return NotificationData(groupId: message.channelKey)
6060
}
6161

Sources/Kommunicate/Classes/Kommunicate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,9 +1091,9 @@ open class Kommunicate: NSObject, Localizable {
10911091
completion(noConversationError)
10921092
return
10931093
}
1094-
let alMessage = message.toALMessage()
1094+
let alMessage = message.toKMCoreMessage()
10951095
alMessage.groupId = key
1096-
ALMessageService.sharedInstance().sendMessages(alMessage) { _, error in
1096+
KMCoreMessageService.sharedInstance().sendMessages(alMessage) { _, error in
10971097
guard error == nil else {
10981098
completion(error)
10991099
return

Sources/Kommunicate/Classes/Models/KMMessageBuilder.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class KMMessageBuilder: NSObject {
4141
}
4242

4343
extension KMMessage {
44-
func toALMessage() -> ALMessage {
45-
let alMessage = ALMessage()
44+
func toKMCoreMessage() -> KMCoreMessage {
45+
let alMessage = KMCoreMessage()
4646
alMessage.to = nil
4747
alMessage.contactIds = nil
4848
alMessage.message = text

0 commit comments

Comments
 (0)