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

Add 'is ud' property to incoming messages.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 68f1c75f30
commit cba8c67983
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -391,7 +391,8 @@ private class MockIncomingMessage: TSIncomingMessage {
expiresInSeconds: 0, expiresInSeconds: 0,
quotedMessage: nil, quotedMessage: nil,
contactShare: nil, contactShare: nil,
serverTimestamp: nil) serverTimestamp: nil,
wasReceivedByUD: false)
} }
required init(coder: NSCoder) { required init(coder: NSCoder) {

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

@ -3727,7 +3727,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil contactShare:nil
serverTimestamp:nil]; serverTimestamp:nil
wasReceivedByUD:NO];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break; break;
} }
@ -3767,7 +3768,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil contactShare:nil
serverTimestamp:nil]; serverTimestamp:nil
wasReceivedByUD:NO];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
break; break;
} }
@ -4229,7 +4231,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:nil quotedMessage:nil
contactShare:nil contactShare:nil
serverTimestamp:nil]; serverTimestamp:nil
wasReceivedByUD:NO];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
} }
{ {
@ -4270,7 +4273,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:60 expiresInSeconds:60
quotedMessage:nil quotedMessage:nil
contactShare:nil contactShare:nil
serverTimestamp:nil]; serverTimestamp:nil
wasReceivedByUD:NO];
// private setter to avoid starting expire machinery. // private setter to avoid starting expire machinery.
message.read = YES; message.read = YES;
[message save]; [message save];
@ -4592,7 +4596,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
expiresInSeconds:0 expiresInSeconds:0
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:nil contactShare:nil
serverTimestamp:nil]; serverTimestamp:nil
wasReceivedByUD:NO];
[message markAsReadNowWithSendReadReceipt:NO transaction:transaction]; [message markAsReadNowWithSendReadReceipt:NO transaction:transaction];
return message; return message;
} }

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

@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly, nullable) NSNumber *serverTimestamp; @property (nonatomic, readonly, nullable) NSNumber *serverTimestamp;
@property (nonatomic, readonly) BOOL wasReceivedByUD;
- (instancetype)initMessageWithTimestamp:(uint64_t)timestamp - (instancetype)initMessageWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread inThread:(nullable TSThread *)thread
messageBody:(nullable NSString *)body messageBody:(nullable NSString *)body
@ -54,7 +56,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 NS_DESIGNATED_INITIALIZER; serverTimestamp:(nullable NSNumber *)serverTimestamp
wasReceivedByUD:(BOOL)wasReceivedByUD NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; - (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

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

@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
quotedMessage:(nullable TSQuotedMessage *)quotedMessage quotedMessage:(nullable TSQuotedMessage *)quotedMessage
contactShare:(nullable OWSContact *)contactShare contactShare:(nullable OWSContact *)contactShare
serverTimestamp:(nullable NSNumber *)serverTimestamp serverTimestamp:(nullable NSNumber *)serverTimestamp
{ wasReceivedByUD:(BOOL)wasReceivedByUD {
self = [super initMessageWithTimestamp:timestamp self = [super initMessageWithTimestamp:timestamp
inThread:thread inThread:thread
messageBody:body messageBody:body
@ -66,6 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
_sourceDeviceId = sourceDeviceId; _sourceDeviceId = sourceDeviceId;
_read = NO; _read = NO;
_serverTimestamp = serverTimestamp; _serverTimestamp = serverTimestamp;
_wasReceivedByUD = wasReceivedByUD;
return self; return self;
} }

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

@ -1115,6 +1115,7 @@ NS_ASSUME_NONNULL_BEGIN
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); NSNumber *_Nullable serverTimestamp = (envelope.hasServerTimestamp ? @(envelope.serverTimestamp) : nil);
BOOL wasReceivedByUD = envelope.type == SSKProtoEnvelopeTypeUnidentifiedSender;
if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) { if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) {
[self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction]; [self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction];
@ -1229,7 +1230,8 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:dataMessage.expireTimer expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:contact contactShare:contact
serverTimestamp:serverTimestamp]; serverTimestamp:serverTimestamp
wasReceivedByUD:wasReceivedByUD];
[self finalizeIncomingMessage:incomingMessage [self finalizeIncomingMessage:incomingMessage
thread:oldGroupThread thread:oldGroupThread
@ -1269,7 +1271,8 @@ NS_ASSUME_NONNULL_BEGIN
expiresInSeconds:dataMessage.expireTimer expiresInSeconds:dataMessage.expireTimer
quotedMessage:quotedMessage quotedMessage:quotedMessage
contactShare:contact contactShare:contact
serverTimestamp:serverTimestamp]; serverTimestamp:serverTimestamp
wasReceivedByUD:wasReceivedByUD];
[self finalizeIncomingMessage:incomingMessage [self finalizeIncomingMessage:incomingMessage
thread:thread thread:thread

Write Preview
Loading…
Cancel
Save