From edd63164d7e01d0c1c4bac06137cc8cbf087ca93 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Sep 2017 17:09:55 -0400 Subject: [PATCH] Fix build breaks. // FREEBIE --- Signal/src/network/PushManager.m | 1 + SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h | 3 +++ SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m index 2cd4cca8d..1fa016f7d 100644 --- a/Signal/src/network/PushManager.m +++ b/Signal/src/network/PushManager.m @@ -14,6 +14,7 @@ #import #import #import +#import #import #import diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h index 2eb3d4050..e7224c99e 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h @@ -106,6 +106,9 @@ NS_ASSUME_NONNULL_BEGIN // This will be 0 for messages created before we were tracking sourceDeviceId @property (nonatomic, readonly) UInt32 sourceDeviceId; +// NOTE: Use messageAuthorId instead wherever possible. +@property (nonatomic, readonly) NSString *authorId; + - (NSString *)messageAuthorId; @end diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m index d9656d4d5..ddee46108 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m @@ -16,8 +16,6 @@ NS_ASSUME_NONNULL_BEGIN @interface TSIncomingMessage () -@property (nonatomic, readonly) NSString *authorId; - @property (nonatomic, getter=wasRead) BOOL read; @end