keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enable to create a new private chat group

Browse Source
pull/78/head
Ryan ZHAO 5 years ago
parent 0df5f857a7
commit 369b5ddaf2
5 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File

1
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -4466,6 +4466,7 @@ typedef enum : NSUInteger {
quotedReplyModel:self.inputToolbar.quotedReply
linkPreviewDraft:self.inputToolbar.linkPreviewDraft
transaction:transaction];
OWSLogInfo(@"message generated here %@ %@", message.body, message.recipientIds[0]);
}];
[self.conversationViewModel appendUnsavedOutgoingTextMessage:message];

3
Signal/src/ViewControllers/NewGroupViewController.m
Unescape Escape View File

@ -529,6 +529,9 @@ NS_ASSUME_NONNULL_BEGIN
{
NSString *groupName = [self.groupNameTextField.text ows_stripped];
NSMutableArray<NSString *> *recipientIds = [self.memberRecipientIds.allObjects mutableCopy];
//Test: Add Ryan to a new group. Should be deleted!!!!!
// [recipientIds addObject:@"055a7f102ee3af057e4b69bfc8d4327a83d21bf14f794dbf3432d122a10a51fe55"];
// [recipientIds addObject:@"05211c97117a9f8f2f90a055b6227bfc6516483300f08026497d8404c71137744e"];
[recipientIds addObject:[self.contactsViewHelper localNumber]];
TSGroupModel *group = [[TSGroupModel alloc] initWithTitle:groupName
memberIds:recipientIds

2
SignalMessaging/ViewControllers/SelectRecipientViewController.m
Unescape Escape View File

@ -527,7 +527,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
NSArray<SignalAccount *> *signalAccounts = helper.signalAccounts;
if (signalAccounts.count == 0) {
// No Contacts
OWSLogInfo(@"NO SIGNAL ACCOUNTS AT ALL");
[contactsSection
addItem:[OWSTableItem softCenterLabelItemWithText:
NSLocalizedString(@"SETTINGS_BLOCK_LIST_NO_CONTACTS",

17
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -1361,14 +1361,15 @@ NS_ASSUME_NONNULL_BEGIN
if (groupId.length > 0) {
NSMutableSet *newMemberIds = [NSMutableSet setWithArray:dataMessage.group.members];
NSMutableSet *removedMemberIds = [NSMutableSet setWithArray:dataMessage.group.removedMembers];
for (NSString *recipientId in newMemberIds) {
if (!recipientId.isValidE164) {
OWSLogVerbose(
@"incoming group update has invalid group member: %@", [self descriptionForEnvelope:envelope]);
OWSFailDebug(@"incoming group update has invalid group member");
return nil;
}
}
//Ryan TODO: validate the recipientId
// for (NSString *recipientId in newMemberIds) {
// if (!recipientId.isValidE164) {
// OWSLogVerbose(
// @"incoming group update has invalid group member: %@", [self descriptionForEnvelope:envelope]);
// OWSFailDebug(@"incoming group update has invalid group member");
// return nil;
// }
// }
// Group messages create the group if it doesn't already exist.
//

45
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -506,14 +506,26 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
recipientIds = [LKDatabaseUtilities getLinkedDeviceHexEncodedPublicKeysFor:userHexEncodedPublicKey in:transaction].mutableCopy;
}];
} else if (thread.isGroupThread) {
[self.primaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
LKPublicChat *publicChat = [LKDatabaseUtilities getPublicChatForThreadID:thread.uniqueId transaction:transaction];
if (publicChat != nil) {
[recipientIds addObject:publicChat.server];
} else {
// TODO: Handle
}
}];
TSGroupThread *groupThread = (TSGroupThread *)thread;
if (groupThread.isPublicChat) {
[self.primaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
LKPublicChat *publicChat = [LKDatabaseUtilities getPublicChatForThreadID:thread.uniqueId transaction:transaction];
if (publicChat != nil) {
[recipientIds addObject:publicChat.server];
} else {
// TODO: Handle
}
}];
}
//Maybe need to handle RssFeed
else {
[recipientIds addObjectsFromArray:message.sendingRecipientIds];
// Only send to members in the latest known group member list.
[recipientIds intersectSet:[NSSet setWithArray:groupThread.groupModel.groupMemberIds]];
// for (NSString *recipientId in recipientIds) {
//
// }
}
} else if ([thread isKindOfClass:[TSContactThread class]]) {
NSString *recipientContactId = ((TSContactThread *)thread).contactIdentifier;
@ -688,6 +700,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
if (thread.isGroupThread) {
[self saveInfoMessageForGroupMessage:message inThread:thread];
}
OWSLogInfo(@"group message save here %@ %@", message.customMessage, message.recipientIds.lastObject);
NSError *error;
NSArray<NSString *> *_Nullable recipientIds = [self unsentRecipientsForMessage:message thread:thread error:&error];
@ -714,6 +727,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
}
}];
}
OWSLogInfo(@"recipient count: %d", recipientIds.count);
if (recipientIds.count < 1) {
// All recipients are already sent or can be skipped.
@ -986,6 +1001,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
- (void)sendMessage:(OWSMessageSend *)messageSend
{
OWSLogInfo(@"message send here %@ %@", messageSend.message.body, messageSend.recipient.recipientId);
OWSAssertDebug(messageSend);
OWSAssertDebug(messageSend.thread || [messageSend.message isKindOfClass:[OWSOutgoingSyncMessage class]]);
@ -1047,10 +1063,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
NSError *deviceMessagesError;
NSArray<NSDictionary *> *_Nullable deviceMessages;
if (!message.thread.isGroupThread) {
deviceMessages = [self deviceMessagesForMessageSend:messageSend error:&deviceMessagesError];
} else {
if (message.thread.isGroupThread && ((TSGroupThread *)message.thread).isPublicChat) {
deviceMessages = @{};
} else {
deviceMessages = [self deviceMessagesForMessageSend:messageSend error:&deviceMessagesError];
}
if (deviceMessagesError || !deviceMessages) {
OWSAssertDebug(deviceMessagesError);
@ -1594,7 +1610,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
}
}];
BOOL isPublicChatMessage = message.thread.isGroupThread;
BOOL isPublicChatMessage = message.thread.isGroupThread && ((TSGroupThread *)message.thread).isPublicChat;
OWSLogInfo(@"Message recipient %d %@", [message.recipientIds count], message.recipientIds[0]);
OWSLogInfo(@"Try to figure out if it is a public chat message %d", isPublicChatMessage);
BOOL shouldSendTranscript = (AreRecipientUpdatesEnabled() || !message.hasSyncedTranscript) && !isNoteToSelf && !isPublicChatMessage && !([message isKindOfClass:LKDeviceLinkMessage.class]);
if (!shouldSendTranscript) {
@ -2025,16 +2043,19 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
OWSAssertDebug(thread);
if (message.groupMetaMessage == TSGroupMetaMessageDeliver) {
OWSLogInfo(@"save for group message deliver");
// TODO: Why is this necessary?
[message save];
} else if (message.groupMetaMessage == TSGroupMetaMessageQuit) {
// MJK TODO - remove senderTimestamp
OWSLogInfo(@"save for group message quit: %@", message.customMessage);
[[[TSInfoMessage alloc] initWithTimestamp:message.timestamp
inThread:thread
messageType:TSInfoMessageTypeGroupQuit
customMessage:message.customMessage] save];
} else {
// MJK TODO - remove senderTimestamp
OWSLogInfo(@"save for group message update: %@", message.customMessage);
[[[TSInfoMessage alloc] initWithTimestamp:message.timestamp
inThread:thread
messageType:TSInfoMessageTypeGroupUpdate

Write Preview
Loading…
Cancel
Save