From 87d65e294bebcec249ea1b955d9f2df33be30291 Mon Sep 17 00:00:00 2001 From: James Magahern Date: Tue, 5 Dec 2023 15:41:07 -0800 Subject: [PATCH] sendMessage: return guid after sending. This guid is stable --- .../Bridge/Operations/MBIMSendMessageOperation.m | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kordophone/Bridge/Operations/MBIMSendMessageOperation.m b/kordophone/Bridge/Operations/MBIMSendMessageOperation.m index 3e641a9..2f28444 100644 --- a/kordophone/Bridge/Operations/MBIMSendMessageOperation.m +++ b/kordophone/Bridge/Operations/MBIMSendMessageOperation.m @@ -19,9 +19,9 @@ return @"sendMessage"; } -- (BOOL)_sendMessage:(NSString *)messageBody toChatWithGUID:(NSString *)chatGUID attachmentGUIDs:(NSArray *)guids +- (IMMessage *)_sendMessage:(NSString *)messageBody toChatWithGUID:(NSString *)chatGUID attachmentGUIDs:(NSArray *)guids { - __block BOOL result = YES; + __block IMMessage *result = nil; dispatch_sync([[self class] sharedIMAccessQueue], ^{ IMChat *chat = [[IMChatRegistry sharedInstance] existingChatWithGUID:chatGUID]; @@ -44,8 +44,9 @@ if (!chat) { MBIMLogInfo(@"Chat does not exist: %@", chatGUID); - result = NO; } else { + result = reply; + dispatch_async(dispatch_get_main_queue(), ^{ [chat sendMessage:reply]; }); @@ -78,9 +79,11 @@ transferGUIDs = @[]; } - BOOL result = [self _sendMessage:messageBody toChatWithGUID:guid attachmentGUIDs:transferGUIDs]; + IMMessage *result = [self _sendMessage:messageBody toChatWithGUID:guid attachmentGUIDs:transferGUIDs]; if (result) { - response = [[HTTPErrorResponse alloc] initWithErrorCode:200]; + response = [MBIMJSONDataResponse responseWithJSONObject:@{ + @"guid" : [result guid] + }]; } self.serverCompletionBlock(response);