|
|
|
@ -169,8 +169,8 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
|
|
|
|
|
|
|
|
|
|
- (uint64_t)timestampForUI
|
|
|
|
|
{
|
|
|
|
|
if (_shouldUseServerTime) {
|
|
|
|
|
return _receivedAtTimestamp;
|
|
|
|
|
if ([self isKindOfClass:TSIncomingMessage.class] && ((TSIncomingMessage *)self).isOpenGroupMessage) {
|
|
|
|
|
return ((TSIncomingMessage *)self).serverTimestamp.unsignedLongLongValue;
|
|
|
|
|
}
|
|
|
|
|
return _timestamp;
|
|
|
|
|
}
|
|
|
|
@ -180,14 +180,11 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
|
|
|
|
|
return self.timestamp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp
|
|
|
|
|
{
|
|
|
|
|
_shouldUseServerTime = YES;
|
|
|
|
|
_receivedAtTimestamp = receivedAtTimestamp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (NSDate *)receivedAtDate
|
|
|
|
|
{
|
|
|
|
|
if ([self isKindOfClass:TSIncomingMessage.class] && ((TSIncomingMessage *)self).isOpenGroupMessage) {
|
|
|
|
|
return [NSDate ows_dateWithMillisecondsSince1970:((TSIncomingMessage *)self).serverTimestamp.unsignedLongLongValue];
|
|
|
|
|
}
|
|
|
|
|
return [NSDate ows_dateWithMillisecondsSince1970:self.receivedAtTimestamp];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -228,8 +225,8 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
|
|
|
|
|
|
|
|
|
|
- (uint64_t)sortId
|
|
|
|
|
{
|
|
|
|
|
if ([self isKindOfClass:TSMessage.class] && ((TSMessage *)self).isOpenGroupMessage) {
|
|
|
|
|
return self.receivedAtTimestamp;
|
|
|
|
|
if ([self isKindOfClass:TSIncomingMessage.class] && ((TSIncomingMessage *)self).isOpenGroupMessage) {
|
|
|
|
|
return ((TSIncomingMessage *)self).serverTimestamp.unsignedLongLongValue;
|
|
|
|
|
}
|
|
|
|
|
return self.timestamp;
|
|
|
|
|
}
|
|
|
|
|