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

Respond to CR.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 9f2a15925a
commit 580d0486b6
5 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/ViewControllers/ColorPickerViewController.swift
Unescape Escape View File

@ -390,7 +390,9 @@ private class MockIncomingMessage: TSIncomingMessage {
attachmentIds: [], attachmentIds: [],
expiresInSeconds: 0, expiresInSeconds: 0,
quotedMessage: nil, quotedMessage: nil,
contactShare: nil) contactShare: nil,
serverTimestamp: nil,
serverGuid: nil)
} }
required init(coder: NSCoder) { required init(coder: NSCoder) {

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

@ -3726,7 +3726,9 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
attachmentIds:@[] attachmentIds:@[]
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil
serverTimestamp:nil
serverGuid:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break; break;
} }
@ -3765,7 +3767,9 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
] ]
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil
serverTimestamp:nil
serverGuid:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break; break;
} }
@ -4225,7 +4229,9 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
attachmentIds:[NSMutableArray new] attachmentIds:[NSMutableArray new]
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil
serverTimestamp:nil
serverGuid:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
} }
{ {
@ -4265,7 +4271,9 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
attachmentIds:[NSMutableArray new] attachmentIds:[NSMutableArray new]
expiresInSeconds:60 expiresInSeconds:60
quotedMessage:nil quotedMessage:nil
contactShare:nil]; contactShare:nil
serverTimestamp:nil
serverGuid:nil];
// private setter to avoid starting expire machinery. // private setter to avoid starting expire machinery.
message.read = YES; message.read = YES;
[message save]; [message save];
@ -4586,7 +4594,9 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
attachmentIds:attachmentIds attachmentIds:attachmentIds
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:nil]; contactShare:nil
serverTimestamp:nil
serverGuid:nil];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
return message; return message;
} }

10
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
Unescape Escape View File

@ -54,7 +54,9 @@ NS_ASSUME_NONNULL_BEGIN
attachmentIds:(NSArray<NSString *> *)attachmentIds attachmentIds:(NSArray<NSString *> *)attachmentIds
expiresInSeconds:(uint32_t)expiresInSeconds expiresInSeconds:(uint32_t)expiresInSeconds
quotedMessage:(nullable TSQuotedMessage *)quotedMessage quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare NS_DESIGNATED_INITIALIZER; contactShare:(nullable OWSContact *)contactShare
serverTimestamp:(nullable NSNumber *)serverTimestamp
serverGuid:(nullable NSString *)serverGuid NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; - (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;
@ -83,12 +85,6 @@ NS_ASSUME_NONNULL_BEGIN
- (void)markAsReadNowWithSendReadReceipt:(BOOL)sendReadReceipt - (void)markAsReadNowWithSendReadReceipt:(BOOL)sendReadReceipt
transaction:(YapDatabaseReadWriteTransaction *)transaction; transaction:(YapDatabaseReadWriteTransaction *)transaction;
#pragma mark - Update With... Methods
- (void)updateWithServerTimestamp:(uint64_t)serverTimestamp transaction:(YapDatabaseReadWriteTransaction *)transaction;
- (void)updateWithServerGuid:(NSString *)serverGuid transaction:(YapDatabaseReadWriteTransaction *)transaction;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

27
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
Unescape Escape View File

@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:(uint32_t)expiresInSeconds expiresInSeconds:(uint32_t)expiresInSeconds
quotedMessage:(nullable TSQuotedMessage *)quotedMessage quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare contactShare:(nullable OWSContact *)contactShare
serverTimestamp:(nullable NSNumber *)serverTimestamp
serverGuid:(nullable NSString *)serverGuid
{ {
self = [super initMessageWithTimestamp:timestamp self = [super initMessageWithTimestamp:timestamp
inThread:thread inThread:thread
@ -65,6 +67,8 @@ NS_ASSUME_NONNULL_BEGIN
_authorId = authorId; _authorId = authorId;
_sourceDeviceId = sourceDeviceId; _sourceDeviceId = sourceDeviceId;
_read = NO; _read = NO;
_serverTimestamp = serverTimestamp;
_serverGuid = serverGuid;
return self; return self;
} }
@ -183,29 +187,6 @@ NS_ASSUME_NONNULL_BEGIN
} }
} }
#pragma mark - Update With... Methods
- (void)updateWithServerTimestamp:(uint64_t)serverTimestamp transaction:(YapDatabaseReadWriteTransaction *)transaction
{
OWSAssertDebug(serverTimestamp > 0);
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(TSIncomingMessage *message) {
message.serverTimestamp = @(serverTimestamp);
}];
}
- (void)updateWithServerGuid:(NSString *)serverGuid transaction:(YapDatabaseReadWriteTransaction *)transaction
{
OWSAssertDebug(serverGuid.length > 0);
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(TSIncomingMessage *message) {
message.serverGuid = serverGuid;
}];
}
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

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

@ -1110,6 +1110,8 @@ NS_ASSUME_NONNULL_BEGIN
NSString *body = dataMessage.body; NSString *body = dataMessage.body;
NSData *groupId = dataMessage.group ? dataMessage.group.id : nil; NSData *groupId = dataMessage.group ? dataMessage.group.id : nil;
OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction]; OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction];
NSNumber *_Nullable serverTimestamp = (envelope.hasServerTimestamp ? @(envelope.serverTimestamp) : nil);
NSString *_Nullable serverGuid = (envelope.hasServerGuid ? envelope.serverGuid : nil);
if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) { if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) {
[self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction]; [self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction];
@ -1223,7 +1225,9 @@ NS_ASSUME_NONNULL_BEGIN
attachmentIds:attachmentIds attachmentIds:attachmentIds
expiresInSeconds:dataMessage.expireTimer expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:contact]; contactShare:contact
serverTimestamp:serverTimestamp
serverGuid:serverGuid];
[self finalizeIncomingMessage:incomingMessage [self finalizeIncomingMessage:incomingMessage
thread:oldGroupThread thread:oldGroupThread
@ -1262,7 +1266,9 @@ NS_ASSUME_NONNULL_BEGIN
attachmentIds:attachmentIds attachmentIds:attachmentIds
expiresInSeconds:dataMessage.expireTimer expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:contact]; contactShare:contact
serverTimestamp:serverTimestamp
serverGuid:serverGuid];
[self finalizeIncomingMessage:incomingMessage [self finalizeIncomingMessage:incomingMessage
thread:thread thread:thread
@ -1302,13 +1308,6 @@ NS_ASSUME_NONNULL_BEGIN
[incomingMessage markAsReadAtTimestamp:envelope.timestamp sendReadReceipt:NO transaction:transaction]; [incomingMessage markAsReadAtTimestamp:envelope.timestamp sendReadReceipt:NO transaction:transaction];
} }
if (envelope.hasServerGuid) {
[incomingMessage updateWithServerGuid:envelope.serverGuid transaction:transaction];
}
if (envelope.hasServerTimestamp) {
[incomingMessage updateWithServerTimestamp:envelope.serverTimestamp transaction:transaction];
}
TSQuotedMessage *_Nullable quotedMessage = incomingMessage.quotedMessage; TSQuotedMessage *_Nullable quotedMessage = incomingMessage.quotedMessage;
if (quotedMessage && quotedMessage.thumbnailAttachmentPointerId) { if (quotedMessage && quotedMessage.thumbnailAttachmentPointerId) {
// We weren't able to derive a local thumbnail, so we'll fetch the referenced attachment. // We weren't able to derive a local thumbnail, so we'll fetch the referenced attachment.

Write Preview
Loading…
Cancel
Save