From ac48db41db89bc9d4881509e4d1ca9172cea6dc2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 26 Sep 2019 09:02:52 -0700 Subject: [PATCH] don't manually wrap generated code except where necessary --- .../OWSOutgoingSentMessageTranscript.m | 2 +- .../Messages/Interactions/TSOutgoingMessage.m | 4 ++-- .../src/Protos/Generated/SSKProtos.swift | 17 ++--------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m index bfb3b3a5c9..c0e2122e13 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m @@ -101,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(SSKFeatureFlags.viewOnceSending); [dataBuilder setIsViewOnce:YES]; - [dataBuilder setRequiredProtocolVersion:(uint32_t)SSKProtos.viewOnceMessagesProtocolVersion]; + [dataBuilder setRequiredProtocolVersion:(uint32_t)SSKProtoDataMessageProtocolVersionViewOnceVideo]; NSError *error; dataMessage = [dataBuilder buildAndReturnError:&error]; diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 25d8cf2a8c..32fe152396 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -1070,12 +1070,12 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1; SSKProtoDataMessageBuilder *builder = [SSKProtoDataMessage builder]; [builder setTimestamp:self.timestamp]; - NSUInteger requiredProtocolVersion = SSKProtos.initialProtocolVersion; + NSUInteger requiredProtocolVersion = SSKProtoDataMessageProtocolVersionInitial; if (self.isViewOnceMessage) { if (SSKFeatureFlags.viewOnceSending) { [builder setIsViewOnce:YES]; - requiredProtocolVersion = SSKProtos.viewOnceMessagesProtocolVersion; + requiredProtocolVersion = SSKProtoDataMessageProtocolVersionViewOnceVideo; } else { OWSFailDebug(@"Feature flag not set."); } diff --git a/SignalServiceKit/src/Protos/Generated/SSKProtos.swift b/SignalServiceKit/src/Protos/Generated/SSKProtos.swift index f77d810f96..5c9f973d8c 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProtos.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProtos.swift @@ -9,23 +9,10 @@ public class SSKProtos: NSObject { private override init() {} - @objc - public class var initialProtocolVersion: Int { - return SignalServiceProtos_DataMessage.ProtocolVersion.initial.rawValue - } - - @objc - public class var perMessageExpirationProtocolVersion: Int { - return SignalServiceProtos_DataMessage.ProtocolVersion.messageTimers.rawValue - } - - @objc - public class var viewOnceMessagesProtocolVersion: Int { - return SignalServiceProtos_DataMessage.ProtocolVersion.viewOnce.rawValue - } - @objc public class var currentProtocolVersion: Int { + // Our proto wrappers don't handle enum aliases, so we have one non-generated + // wrapper for the "current" protocol version. return SignalServiceProtos_DataMessage.ProtocolVersion.current.rawValue } }