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

Merge branch 'charlesmchen/fix-ssk-tests-b'

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent f4d1f25656 fac7f6932f
commit 17656a3aaa
20 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -3953,7 +3953,7 @@ typedef enum : NSUInteger {
uint32_t expiresInSeconds = [groupThread disappearingMessagesDurationWithTransaction:transaction]; uint32_t expiresInSeconds = [groupThread disappearingMessagesDurationWithTransaction:transaction];
message = [TSOutgoingMessage outgoingMessageInThread:groupThread message = [TSOutgoingMessage outgoingMessageInThread:groupThread
groupMetaMessage:TSGroupMessageUpdate groupMetaMessage:TSGroupMetaMessageUpdate
expiresInSeconds:expiresInSeconds]; expiresInSeconds:expiresInSeconds];
[message updateWithCustomMessage:updateGroupInfo transaction:transaction]; [message updateWithCustomMessage:updateGroupInfo transaction:transaction];
}]; }];

8
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
Unescape Escape View File

@ -3857,7 +3857,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
OWSAssert(thread); OWSAssert(thread);
TSOutgoingMessage *message = TSOutgoingMessage *message =
[TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageNew expiresInSeconds:0]; [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMetaMessageNew expiresInSeconds:0];
[message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)]; [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];
OWSMessageSender *messageSender = [Environment current].messageSender; OWSMessageSender *messageSender = [Environment current].messageSender;
@ -4193,7 +4193,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds
: 0)expireStartedAt:0 : 0)expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
OWSLogError(@"resurrectNewOutgoingMessages2 timestamp: %llu.", message.timestamp); OWSLogError(@"resurrectNewOutgoingMessages2 timestamp: %llu.", message.timestamp);
@ -4273,7 +4273,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
[message saveWithTransaction:transaction]; [message saveWithTransaction:transaction];
@ -4532,7 +4532,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:isVoiceMessage isVoiceMessage:isVoiceMessage
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:contactShare]; contactShare:contactShare];

2
Signal/src/ViewControllers/HomeView/HomeViewController.m
Unescape Escape View File

@ -1083,7 +1083,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
[self presentViewController:removingFromGroup animated:YES completion:nil]; [self presentViewController:removingFromGroup animated:YES completion:nil];
TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
groupMetaMessage:TSGroupMessageQuit groupMetaMessage:TSGroupMetaMessageQuit
expiresInSeconds:0]; expiresInSeconds:0];
[self.messageSender enqueueMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{

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

@ -478,7 +478,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
canCancel:NO canCancel:NO
backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) { backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
groupMetaMessage:TSGroupMessageNew groupMetaMessage:TSGroupMetaMessageNew
expiresInSeconds:0]; expiresInSeconds:0];
[message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)]; [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];

2
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
Unescape Escape View File

@ -987,7 +987,7 @@ const CGFloat kIconViewLength = 24;
{ {
TSGroupThread *gThread = (TSGroupThread *)self.thread; TSGroupThread *gThread = (TSGroupThread *)self.thread;
TSOutgoingMessage *message = TSOutgoingMessage *message =
[TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMessageQuit expiresInSeconds:0]; [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMetaMessageQuit expiresInSeconds:0];
[self.messageSender enqueueMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
OWSLogInfo(@"Successfully left group."); OWSLogInfo(@"Successfully left group.");

4
SignalMessaging/utils/ThreadUtil.m
Unescape Escape View File

@ -136,7 +136,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:expiresInSeconds expiresInSeconds:expiresInSeconds
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:[attachment isVoiceMessage] isVoiceMessage:[attachment isVoiceMessage]
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:[quotedReplyModel buildQuotedMessageForSending] quotedMessage:[quotedReplyModel buildQuotedMessageForSending]
contactShare:nil]; contactShare:nil];
@ -187,7 +187,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:expiresInSeconds expiresInSeconds:expiresInSeconds
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:contactShare]; contactShare:contactShare];

2
SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m
Unescape Escape View File

@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
if (!self) { if (!self) {

2
SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
Unescape Escape View File

@ -93,7 +93,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:transcript.expirationDuration expiresInSeconds:transcript.expirationDuration
expireStartedAt:transcript.expirationStartedAt expireStartedAt:transcript.expirationStartedAt
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:transcript.quotedMessage quotedMessage:transcript.quotedMessage
contactShare:transcript.contact]; contactShare:transcript.contact];

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
Unescape Escape View File

@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
Unescape Escape View File

@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
if (!self) { if (!self) {

2
SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
Unescape Escape View File

@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
if (!self) { if (!self) {

2
SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
Unescape Escape View File

@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];

2
SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
Unescape Escape View File

@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
} }

12
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
Unescape Escape View File

@ -41,12 +41,12 @@ typedef NS_ENUM(NSInteger, OWSOutgoingMessageRecipientState) {
NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientState value); NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientState value);
typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { typedef NS_ENUM(NSInteger, TSGroupMetaMessage) {
TSGroupMessageUnspecified, TSGroupMetaMessageUnspecified,
TSGroupMessageNew, TSGroupMetaMessageNew,
TSGroupMessageUpdate, TSGroupMetaMessageUpdate,
TSGroupMessageDeliver, TSGroupMetaMessageDeliver,
TSGroupMessageQuit, TSGroupMetaMessageQuit,
TSGroupMessageRequestInfo, TSGroupMetaMessageRequestInfo,
}; };
@class SSKProtoAttachmentPointer; @class SSKProtoAttachmentPointer;

