From 1b621fc56df78d114851f67f014e9c0093850577 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 31 Aug 2020 11:20:22 +1000
Subject: [PATCH] Clean

---
 SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m      | 2 +-
 SignalServiceKit/src/Messages/Interactions/TSInteraction.h | 4 +---
 SignalServiceKit/src/Messages/Interactions/TSInteraction.m | 2 +-
 SignalServiceKit/src/Messages/OWSMessageManager.m          | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
index 02c4b4cd5..9977c9723 100644
--- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
+++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
@@ -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];
         }
     }
     
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
index 0af44e964..b53c71b17 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
@@ -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;
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index dc5bc492a..502c55d35 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -193,7 +193,7 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
     return self.timestamp;
 }
 
-- (void)setServerTimestampAsReceiveTimestamp:(uint64_t)receivedAtTimestamp
+- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp
 {
     _receivedAtTimestamp = receivedAtTimestamp;
 }
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index c97b2fd09..040dca1cc 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -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