From d5b0ce8d2839a650fea7840309b48c143cc6e69e Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Tue, 29 Sep 2020 09:51:27 +1000 Subject: [PATCH] show the detailed info of SSK group update --- .../Protocol/Closed Groups/ClosedGroupsProtocol.swift | 9 ++++++--- SignalServiceKit/src/Messages/TSGroupModel.m | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift index aa5627070..b5cfdb19e 100644 --- a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift +++ b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift @@ -124,7 +124,8 @@ public final class ClosedGroupsProtocol : NSObject { let newGroupModel = TSGroupModel(title: name, memberIds: members, image: nil, groupId: groupID, groupType: .closedGroup, adminIds: admins) thread.setGroupModel(newGroupModel, with: transaction) // Notify the user - let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: .typeGroupUpdate) + let updateInfo = group.getInfoStringAboutUpdate(to: newGroupModel, contactsManager: SSKEnvironment.shared.contactsManager) + let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: .typeGroupUpdate, customMessage: updateInfo) infoMessage.save(with: transaction) } @@ -206,7 +207,8 @@ public final class ClosedGroupsProtocol : NSObject { thread.setGroupModel(newGroupModel, with: transaction) // Notify the user let infoMessageType: TSInfoMessageType = isUserLeaving ? .typeGroupQuit : .typeGroupUpdate - let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType) + let updateInfo = group.getInfoStringAboutUpdate(to: newGroupModel, contactsManager: SSKEnvironment.shared.contactsManager) + let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType, customMessage: updateInfo) infoMessage.save(with: transaction) // Return return promise @@ -347,7 +349,8 @@ public final class ClosedGroupsProtocol : NSObject { // Notify the user if needed (don't notify them if the message just contained linked device sender keys) if Set(members) != Set(oldMembers) || Set(admins) != Set(group.groupAdminIds) || name != group.groupName { let infoMessageType: TSInfoMessageType = wasUserRemoved ? .typeGroupQuit : .typeGroupUpdate - let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType) + let updateInfo = group.getInfoStringAboutUpdate(to: newGroupModel, contactsManager: SSKEnvironment.shared.contactsManager) + let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType, customMessage: updateInfo) infoMessage.save(with: transaction) } } diff --git a/SignalServiceKit/src/Messages/TSGroupModel.m b/SignalServiceKit/src/Messages/TSGroupModel.m index 2e3dcea3d..c2e233665 100644 --- a/SignalServiceKit/src/Messages/TSGroupModel.m +++ b/SignalServiceKit/src/Messages/TSGroupModel.m @@ -133,7 +133,7 @@ const int32_t kGroupIdLength = 16; if ([membersWhoLeft count] > 0) { NSArray *oldMembersNames = [[membersWhoLeft allObjects] map:^NSString*(NSString* item) { - return [contactsManager displayNameForPhoneIdentifier:item]; + return [LKUserDisplayNameUtilities getPrivateChatDisplayNameFor:item]; }]; updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:[NSString