18
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
Unescape Escape View File

@ -268,7 +268,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
expiresInSeconds:expiresInSeconds expiresInSeconds:expiresInSeconds
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:nil]; contactShare:nil];
} }
@ -316,15 +316,15 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
if ([thread isKindOfClass:TSGroupThread.class]) { if ([thread isKindOfClass:TSGroupThread.class]) {
// Unless specified, we assume group messages are "Delivery" i.e. normal messages. // Unless specified, we assume group messages are "Delivery" i.e. normal messages.
if (groupMetaMessage == TSGroupMessageUnspecified) { if (groupMetaMessage == TSGroupMetaMessageUnspecified) {
_groupMetaMessage = TSGroupMessageDeliver; _groupMetaMessage = TSGroupMetaMessageDeliver;
} else { } else {
_groupMetaMessage = groupMetaMessage; _groupMetaMessage = groupMetaMessage;
} }
} else { } else {
OWSAssert(groupMetaMessage == TSGroupMessageUnspecified); OWSAssert(groupMetaMessage == TSGroupMetaMessageUnspecified);
// Specifying a group meta message only makes sense for Group threads // Specifying a group meta message only makes sense for Group threads
_groupMetaMessage = TSGroupMessageUnspecified; _groupMetaMessage = TSGroupMetaMessageUnspecified;
} }
_isVoiceMessage = isVoiceMessage; _isVoiceMessage = isVoiceMessage;
@ -436,7 +436,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
- (BOOL)shouldBeSaved - (BOOL)shouldBeSaved
{ {
if (self.groupMetaMessage == TSGroupMessageDeliver || self.groupMetaMessage == TSGroupMessageUnspecified) { if (self.groupMetaMessage == TSGroupMetaMessageDeliver || self.groupMetaMessage == TSGroupMetaMessageUnspecified) {
return YES; return YES;
} }
@ -827,11 +827,11 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContextBuilder new]; SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContextBuilder new];
switch (self.groupMetaMessage) { switch (self.groupMetaMessage) {
case TSGroupMessageQuit: case TSGroupMetaMessageQuit:
[groupBuilder setType:SSKProtoGroupContextTypeQuit]; [groupBuilder setType:SSKProtoGroupContextTypeQuit];
break; break;
case TSGroupMessageUpdate: case TSGroupMetaMessageUpdate:
case TSGroupMessageNew: { case TSGroupMetaMessageNew: {
if (gThread.groupModel.groupImage != nil && self.attachmentIds.count == 1) { if (gThread.groupModel.groupImage != nil && self.attachmentIds.count == 1) {
attachmentWasGroupAvatar = YES; attachmentWasGroupAvatar = YES;
SSKProtoAttachmentPointer *_Nullable attachmentProto = SSKProtoAttachmentPointer *_Nullable attachmentProto =

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

@ -886,7 +886,7 @@ NS_ASSUME_NONNULL_BEGIN
uint32_t expiresInSeconds = [gThread disappearingMessagesDurationWithTransaction:transaction]; uint32_t expiresInSeconds = [gThread disappearingMessagesDurationWithTransaction:transaction];
TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:gThread TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:gThread
groupMetaMessage:TSGroupMessageUpdate groupMetaMessage:TSGroupMetaMessageUpdate
expiresInSeconds:expiresInSeconds]; expiresInSeconds:expiresInSeconds];
[message updateWithCustomMessage:updateGroupInfo transaction:transaction]; [message updateWithCustomMessage:updateGroupInfo transaction:transaction];

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

@ -1398,10 +1398,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
- (void)saveGroupMessage:(TSOutgoingMessage *)message inThread:(TSThread *)thread - (void)saveGroupMessage:(TSOutgoingMessage *)message inThread:(TSThread *)thread
{ {
if (message.groupMetaMessage == TSGroupMessageDeliver) { if (message.groupMetaMessage == TSGroupMetaMessageDeliver) {
// TODO: Why is this necessary? // TODO: Why is this necessary?
[message save]; [message save];
} else if (message.groupMetaMessage == TSGroupMessageQuit) { } else if (message.groupMetaMessage == TSGroupMetaMessageQuit) {
[[[TSInfoMessage alloc] initWithTimestamp:message.timestamp [[[TSInfoMessage alloc] initWithTimestamp:message.timestamp
inThread:thread inThread:thread
messageType:TSInfoMessageTypeGroupQuit messageType:TSInfoMessageTypeGroupQuit

2
SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
Unescape Escape View File

@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
if (!self) { if (!self) {

2
SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
Unescape Escape View File

@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
if (!self) { if (!self) {

2
SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
Unescape Escape View File

@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:0 expiresInSeconds:0
expireStartedAt:0 expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageUnspecified groupMetaMessage:TSGroupMetaMessageUnspecified
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil];
} }

Write Preview
Loading…
Cancel
Save