pull/258/head
nielsandriesse 5 years ago
parent b7b2f0e5bf
commit 1b621fc56d

@ -109,7 +109,7 @@ NS_ASSUME_NONNULL_BEGIN
if (transcript.thread.isGroupThread) {
TSGroupThread *thread = (TSGroupThread *)transcript.thread;
if (thread.isPublicChat) {
[outgoingMessage setServerTimestampAsReceiveTimestamp:serverTimestamp];
[outgoingMessage setServerTimestampToReceivedTimestamp:serverTimestamp];
}
}

@ -42,9 +42,7 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value);
/// Used for public chats where a message sent from a slave device is interpreted as having been sent from the master device.
@property (nonatomic) NSString *actualSenderHexEncodedPublicKey;
- (void)setServerTimestampAsReceiveTimestamp:(uint64_t)receivedAtTimestamp;
- (uint64_t)timestamp;
- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp;
- (NSDate *)receivedAtDate;

@ -193,7 +193,7 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
return self.timestamp;
}
- (void)setServerTimestampAsReceiveTimestamp:(uint64_t)receivedAtTimestamp
- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp
{
_receivedAtTimestamp = receivedAtTimestamp;
}

@ -1419,9 +1419,9 @@ NS_ASSUME_NONNULL_BEGIN
serverTimestamp:serverTimestamp
wasReceivedByUD:wasReceivedByUD];
//For open group messages, use server timestamp as the receive timestamp
// For open group messages, use the server timestamp as the received timestamp
if (oldGroupThread.isPublicChat) {
[incomingMessage setServerTimestampAsReceiveTimestamp:(uint64_t)envelope.serverTimestamp];
[incomingMessage setServerTimestampToReceivedTimestamp:(uint64_t)envelope.serverTimestamp];
}
// Loki: Set open group server ID if needed

Loading…
Cancel
Save