signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

don't manually wrap generated code except where necessary

Browse Source
This commit is contained in:
Michael Kirk 2019-09-26 09:02:52 -07:00
parent 20c39a4f36
commit ac48db41db
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
View File

@ -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];

4
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
View File

@ -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.");
}

17
SignalServiceKit/src/Protos/Generated/SSKProtos.swift
View File

@ -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
}
}