From f0a57edde0337d0c367708bed050985852bc5f7d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 25 Aug 2017 17:02:57 -0400 Subject: [PATCH] proto update: multiDevice profileKey sync Also: - minimize diff between Signal-Android's protos - comment whereever we diverge from Signal-Android // FREEBIE --- .../protobuf/OWSProvisioningProtos.proto | 7 + .../protobuf/OWSSignalServiceProtos.proto | 88 +- .../src/Devices/OWSProvisioningProtos.pb.h | 10 + .../src/Devices/OWSProvisioningProtos.pb.m | 49 + .../src/Messages/OWSSignalServiceProtos.pb.h | 286 +- .../src/Messages/OWSSignalServiceProtos.pb.m | 3221 +++++++++-------- 6 files changed, 1897 insertions(+), 1764 deletions(-) diff --git a/SignalServiceKit/protobuf/OWSProvisioningProtos.proto b/SignalServiceKit/protobuf/OWSProvisioningProtos.proto index 66ef7facd..cc7914182 100644 --- a/SignalServiceKit/protobuf/OWSProvisioningProtos.proto +++ b/SignalServiceKit/protobuf/OWSProvisioningProtos.proto @@ -1,3 +1,9 @@ +/** + * Copyright (C) 2014-2016 Open Whisper Systems + * + * Licensed according to the LICENSE file in this repository. + */ + package signalservice; option java_package = "org.whispersystems.signalservice.internal.push"; @@ -17,4 +23,5 @@ message ProvisionMessage { optional string number = 3; optional string provisioningCode = 4; optional string userAgent = 5; + optional bytes profileKey = 6; } diff --git a/SignalServiceKit/protobuf/OWSSignalServiceProtos.proto b/SignalServiceKit/protobuf/OWSSignalServiceProtos.proto index 888133a5c..477e964f6 100644 --- a/SignalServiceKit/protobuf/OWSSignalServiceProtos.proto +++ b/SignalServiceKit/protobuf/OWSSignalServiceProtos.proto @@ -37,35 +37,18 @@ message Content { optional NullMessage nullMessage = 4; } -message NullMessage { - optional bytes padding = 1; -} - -message Verified { - enum State { - DEFAULT = 0; - VERIFIED = 1; - UNVERIFIED = 2; - } - - optional string destination = 1; - optional bytes identityKey = 2; - optional State state = 3; - optional bytes nullMessage = 4; -} - message CallMessage { message Offer { optional uint64 id = 1; - // We've renamed the description field on iOS to avoid - // conflicts with [NSObject description]. + // Signal-iOS renamed the description field to avoid + // conflicts with [NSObject description]. optional string sessionDescription = 2; } message Answer { optional uint64 id = 1; - // We've renamed the description field on iOS to avoid - // conflicts with [NSObject description]. + // Signal-iOS renamed the description field to avoid + // conflicts with [NSObject description]. optional string sessionDescription = 2; } @@ -84,11 +67,14 @@ message CallMessage { optional uint64 id = 1; } - optional Offer offer = 1; - optional Answer answer = 2; - repeated IceUpdate iceUpdate = 3; - optional Hangup hangup = 4; - optional Busy busy = 5; + + optional Offer offer = 1; + optional Answer answer = 2; + repeated IceUpdate iceUpdate = 3; + optional Hangup hangup = 4; + optional Busy busy = 5; + // Signal-iOS sends profile key with call messages + // for earlier discovery optional bytes profileKey = 6; } @@ -106,6 +92,23 @@ message DataMessage { optional bytes profileKey = 6; } +message NullMessage { + optional bytes padding = 1; +} + +message Verified { + enum State { + DEFAULT = 0; + VERIFIED = 1; + UNVERIFIED = 2; + } + + optional string destination = 1; + optional bytes identityKey = 2; + optional State state = 3; + optional bytes nullMessage = 4; +} + message SyncMessage { message Sent { optional string destination = 1; @@ -143,14 +146,18 @@ message SyncMessage { optional uint64 timestamp = 2; } - optional Sent sent = 1; - optional Contacts contacts = 2; - optional Groups groups = 3; - optional Request request = 4; - repeated Read read = 5; - optional Blocked blocked = 6; - optional Verified verified = 7; - optional bytes padding = 8; + optional Sent sent = 1; + optional Contacts contacts = 2; + optional Groups groups = 3; + optional Request request = 4; + repeated Read read = 5; + optional Blocked blocked = 6; + optional Verified verified = 7; + optional bytes padding = 8; + // Signal-iOS includes profileKey in *every* Sync message + // We should change this so as not to bloat our sync message size + // since sync messages are sent all the time and we only need to + // send a key once. optional bytes profileKey = 9; } @@ -166,7 +173,7 @@ message AttachmentPointer { optional bytes thumbnail = 5; optional bytes digest = 6; optional string fileName = 7; - optional uint32 flags = 8; + optional uint32 flags = 8; } message GroupContext { @@ -190,11 +197,12 @@ message ContactDetails { optional uint32 length = 2; } - optional string number = 1; - optional string name = 2; - optional Avatar avatar = 3; - optional string color = 4; - optional Verified verified = 5; + optional string number = 1; + optional string name = 2; + optional Avatar avatar = 3; + optional string color = 4; + optional Verified verified = 5; + optional bytes profileKey = 6; } message GroupDetails { diff --git a/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.h b/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.h index 85faa8c4c..a01777326 100644 --- a/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.h +++ b/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.h @@ -126,6 +126,7 @@ #define ProvisionMessage_number @"number" #define ProvisionMessage_provisioningCode @"provisioningCode" #define ProvisionMessage_userAgent @"userAgent" +#define ProvisionMessage_profileKey @"profileKey" @interface OWSProvisioningProtosProvisionMessage : PBGeneratedMessage { @private BOOL hasNumber_:1; @@ -133,22 +134,26 @@ BOOL hasUserAgent_:1; BOOL hasIdentityKeyPublic_:1; BOOL hasIdentityKeyPrivate_:1; + BOOL hasProfileKey_:1; NSString* number; NSString* provisioningCode; NSString* userAgent; NSData* identityKeyPublic; NSData* identityKeyPrivate; + NSData* profileKey; } - (BOOL) hasIdentityKeyPublic; - (BOOL) hasIdentityKeyPrivate; - (BOOL) hasNumber; - (BOOL) hasProvisioningCode; - (BOOL) hasUserAgent; +- (BOOL) hasProfileKey; @property (readonly, strong) NSData* identityKeyPublic; @property (readonly, strong) NSData* identityKeyPrivate; @property (readonly, strong) NSString* number; @property (readonly, strong) NSString* provisioningCode; @property (readonly, strong) NSString* userAgent; +@property (readonly, strong) NSData* profileKey; + (instancetype) defaultInstance; - (instancetype) defaultInstance; @@ -209,6 +214,11 @@ - (NSString*) userAgent; - (OWSProvisioningProtosProvisionMessageBuilder*) setUserAgent:(NSString*) value; - (OWSProvisioningProtosProvisionMessageBuilder*) clearUserAgent; + +- (BOOL) hasProfileKey; +- (NSData*) profileKey; +- (OWSProvisioningProtosProvisionMessageBuilder*) setProfileKey:(NSData*) value; +- (OWSProvisioningProtosProvisionMessageBuilder*) clearProfileKey; @end diff --git a/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.m b/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.m index 21e1922de..22a56baa9 100644 --- a/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.m +++ b/SignalServiceKit/src/Devices/OWSProvisioningProtos.pb.m @@ -282,6 +282,7 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi @property (strong) NSString* number; @property (strong) NSString* provisioningCode; @property (strong) NSString* userAgent; +@property (strong) NSData* profileKey; @end @implementation OWSProvisioningProtosProvisionMessage @@ -321,6 +322,13 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi hasUserAgent_ = !!_value_; } @synthesize userAgent; +- (BOOL) hasProfileKey { + return !!hasProfileKey_; +} +- (void) setHasProfileKey:(BOOL) _value_ { + hasProfileKey_ = !!_value_; +} +@synthesize profileKey; - (instancetype) init { if ((self = [super init])) { self.identityKeyPublic = [NSData data]; @@ -328,6 +336,7 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi self.number = @""; self.provisioningCode = @""; self.userAgent = @""; + self.profileKey = [NSData data]; } return self; } @@ -362,6 +371,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasUserAgent) { [output writeString:5 value:self.userAgent]; } + if (self.hasProfileKey) { + [output writeData:6 value:self.profileKey]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (SInt32) serializedSize { @@ -386,6 +398,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasUserAgent) { size_ += computeStringSize(5, self.userAgent); } + if (self.hasProfileKey) { + size_ += computeDataSize(6, self.profileKey); + } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; @@ -436,6 +451,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasUserAgent) { [output appendFormat:@"%@%@: %@\n", indent, @"userAgent", self.userAgent]; } + if (self.hasProfileKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; + } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { @@ -454,6 +472,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasUserAgent) { [dictionary setObject: self.userAgent forKey: @"userAgent"]; } + if (self.hasProfileKey) { + [dictionary setObject: self.profileKey forKey: @"profileKey"]; + } [self.unknownFields storeInDictionary:dictionary]; } - (BOOL) isEqual:(id)other { @@ -475,6 +496,8 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis (!self.hasProvisioningCode || [self.provisioningCode isEqual:otherMessage.provisioningCode]) && self.hasUserAgent == otherMessage.hasUserAgent && (!self.hasUserAgent || [self.userAgent isEqual:otherMessage.userAgent]) && + self.hasProfileKey == otherMessage.hasProfileKey && + (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { @@ -494,6 +517,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasUserAgent) { hashCode = hashCode * 31 + [self.userAgent hash]; } + if (self.hasProfileKey) { + hashCode = hashCode * 31 + [self.profileKey hash]; + } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -552,6 +578,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (other.hasUserAgent) { [self setUserAgent:other.userAgent]; } + if (other.hasProfileKey) { + [self setProfileKey:other.profileKey]; + } [self mergeUnknownFields:other.unknownFields]; return self; } @@ -593,6 +622,10 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis [self setUserAgent:[input readString]]; break; } + case 50: { + [self setProfileKey:[input readData]]; + break; + } } } } @@ -676,6 +709,22 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis resultProvisionMessage.userAgent = @""; return self; } +- (BOOL) hasProfileKey { + return resultProvisionMessage.hasProfileKey; +} +- (NSData*) profileKey { + return resultProvisionMessage.profileKey; +} +- (OWSProvisioningProtosProvisionMessageBuilder*) setProfileKey:(NSData*) value { + resultProvisionMessage.hasProfileKey = YES; + resultProvisionMessage.profileKey = value; + return self; +} +- (OWSProvisioningProtosProvisionMessageBuilder*) clearProfileKey { + resultProvisionMessage.hasProfileKey = NO; + resultProvisionMessage.profileKey = [NSData data]; + return self; +} @end diff --git a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h index 54a1c300b..9f365d3a4 100644 --- a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h +++ b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h @@ -109,6 +109,14 @@ typedef NS_ENUM(SInt32, OWSSignalServiceProtosEnvelopeType) { BOOL OWSSignalServiceProtosEnvelopeTypeIsValidValue(OWSSignalServiceProtosEnvelopeType value); NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosEnvelopeType value); +typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageFlags) { + OWSSignalServiceProtosDataMessageFlagsEndSession = 1, + OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate = 2, +}; + +BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value); +NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value); + typedef NS_ENUM(SInt32, OWSSignalServiceProtosVerifiedState) { OWSSignalServiceProtosVerifiedStateDefault = 0, OWSSignalServiceProtosVerifiedStateVerified = 1, @@ -118,14 +126,6 @@ typedef NS_ENUM(SInt32, OWSSignalServiceProtosVerifiedState) { BOOL OWSSignalServiceProtosVerifiedStateIsValidValue(OWSSignalServiceProtosVerifiedState value); NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtosVerifiedState value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageFlags) { - OWSSignalServiceProtosDataMessageFlagsEndSession = 1, - OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate = 2, -}; - -BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value); - typedef NS_ENUM(SInt32, OWSSignalServiceProtosSyncMessageRequestType) { OWSSignalServiceProtosSyncMessageRequestTypeUnknown = 0, OWSSignalServiceProtosSyncMessageRequestTypeContacts = 1, @@ -359,136 +359,6 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (OWSSignalServiceProtosContentBuilder*) clearNullMessage; @end -#define NullMessage_padding @"padding" -@interface OWSSignalServiceProtosNullMessage : PBGeneratedMessage { -@private - BOOL hasPadding_:1; - NSData* padding; -} -- (BOOL) hasPadding; -@property (readonly, strong) NSData* padding; - -+ (instancetype) defaultInstance; -- (instancetype) defaultInstance; - -- (BOOL) isInitialized; -- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosNullMessageBuilder*) builder; -+ (OWSSignalServiceProtosNullMessageBuilder*) builder; -+ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype; -- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder; - -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -@end - -@interface OWSSignalServiceProtosNullMessageBuilder : PBGeneratedMessageBuilder { -@private - OWSSignalServiceProtosNullMessage* resultNullMessage; -} - -- (OWSSignalServiceProtosNullMessage*) defaultInstance; - -- (OWSSignalServiceProtosNullMessageBuilder*) clear; -- (OWSSignalServiceProtosNullMessageBuilder*) clone; - -- (OWSSignalServiceProtosNullMessage*) build; -- (OWSSignalServiceProtosNullMessage*) buildPartial; - -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other; -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - -- (BOOL) hasPadding; -- (NSData*) padding; -- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value; -- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding; -@end - -#define Verified_destination @"destination" -#define Verified_identityKey @"identityKey" -#define Verified_state @"state" -#define Verified_nullMessage @"nullMessage" -@interface OWSSignalServiceProtosVerified : PBGeneratedMessage { -@private - BOOL hasDestination_:1; - BOOL hasIdentityKey_:1; - BOOL hasNullMessage_:1; - BOOL hasState_:1; - NSString* destination; - NSData* identityKey; - NSData* nullMessage; - OWSSignalServiceProtosVerifiedState state; -} -- (BOOL) hasDestination; -- (BOOL) hasIdentityKey; -- (BOOL) hasState; -- (BOOL) hasNullMessage; -@property (readonly, strong) NSString* destination; -@property (readonly, strong) NSData* identityKey; -@property (readonly) OWSSignalServiceProtosVerifiedState state; -@property (readonly, strong) NSData* nullMessage; - -+ (instancetype) defaultInstance; -- (instancetype) defaultInstance; - -- (BOOL) isInitialized; -- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosVerifiedBuilder*) builder; -+ (OWSSignalServiceProtosVerifiedBuilder*) builder; -+ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype; -- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder; - -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -@end - -@interface OWSSignalServiceProtosVerifiedBuilder : PBGeneratedMessageBuilder { -@private - OWSSignalServiceProtosVerified* resultVerified; -} - -- (OWSSignalServiceProtosVerified*) defaultInstance; - -- (OWSSignalServiceProtosVerifiedBuilder*) clear; -- (OWSSignalServiceProtosVerifiedBuilder*) clone; - -- (OWSSignalServiceProtosVerified*) build; -- (OWSSignalServiceProtosVerified*) buildPartial; - -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other; -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - -- (BOOL) hasDestination; -- (NSString*) destination; -- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination; - -- (BOOL) hasIdentityKey; -- (NSData*) identityKey; -- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey; - -- (BOOL) hasState; -- (OWSSignalServiceProtosVerifiedState) state; -- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearState; - -- (BOOL) hasNullMessage; -- (NSData*) nullMessage; -- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage; -@end - #define CallMessage_offer @"offer" #define CallMessage_answer @"answer" #define CallMessage_iceUpdate @"iceUpdate" @@ -999,6 +869,136 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (OWSSignalServiceProtosDataMessageBuilder*) clearProfileKey; @end +#define NullMessage_padding @"padding" +@interface OWSSignalServiceProtosNullMessage : PBGeneratedMessage { +@private + BOOL hasPadding_:1; + NSData* padding; +} +- (BOOL) hasPadding; +@property (readonly, strong) NSData* padding; + ++ (instancetype) defaultInstance; +- (instancetype) defaultInstance; + +- (BOOL) isInitialized; +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; +- (OWSSignalServiceProtosNullMessageBuilder*) builder; ++ (OWSSignalServiceProtosNullMessageBuilder*) builder; ++ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype; +- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder; + ++ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data; ++ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input; ++ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +@end + +@interface OWSSignalServiceProtosNullMessageBuilder : PBGeneratedMessageBuilder { +@private + OWSSignalServiceProtosNullMessage* resultNullMessage; +} + +- (OWSSignalServiceProtosNullMessage*) defaultInstance; + +- (OWSSignalServiceProtosNullMessageBuilder*) clear; +- (OWSSignalServiceProtosNullMessageBuilder*) clone; + +- (OWSSignalServiceProtosNullMessage*) build; +- (OWSSignalServiceProtosNullMessage*) buildPartial; + +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other; +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; + +- (BOOL) hasPadding; +- (NSData*) padding; +- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value; +- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding; +@end + +#define Verified_destination @"destination" +#define Verified_identityKey @"identityKey" +#define Verified_state @"state" +#define Verified_nullMessage @"nullMessage" +@interface OWSSignalServiceProtosVerified : PBGeneratedMessage { +@private + BOOL hasDestination_:1; + BOOL hasIdentityKey_:1; + BOOL hasNullMessage_:1; + BOOL hasState_:1; + NSString* destination; + NSData* identityKey; + NSData* nullMessage; + OWSSignalServiceProtosVerifiedState state; +} +- (BOOL) hasDestination; +- (BOOL) hasIdentityKey; +- (BOOL) hasState; +- (BOOL) hasNullMessage; +@property (readonly, strong) NSString* destination; +@property (readonly, strong) NSData* identityKey; +@property (readonly) OWSSignalServiceProtosVerifiedState state; +@property (readonly, strong) NSData* nullMessage; + ++ (instancetype) defaultInstance; +- (instancetype) defaultInstance; + +- (BOOL) isInitialized; +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; +- (OWSSignalServiceProtosVerifiedBuilder*) builder; ++ (OWSSignalServiceProtosVerifiedBuilder*) builder; ++ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype; +- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder; + ++ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data; ++ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input; ++ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +@end + +@interface OWSSignalServiceProtosVerifiedBuilder : PBGeneratedMessageBuilder { +@private + OWSSignalServiceProtosVerified* resultVerified; +} + +- (OWSSignalServiceProtosVerified*) defaultInstance; + +- (OWSSignalServiceProtosVerifiedBuilder*) clear; +- (OWSSignalServiceProtosVerifiedBuilder*) clone; + +- (OWSSignalServiceProtosVerified*) build; +- (OWSSignalServiceProtosVerified*) buildPartial; + +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other; +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; + +- (BOOL) hasDestination; +- (NSString*) destination; +- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value; +- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination; + +- (BOOL) hasIdentityKey; +- (NSData*) identityKey; +- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value; +- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey; + +- (BOOL) hasState; +- (OWSSignalServiceProtosVerifiedState) state; +- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value; +- (OWSSignalServiceProtosVerifiedBuilder*) clearState; + +- (BOOL) hasNullMessage; +- (NSData*) nullMessage; +- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value; +- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage; +@end + #define SyncMessage_sent @"sent" #define SyncMessage_contacts @"contacts" #define SyncMessage_groups @"groups" @@ -1714,6 +1714,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define ContactDetails_avatar @"avatar" #define ContactDetails_color @"color" #define ContactDetails_verified @"verified" +#define ContactDetails_profileKey @"profileKey" @interface OWSSignalServiceProtosContactDetails : PBGeneratedMessage { @private BOOL hasNumber_:1; @@ -1721,22 +1722,26 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro BOOL hasColor_:1; BOOL hasAvatar_:1; BOOL hasVerified_:1; + BOOL hasProfileKey_:1; NSString* number; NSString* name; NSString* color; OWSSignalServiceProtosContactDetailsAvatar* avatar; OWSSignalServiceProtosVerified* verified; + NSData* profileKey; } - (BOOL) hasNumber; - (BOOL) hasName; - (BOOL) hasAvatar; - (BOOL) hasColor; - (BOOL) hasVerified; +- (BOOL) hasProfileKey; @property (readonly, strong) NSString* number; @property (readonly, strong) NSString* name; @property (readonly, strong) OWSSignalServiceProtosContactDetailsAvatar* avatar; @property (readonly, strong) NSString* color; @property (readonly, strong) OWSSignalServiceProtosVerified* verified; +@property (readonly, strong) NSData* profileKey; + (instancetype) defaultInstance; - (instancetype) defaultInstance; @@ -1861,6 +1866,11 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (OWSSignalServiceProtosContactDetailsBuilder*) setVerifiedBuilder:(OWSSignalServiceProtosVerifiedBuilder*) builderForValue; - (OWSSignalServiceProtosContactDetailsBuilder*) mergeVerified:(OWSSignalServiceProtosVerified*) value; - (OWSSignalServiceProtosContactDetailsBuilder*) clearVerified; + +- (BOOL) hasProfileKey; +- (NSData*) profileKey; +- (OWSSignalServiceProtosContactDetailsBuilder*) setProfileKey:(NSData*) value; +- (OWSSignalServiceProtosContactDetailsBuilder*) clearProfileKey; @end #define GroupDetails_id @"id" diff --git a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m index 55f3e5d54..91ab7e118 100644 --- a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m +++ b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m @@ -1004,43 +1004,103 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan } @end -@interface OWSSignalServiceProtosNullMessage () -@property (strong) NSData* padding; +@interface OWSSignalServiceProtosCallMessage () +@property (strong) OWSSignalServiceProtosCallMessageOffer* offer; +@property (strong) OWSSignalServiceProtosCallMessageAnswer* answer; +@property (strong) NSMutableArray * iceUpdateArray; +@property (strong) OWSSignalServiceProtosCallMessageHangup* hangup; +@property (strong) OWSSignalServiceProtosCallMessageBusy* busy; +@property (strong) NSData* profileKey; @end -@implementation OWSSignalServiceProtosNullMessage +@implementation OWSSignalServiceProtosCallMessage -- (BOOL) hasPadding { - return !!hasPadding_; +- (BOOL) hasOffer { + return !!hasOffer_; } -- (void) setHasPadding:(BOOL) _value_ { - hasPadding_ = !!_value_; +- (void) setHasOffer:(BOOL) _value_ { + hasOffer_ = !!_value_; } -@synthesize padding; +@synthesize offer; +- (BOOL) hasAnswer { + return !!hasAnswer_; +} +- (void) setHasAnswer:(BOOL) _value_ { + hasAnswer_ = !!_value_; +} +@synthesize answer; +@synthesize iceUpdateArray; +@dynamic iceUpdate; +- (BOOL) hasHangup { + return !!hasHangup_; +} +- (void) setHasHangup:(BOOL) _value_ { + hasHangup_ = !!_value_; +} +@synthesize hangup; +- (BOOL) hasBusy { + return !!hasBusy_; +} +- (void) setHasBusy:(BOOL) _value_ { + hasBusy_ = !!_value_; +} +@synthesize busy; +- (BOOL) hasProfileKey { + return !!hasProfileKey_; +} +- (void) setHasProfileKey:(BOOL) _value_ { + hasProfileKey_ = !!_value_; +} +@synthesize profileKey; - (instancetype) init { if ((self = [super init])) { - self.padding = [NSData data]; + self.offer = [OWSSignalServiceProtosCallMessageOffer defaultInstance]; + self.answer = [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; + self.hangup = [OWSSignalServiceProtosCallMessageHangup defaultInstance]; + self.busy = [OWSSignalServiceProtosCallMessageBusy defaultInstance]; + self.profileKey = [NSData data]; } return self; } -static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessageInstance = nil; +static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosNullMessage class]) { - defaultOWSSignalServiceProtosNullMessageInstance = [[OWSSignalServiceProtosNullMessage alloc] init]; + if (self == [OWSSignalServiceProtosCallMessage class]) { + defaultOWSSignalServiceProtosCallMessageInstance = [[OWSSignalServiceProtosCallMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosNullMessageInstance; + return defaultOWSSignalServiceProtosCallMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosNullMessageInstance; + return defaultOWSSignalServiceProtosCallMessageInstance; +} +- (NSArray *)iceUpdate { + return iceUpdateArray; +} +- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { + return [iceUpdateArray objectAtIndex:index]; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasPadding) { - [output writeData:1 value:self.padding]; + if (self.hasOffer) { + [output writeMessage:1 value:self.offer]; + } + if (self.hasAnswer) { + [output writeMessage:2 value:self.answer]; + } + [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [output writeMessage:3 value:element]; + }]; + if (self.hasHangup) { + [output writeMessage:4 value:self.hangup]; + } + if (self.hasBusy) { + [output writeMessage:5 value:self.busy]; + } + if (self.hasProfileKey) { + [output writeData:6 value:self.profileKey]; } [self.unknownFields writeToCodedOutputStream:output]; } @@ -1051,52 +1111,122 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa } size_ = 0; - if (self.hasPadding) { - size_ += computeDataSize(1, self.padding); + if (self.hasOffer) { + size_ += computeMessageSize(1, self.offer); + } + if (self.hasAnswer) { + size_ += computeMessageSize(2, self.answer); + } + [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + size_ += computeMessageSize(3, element); + }]; + if (self.hasHangup) { + size_ += computeMessageSize(4, self.hangup); + } + if (self.hasBusy) { + size_ += computeMessageSize(5, self.busy); + } + if (self.hasProfileKey) { + size_ += computeDataSize(6, self.profileKey); } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessageBuilder*) builder { - return [[OWSSignalServiceProtosNullMessageBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype { - return [[OWSSignalServiceProtosNullMessage builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessage*) prototype { + return [[OWSSignalServiceProtosCallMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosNullMessageBuilder*) builder { - return [OWSSignalServiceProtosNullMessage builder]; +- (OWSSignalServiceProtosCallMessageBuilder*) builder { + return [OWSSignalServiceProtosCallMessage builder]; } -- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosNullMessage builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessage builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasPadding) { - [output appendFormat:@"%@%@: %@\n", indent, @"padding", self.padding]; + if (self.hasOffer) { + [output appendFormat:@"%@%@ {\n", indent, @"offer"]; + [self.offer writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasAnswer) { + [output appendFormat:@"%@%@ {\n", indent, @"answer"]; + [self.answer writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [output appendFormat:@"%@%@ {\n", indent, @"iceUpdate"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + }]; + if (self.hasHangup) { + [output appendFormat:@"%@%@ {\n", indent, @"hangup"]; + [self.hangup writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasBusy) { + [output appendFormat:@"%@%@ {\n", indent, @"busy"]; + [self.busy writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasProfileKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasPadding) { - [dictionary setObject: self.padding forKey: @"padding"]; + if (self.hasOffer) { + NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; + [self.offer storeInDictionary:messageDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"offer"]; + } + if (self.hasAnswer) { + NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; + [self.answer storeInDictionary:messageDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"answer"]; + } + for (OWSSignalServiceProtosCallMessageIceUpdate* element in self.iceUpdateArray) { + NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; + [element storeInDictionary:elementDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"iceUpdate"]; + } + if (self.hasHangup) { + NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; + [self.hangup storeInDictionary:messageDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"hangup"]; + } + if (self.hasBusy) { + NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; + [self.busy storeInDictionary:messageDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"busy"]; + } + if (self.hasProfileKey) { + [dictionary setObject: self.profileKey forKey: @"profileKey"]; } [self.unknownFields storeInDictionary:dictionary]; } @@ -1104,185 +1234,98 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosNullMessage class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessage class]]) { return NO; } - OWSSignalServiceProtosNullMessage *otherMessage = other; + OWSSignalServiceProtosCallMessage *otherMessage = other; return - self.hasPadding == otherMessage.hasPadding && - (!self.hasPadding || [self.padding isEqual:otherMessage.padding]) && + self.hasOffer == otherMessage.hasOffer && + (!self.hasOffer || [self.offer isEqual:otherMessage.offer]) && + self.hasAnswer == otherMessage.hasAnswer && + (!self.hasAnswer || [self.answer isEqual:otherMessage.answer]) && + [self.iceUpdateArray isEqualToArray:otherMessage.iceUpdateArray] && + self.hasHangup == otherMessage.hasHangup && + (!self.hasHangup || [self.hangup isEqual:otherMessage.hangup]) && + self.hasBusy == otherMessage.hasBusy && + (!self.hasBusy || [self.busy isEqual:otherMessage.busy]) && + self.hasProfileKey == otherMessage.hasProfileKey && + (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { __block NSUInteger hashCode = 7; - if (self.hasPadding) { - hashCode = hashCode * 31 + [self.padding hash]; + if (self.hasOffer) { + hashCode = hashCode * 31 + [self.offer hash]; + } + if (self.hasAnswer) { + hashCode = hashCode * 31 + [self.answer hash]; + } + [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + hashCode = hashCode * 31 + [element hash]; + }]; + if (self.hasHangup) { + hashCode = hashCode * 31 + [self.hangup hash]; + } + if (self.hasBusy) { + hashCode = hashCode * 31 + [self.busy hash]; + } + if (self.hasProfileKey) { + hashCode = hashCode * 31 + [self.profileKey hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -@interface OWSSignalServiceProtosNullMessageBuilder() -@property (strong) OWSSignalServiceProtosNullMessage* resultNullMessage; +@interface OWSSignalServiceProtosCallMessageOffer () +@property UInt64 id; +@property (strong) NSString* sessionDescription; @end -@implementation OWSSignalServiceProtosNullMessageBuilder -@synthesize resultNullMessage; -- (instancetype) init { - if ((self = [super init])) { - self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; - } - return self; -} -- (PBGeneratedMessage*) internalGetResult { - return resultNullMessage; -} -- (OWSSignalServiceProtosNullMessageBuilder*) clear { - self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; - return self; -} -- (OWSSignalServiceProtosNullMessageBuilder*) clone { - return [OWSSignalServiceProtosNullMessage builderWithPrototype:resultNullMessage]; -} -- (OWSSignalServiceProtosNullMessage*) defaultInstance { - return [OWSSignalServiceProtosNullMessage defaultInstance]; -} -- (OWSSignalServiceProtosNullMessage*) build { - [self checkInitialized]; - return [self buildPartial]; -} -- (OWSSignalServiceProtosNullMessage*) buildPartial { - OWSSignalServiceProtosNullMessage* returnMe = resultNullMessage; - self.resultNullMessage = nil; - return returnMe; -} -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other { - if (other == [OWSSignalServiceProtosNullMessage defaultInstance]) { - return self; - } - if (other.hasPadding) { - [self setPadding:other.padding]; - } - [self mergeUnknownFields:other.unknownFields]; - return self; -} -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; -} -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; - while (YES) { - SInt32 tag = [input readTag]; - switch (tag) { - case 0: - [self setUnknownFields:[unknownFields build]]; - return self; - default: { - if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { - [self setUnknownFields:[unknownFields build]]; - return self; - } - break; - } - case 10: { - [self setPadding:[input readData]]; - break; - } - } - } -} -- (BOOL) hasPadding { - return resultNullMessage.hasPadding; -} -- (NSData*) padding { - return resultNullMessage.padding; -} -- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value { - resultNullMessage.hasPadding = YES; - resultNullMessage.padding = value; - return self; -} -- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding { - resultNullMessage.hasPadding = NO; - resultNullMessage.padding = [NSData data]; - return self; -} -@end - -@interface OWSSignalServiceProtosVerified () -@property (strong) NSString* destination; -@property (strong) NSData* identityKey; -@property OWSSignalServiceProtosVerifiedState state; -@property (strong) NSData* nullMessage; -@end - -@implementation OWSSignalServiceProtosVerified +@implementation OWSSignalServiceProtosCallMessageOffer -- (BOOL) hasDestination { - return !!hasDestination_; -} -- (void) setHasDestination:(BOOL) _value_ { - hasDestination_ = !!_value_; -} -@synthesize destination; -- (BOOL) hasIdentityKey { - return !!hasIdentityKey_; -} -- (void) setHasIdentityKey:(BOOL) _value_ { - hasIdentityKey_ = !!_value_; -} -@synthesize identityKey; -- (BOOL) hasState { - return !!hasState_; +- (BOOL) hasId { + return !!hasId_; } -- (void) setHasState:(BOOL) _value_ { - hasState_ = !!_value_; +- (void) setHasId:(BOOL) _value_ { + hasId_ = !!_value_; } -@synthesize state; -- (BOOL) hasNullMessage { - return !!hasNullMessage_; +@synthesize id; +- (BOOL) hasSessionDescription { + return !!hasSessionDescription_; } -- (void) setHasNullMessage:(BOOL) _value_ { - hasNullMessage_ = !!_value_; +- (void) setHasSessionDescription:(BOOL) _value_ { + hasSessionDescription_ = !!_value_; } -@synthesize nullMessage; +@synthesize sessionDescription; - (instancetype) init { if ((self = [super init])) { - self.destination = @""; - self.identityKey = [NSData data]; - self.state = OWSSignalServiceProtosVerifiedStateDefault; - self.nullMessage = [NSData data]; + self.id = 0L; + self.sessionDescription = @""; } return self; } -static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInstance = nil; +static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCallMessageOfferInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosVerified class]) { - defaultOWSSignalServiceProtosVerifiedInstance = [[OWSSignalServiceProtosVerified alloc] init]; + if (self == [OWSSignalServiceProtosCallMessageOffer class]) { + defaultOWSSignalServiceProtosCallMessageOfferInstance = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosVerifiedInstance; + return defaultOWSSignalServiceProtosCallMessageOfferInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosVerifiedInstance; + return defaultOWSSignalServiceProtosCallMessageOfferInstance; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasDestination) { - [output writeString:1 value:self.destination]; - } - if (self.hasIdentityKey) { - [output writeData:2 value:self.identityKey]; - } - if (self.hasState) { - [output writeEnum:3 value:self.state]; + if (self.hasId) { + [output writeUInt64:1 value:self.id]; } - if (self.hasNullMessage) { - [output writeData:4 value:self.nullMessage]; + if (self.hasSessionDescription) { + [output writeString:2 value:self.sessionDescription]; } [self.unknownFields writeToCodedOutputStream:output]; } @@ -1293,79 +1336,61 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst } size_ = 0; - if (self.hasDestination) { - size_ += computeStringSize(1, self.destination); - } - if (self.hasIdentityKey) { - size_ += computeDataSize(2, self.identityKey); - } - if (self.hasState) { - size_ += computeEnumSize(3, self.state); + if (self.hasId) { + size_ += computeUInt64Size(1, self.id); } - if (self.hasNullMessage) { - size_ += computeDataSize(4, self.nullMessage); + if (self.hasSessionDescription) { + size_ += computeStringSize(2, self.sessionDescription); } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerifiedBuilder*) builder { - return [[OWSSignalServiceProtosVerifiedBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageOfferBuilder alloc] init]; } -+ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype { - return [[OWSSignalServiceProtosVerified builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageOfferBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageOffer*) prototype { + return [[OWSSignalServiceProtosCallMessageOffer builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosVerifiedBuilder*) builder { - return [OWSSignalServiceProtosVerified builder]; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { + return [OWSSignalServiceProtosCallMessageOffer builder]; } -- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder { - return [OWSSignalServiceProtosVerified builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasDestination) { - [output appendFormat:@"%@%@: %@\n", indent, @"destination", self.destination]; - } - if (self.hasIdentityKey) { - [output appendFormat:@"%@%@: %@\n", indent, @"identityKey", self.identityKey]; - } - if (self.hasState) { - [output appendFormat:@"%@%@: %@\n", indent, @"state", NSStringFromOWSSignalServiceProtosVerifiedState(self.state)]; + if (self.hasId) { + [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; } - if (self.hasNullMessage) { - [output appendFormat:@"%@%@: %@\n", indent, @"nullMessage", self.nullMessage]; + if (self.hasSessionDescription) { + [output appendFormat:@"%@%@: %@\n", indent, @"sessionDescription", self.sessionDescription]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasDestination) { - [dictionary setObject: self.destination forKey: @"destination"]; - } - if (self.hasIdentityKey) { - [dictionary setObject: self.identityKey forKey: @"identityKey"]; - } - if (self.hasState) { - [dictionary setObject: @(self.state) forKey: @"state"]; + if (self.hasId) { + [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; } - if (self.hasNullMessage) { - [dictionary setObject: self.nullMessage forKey: @"nullMessage"]; + if (self.hasSessionDescription) { + [dictionary setObject: self.sessionDescription forKey: @"sessionDescription"]; } [self.unknownFields storeInDictionary:dictionary]; } @@ -1373,120 +1398,81 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosVerified class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageOffer class]]) { return NO; } - OWSSignalServiceProtosVerified *otherMessage = other; + OWSSignalServiceProtosCallMessageOffer *otherMessage = other; return - self.hasDestination == otherMessage.hasDestination && - (!self.hasDestination || [self.destination isEqual:otherMessage.destination]) && - self.hasIdentityKey == otherMessage.hasIdentityKey && - (!self.hasIdentityKey || [self.identityKey isEqual:otherMessage.identityKey]) && - self.hasState == otherMessage.hasState && - (!self.hasState || self.state == otherMessage.state) && - self.hasNullMessage == otherMessage.hasNullMessage && - (!self.hasNullMessage || [self.nullMessage isEqual:otherMessage.nullMessage]) && + self.hasId == otherMessage.hasId && + (!self.hasId || self.id == otherMessage.id) && + self.hasSessionDescription == otherMessage.hasSessionDescription && + (!self.hasSessionDescription || [self.sessionDescription isEqual:otherMessage.sessionDescription]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { __block NSUInteger hashCode = 7; - if (self.hasDestination) { - hashCode = hashCode * 31 + [self.destination hash]; - } - if (self.hasIdentityKey) { - hashCode = hashCode * 31 + [self.identityKey hash]; - } - if (self.hasState) { - hashCode = hashCode * 31 + self.state; + if (self.hasId) { + hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; } - if (self.hasNullMessage) { - hashCode = hashCode * 31 + [self.nullMessage hash]; + if (self.hasSessionDescription) { + hashCode = hashCode * 31 + [self.sessionDescription hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -BOOL OWSSignalServiceProtosVerifiedStateIsValidValue(OWSSignalServiceProtosVerifiedState value) { - switch (value) { - case OWSSignalServiceProtosVerifiedStateDefault: - case OWSSignalServiceProtosVerifiedStateVerified: - case OWSSignalServiceProtosVerifiedStateUnverified: - return YES; - default: - return NO; - } -} -NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtosVerifiedState value) { - switch (value) { - case OWSSignalServiceProtosVerifiedStateDefault: - return @"OWSSignalServiceProtosVerifiedStateDefault"; - case OWSSignalServiceProtosVerifiedStateVerified: - return @"OWSSignalServiceProtosVerifiedStateVerified"; - case OWSSignalServiceProtosVerifiedStateUnverified: - return @"OWSSignalServiceProtosVerifiedStateUnverified"; - default: - return nil; - } -} - -@interface OWSSignalServiceProtosVerifiedBuilder() -@property (strong) OWSSignalServiceProtosVerified* resultVerified; +@interface OWSSignalServiceProtosCallMessageOfferBuilder() +@property (strong) OWSSignalServiceProtosCallMessageOffer* resultOffer; @end -@implementation OWSSignalServiceProtosVerifiedBuilder -@synthesize resultVerified; +@implementation OWSSignalServiceProtosCallMessageOfferBuilder +@synthesize resultOffer; - (instancetype) init { if ((self = [super init])) { - self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; + self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { - return resultVerified; + return resultOffer; } -- (OWSSignalServiceProtosVerifiedBuilder*) clear { - self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) clear { + self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clone { - return [OWSSignalServiceProtosVerified builderWithPrototype:resultVerified]; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) clone { + return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:resultOffer]; } -- (OWSSignalServiceProtosVerified*) defaultInstance { - return [OWSSignalServiceProtosVerified defaultInstance]; +- (OWSSignalServiceProtosCallMessageOffer*) defaultInstance { + return [OWSSignalServiceProtosCallMessageOffer defaultInstance]; } -- (OWSSignalServiceProtosVerified*) build { +- (OWSSignalServiceProtosCallMessageOffer*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosVerified*) buildPartial { - OWSSignalServiceProtosVerified* returnMe = resultVerified; - self.resultVerified = nil; +- (OWSSignalServiceProtosCallMessageOffer*) buildPartial { + OWSSignalServiceProtosCallMessageOffer* returnMe = resultOffer; + self.resultOffer = nil; return returnMe; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other { - if (other == [OWSSignalServiceProtosVerified defaultInstance]) { +- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageOffer*) other { + if (other == [OWSSignalServiceProtosCallMessageOffer defaultInstance]) { return self; } - if (other.hasDestination) { - [self setDestination:other.destination]; - } - if (other.hasIdentityKey) { - [self setIdentityKey:other.identityKey]; - } - if (other.hasState) { - [self setState:other.state]; + if (other.hasId) { + [self setId:other.id]; } - if (other.hasNullMessage) { - [self setNullMessage:other.nullMessage]; + if (other.hasSessionDescription) { + [self setSessionDescription:other.sessionDescription]; } [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -1501,193 +1487,100 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos } break; } - case 10: { - [self setDestination:[input readString]]; + case 8: { + [self setId:[input readUInt64]]; break; } case 18: { - [self setIdentityKey:[input readData]]; - break; - } - case 24: { - OWSSignalServiceProtosVerifiedState value = (OWSSignalServiceProtosVerifiedState)[input readEnum]; - if (OWSSignalServiceProtosVerifiedStateIsValidValue(value)) { - [self setState:value]; - } else { - [unknownFields mergeVarintField:3 value:value]; - } - break; - } - case 34: { - [self setNullMessage:[input readData]]; + [self setSessionDescription:[input readString]]; break; } } } } -- (BOOL) hasDestination { - return resultVerified.hasDestination; -} -- (NSString*) destination { - return resultVerified.destination; -} -- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value { - resultVerified.hasDestination = YES; - resultVerified.destination = value; - return self; -} -- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination { - resultVerified.hasDestination = NO; - resultVerified.destination = @""; - return self; -} -- (BOOL) hasIdentityKey { - return resultVerified.hasIdentityKey; -} -- (NSData*) identityKey { - return resultVerified.identityKey; -} -- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value { - resultVerified.hasIdentityKey = YES; - resultVerified.identityKey = value; - return self; -} -- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey { - resultVerified.hasIdentityKey = NO; - resultVerified.identityKey = [NSData data]; - return self; -} -- (BOOL) hasState { - return resultVerified.hasState; +- (BOOL) hasId { + return resultOffer.hasId; } -- (OWSSignalServiceProtosVerifiedState) state { - return resultVerified.state; +- (UInt64) id { + return resultOffer.id; } -- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value { - resultVerified.hasState = YES; - resultVerified.state = value; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) setId:(UInt64) value { + resultOffer.hasId = YES; + resultOffer.id = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearState { - resultVerified.hasState = NO; - resultVerified.state = OWSSignalServiceProtosVerifiedStateDefault; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearId { + resultOffer.hasId = NO; + resultOffer.id = 0L; return self; } -- (BOOL) hasNullMessage { - return resultVerified.hasNullMessage; +- (BOOL) hasSessionDescription { + return resultOffer.hasSessionDescription; } -- (NSData*) nullMessage { - return resultVerified.nullMessage; +- (NSString*) sessionDescription { + return resultOffer.sessionDescription; } -- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value { - resultVerified.hasNullMessage = YES; - resultVerified.nullMessage = value; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) setSessionDescription:(NSString*) value { + resultOffer.hasSessionDescription = YES; + resultOffer.sessionDescription = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage { - resultVerified.hasNullMessage = NO; - resultVerified.nullMessage = [NSData data]; +- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearSessionDescription { + resultOffer.hasSessionDescription = NO; + resultOffer.sessionDescription = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessage () -@property (strong) OWSSignalServiceProtosCallMessageOffer* offer; -@property (strong) OWSSignalServiceProtosCallMessageAnswer* answer; -@property (strong) NSMutableArray * iceUpdateArray; -@property (strong) OWSSignalServiceProtosCallMessageHangup* hangup; -@property (strong) OWSSignalServiceProtosCallMessageBusy* busy; -@property (strong) NSData* profileKey; +@interface OWSSignalServiceProtosCallMessageAnswer () +@property UInt64 id; +@property (strong) NSString* sessionDescription; @end -@implementation OWSSignalServiceProtosCallMessage +@implementation OWSSignalServiceProtosCallMessageAnswer -- (BOOL) hasOffer { - return !!hasOffer_; -} -- (void) setHasOffer:(BOOL) _value_ { - hasOffer_ = !!_value_; -} -@synthesize offer; -- (BOOL) hasAnswer { - return !!hasAnswer_; -} -- (void) setHasAnswer:(BOOL) _value_ { - hasAnswer_ = !!_value_; -} -@synthesize answer; -@synthesize iceUpdateArray; -@dynamic iceUpdate; -- (BOOL) hasHangup { - return !!hasHangup_; -} -- (void) setHasHangup:(BOOL) _value_ { - hasHangup_ = !!_value_; -} -@synthesize hangup; -- (BOOL) hasBusy { - return !!hasBusy_; +- (BOOL) hasId { + return !!hasId_; } -- (void) setHasBusy:(BOOL) _value_ { - hasBusy_ = !!_value_; +- (void) setHasId:(BOOL) _value_ { + hasId_ = !!_value_; } -@synthesize busy; -- (BOOL) hasProfileKey { - return !!hasProfileKey_; +@synthesize id; +- (BOOL) hasSessionDescription { + return !!hasSessionDescription_; } -- (void) setHasProfileKey:(BOOL) _value_ { - hasProfileKey_ = !!_value_; +- (void) setHasSessionDescription:(BOOL) _value_ { + hasSessionDescription_ = !!_value_; } -@synthesize profileKey; +@synthesize sessionDescription; - (instancetype) init { if ((self = [super init])) { - self.offer = [OWSSignalServiceProtosCallMessageOffer defaultInstance]; - self.answer = [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; - self.hangup = [OWSSignalServiceProtosCallMessageHangup defaultInstance]; - self.busy = [OWSSignalServiceProtosCallMessageBusy defaultInstance]; - self.profileKey = [NSData data]; + self.id = 0L; + self.sessionDescription = @""; } return self; } -static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessageInstance = nil; +static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCallMessageAnswerInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessage class]) { - defaultOWSSignalServiceProtosCallMessageInstance = [[OWSSignalServiceProtosCallMessage alloc] init]; + if (self == [OWSSignalServiceProtosCallMessageAnswer class]) { + defaultOWSSignalServiceProtosCallMessageAnswerInstance = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageInstance; + return defaultOWSSignalServiceProtosCallMessageAnswerInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageInstance; + return defaultOWSSignalServiceProtosCallMessageAnswerInstance; } -- (NSArray *)iceUpdate { - return iceUpdateArray; -} -- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { - return [iceUpdateArray objectAtIndex:index]; -} -- (BOOL) isInitialized { - return YES; +- (BOOL) isInitialized { + return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasOffer) { - [output writeMessage:1 value:self.offer]; - } - if (self.hasAnswer) { - [output writeMessage:2 value:self.answer]; - } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { - [output writeMessage:3 value:element]; - }]; - if (self.hasHangup) { - [output writeMessage:4 value:self.hangup]; - } - if (self.hasBusy) { - [output writeMessage:5 value:self.busy]; + if (self.hasId) { + [output writeUInt64:1 value:self.id]; } - if (self.hasProfileKey) { - [output writeData:6 value:self.profileKey]; + if (self.hasSessionDescription) { + [output writeString:2 value:self.sessionDescription]; } [self.unknownFields writeToCodedOutputStream:output]; } @@ -1698,122 +1591,61 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa } size_ = 0; - if (self.hasOffer) { - size_ += computeMessageSize(1, self.offer); - } - if (self.hasAnswer) { - size_ += computeMessageSize(2, self.answer); - } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { - size_ += computeMessageSize(3, element); - }]; - if (self.hasHangup) { - size_ += computeMessageSize(4, self.hangup); - } - if (self.hasBusy) { - size_ += computeMessageSize(5, self.busy); + if (self.hasId) { + size_ += computeUInt64Size(1, self.id); } - if (self.hasProfileKey) { - size_ += computeDataSize(6, self.profileKey); + if (self.hasSessionDescription) { + size_ += computeStringSize(2, self.sessionDescription); } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageAnswerBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessage*) prototype { - return [[OWSSignalServiceProtosCallMessage builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageAnswer*) prototype { + return [[OWSSignalServiceProtosCallMessageAnswer builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageBuilder*) builder { - return [OWSSignalServiceProtosCallMessage builder]; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { + return [OWSSignalServiceProtosCallMessageAnswer builder]; } -- (OWSSignalServiceProtosCallMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessage builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasOffer) { - [output appendFormat:@"%@%@ {\n", indent, @"offer"]; - [self.offer writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; - } - if (self.hasAnswer) { - [output appendFormat:@"%@%@ {\n", indent, @"answer"]; - [self.answer writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; - } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { - [output appendFormat:@"%@%@ {\n", indent, @"iceUpdate"]; - [element writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; - }]; - if (self.hasHangup) { - [output appendFormat:@"%@%@ {\n", indent, @"hangup"]; - [self.hangup writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; - } - if (self.hasBusy) { - [output appendFormat:@"%@%@ {\n", indent, @"busy"]; - [self.busy writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; + if (self.hasId) { + [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; } - if (self.hasProfileKey) { - [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; + if (self.hasSessionDescription) { + [output appendFormat:@"%@%@: %@\n", indent, @"sessionDescription", self.sessionDescription]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasOffer) { - NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; - [self.offer storeInDictionary:messageDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"offer"]; - } - if (self.hasAnswer) { - NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; - [self.answer storeInDictionary:messageDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"answer"]; - } - for (OWSSignalServiceProtosCallMessageIceUpdate* element in self.iceUpdateArray) { - NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; - [element storeInDictionary:elementDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"iceUpdate"]; - } - if (self.hasHangup) { - NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; - [self.hangup storeInDictionary:messageDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"hangup"]; - } - if (self.hasBusy) { - NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; - [self.busy storeInDictionary:messageDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"busy"]; + if (self.hasId) { + [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; } - if (self.hasProfileKey) { - [dictionary setObject: self.profileKey forKey: @"profileKey"]; + if (self.hasSessionDescription) { + [dictionary setObject: self.sessionDescription forKey: @"sessionDescription"]; } [self.unknownFields storeInDictionary:dictionary]; } @@ -1821,234 +1653,70 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessage class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageAnswer class]]) { return NO; } - OWSSignalServiceProtosCallMessage *otherMessage = other; + OWSSignalServiceProtosCallMessageAnswer *otherMessage = other; return - self.hasOffer == otherMessage.hasOffer && - (!self.hasOffer || [self.offer isEqual:otherMessage.offer]) && - self.hasAnswer == otherMessage.hasAnswer && - (!self.hasAnswer || [self.answer isEqual:otherMessage.answer]) && - [self.iceUpdateArray isEqualToArray:otherMessage.iceUpdateArray] && - self.hasHangup == otherMessage.hasHangup && - (!self.hasHangup || [self.hangup isEqual:otherMessage.hangup]) && - self.hasBusy == otherMessage.hasBusy && - (!self.hasBusy || [self.busy isEqual:otherMessage.busy]) && - self.hasProfileKey == otherMessage.hasProfileKey && - (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && + self.hasId == otherMessage.hasId && + (!self.hasId || self.id == otherMessage.id) && + self.hasSessionDescription == otherMessage.hasSessionDescription && + (!self.hasSessionDescription || [self.sessionDescription isEqual:otherMessage.sessionDescription]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { __block NSUInteger hashCode = 7; - if (self.hasOffer) { - hashCode = hashCode * 31 + [self.offer hash]; - } - if (self.hasAnswer) { - hashCode = hashCode * 31 + [self.answer hash]; - } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { - hashCode = hashCode * 31 + [element hash]; - }]; - if (self.hasHangup) { - hashCode = hashCode * 31 + [self.hangup hash]; - } - if (self.hasBusy) { - hashCode = hashCode * 31 + [self.busy hash]; + if (self.hasId) { + hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; } - if (self.hasProfileKey) { - hashCode = hashCode * 31 + [self.profileKey hash]; + if (self.hasSessionDescription) { + hashCode = hashCode * 31 + [self.sessionDescription hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -@interface OWSSignalServiceProtosCallMessageOffer () -@property UInt64 id; -@property (strong) NSString* sessionDescription; +@interface OWSSignalServiceProtosCallMessageAnswerBuilder() +@property (strong) OWSSignalServiceProtosCallMessageAnswer* resultAnswer; @end -@implementation OWSSignalServiceProtosCallMessageOffer - -- (BOOL) hasId { - return !!hasId_; -} -- (void) setHasId:(BOOL) _value_ { - hasId_ = !!_value_; -} -@synthesize id; -- (BOOL) hasSessionDescription { - return !!hasSessionDescription_; -} -- (void) setHasSessionDescription:(BOOL) _value_ { - hasSessionDescription_ = !!_value_; -} -@synthesize sessionDescription; +@implementation OWSSignalServiceProtosCallMessageAnswerBuilder +@synthesize resultAnswer; - (instancetype) init { if ((self = [super init])) { - self.id = 0L; - self.sessionDescription = @""; + self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; } return self; } -static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCallMessageOfferInstance = nil; -+ (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageOffer class]) { - defaultOWSSignalServiceProtosCallMessageOfferInstance = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; - } +- (PBGeneratedMessage*) internalGetResult { + return resultAnswer; } -+ (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageOfferInstance; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clear { + self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; + return self; } -- (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageOfferInstance; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clone { + return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:resultAnswer]; } -- (BOOL) isInitialized { - return YES; +- (OWSSignalServiceProtosCallMessageAnswer*) defaultInstance { + return [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; } -- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasId) { - [output writeUInt64:1 value:self.id]; +- (OWSSignalServiceProtosCallMessageAnswer*) build { + [self checkInitialized]; + return [self buildPartial]; +} +- (OWSSignalServiceProtosCallMessageAnswer*) buildPartial { + OWSSignalServiceProtosCallMessageAnswer* returnMe = resultAnswer; + self.resultAnswer = nil; + return returnMe; +} +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageAnswer*) other { + if (other == [OWSSignalServiceProtosCallMessageAnswer defaultInstance]) { + return self; } - if (self.hasSessionDescription) { - [output writeString:2 value:self.sessionDescription]; - } - [self.unknownFields writeToCodedOutputStream:output]; -} -- (SInt32) serializedSize { - __block SInt32 size_ = memoizedSerializedSize; - if (size_ != -1) { - return size_; - } - - size_ = 0; - if (self.hasId) { - size_ += computeUInt64Size(1, self.id); - } - if (self.hasSessionDescription) { - size_ += computeStringSize(2, self.sessionDescription); - } - size_ += self.unknownFields.serializedSize; - memoizedSerializedSize = size_; - return size_; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data] build]; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input] build]; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input] build]; -} -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageOfferBuilder alloc] init]; -} -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageOffer*) prototype { - return [[OWSSignalServiceProtosCallMessageOffer builder] mergeFrom:prototype]; -} -- (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { - return [OWSSignalServiceProtosCallMessageOffer builder]; -} -- (OWSSignalServiceProtosCallMessageOfferBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:self]; -} -- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasId) { - [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; - } - if (self.hasSessionDescription) { - [output appendFormat:@"%@%@: %@\n", indent, @"sessionDescription", self.sessionDescription]; - } - [self.unknownFields writeDescriptionTo:output withIndent:indent]; -} -- (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasId) { - [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; - } - if (self.hasSessionDescription) { - [dictionary setObject: self.sessionDescription forKey: @"sessionDescription"]; - } - [self.unknownFields storeInDictionary:dictionary]; -} -- (BOOL) isEqual:(id)other { - if (other == self) { - return YES; - } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageOffer class]]) { - return NO; - } - OWSSignalServiceProtosCallMessageOffer *otherMessage = other; - return - self.hasId == otherMessage.hasId && - (!self.hasId || self.id == otherMessage.id) && - self.hasSessionDescription == otherMessage.hasSessionDescription && - (!self.hasSessionDescription || [self.sessionDescription isEqual:otherMessage.sessionDescription]) && - (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); -} -- (NSUInteger) hash { - __block NSUInteger hashCode = 7; - if (self.hasId) { - hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; - } - if (self.hasSessionDescription) { - hashCode = hashCode * 31 + [self.sessionDescription hash]; - } - hashCode = hashCode * 31 + [self.unknownFields hash]; - return hashCode; -} -@end - -@interface OWSSignalServiceProtosCallMessageOfferBuilder() -@property (strong) OWSSignalServiceProtosCallMessageOffer* resultOffer; -@end - -@implementation OWSSignalServiceProtosCallMessageOfferBuilder -@synthesize resultOffer; -- (instancetype) init { - if ((self = [super init])) { - self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; - } - return self; -} -- (PBGeneratedMessage*) internalGetResult { - return resultOffer; -} -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clear { - self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; - return self; -} -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clone { - return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:resultOffer]; -} -- (OWSSignalServiceProtosCallMessageOffer*) defaultInstance { - return [OWSSignalServiceProtosCallMessageOffer defaultInstance]; -} -- (OWSSignalServiceProtosCallMessageOffer*) build { - [self checkInitialized]; - return [self buildPartial]; -} -- (OWSSignalServiceProtosCallMessageOffer*) buildPartial { - OWSSignalServiceProtosCallMessageOffer* returnMe = resultOffer; - self.resultOffer = nil; - return returnMe; -} -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageOffer*) other { - if (other == [OWSSignalServiceProtosCallMessageOffer defaultInstance]) { - return self; - } - if (other.hasId) { - [self setId:other.id]; + if (other.hasId) { + [self setId:other.id]; } if (other.hasSessionDescription) { [self setSessionDescription:other.sessionDescription]; @@ -2056,10 +1724,10 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2086,45 +1754,47 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall } } - (BOOL) hasId { - return resultOffer.hasId; + return resultAnswer.hasId; } - (UInt64) id { - return resultOffer.id; + return resultAnswer.id; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setId:(UInt64) value { - resultOffer.hasId = YES; - resultOffer.id = value; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setId:(UInt64) value { + resultAnswer.hasId = YES; + resultAnswer.id = value; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearId { - resultOffer.hasId = NO; - resultOffer.id = 0L; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearId { + resultAnswer.hasId = NO; + resultAnswer.id = 0L; return self; } - (BOOL) hasSessionDescription { - return resultOffer.hasSessionDescription; + return resultAnswer.hasSessionDescription; } - (NSString*) sessionDescription { - return resultOffer.sessionDescription; + return resultAnswer.sessionDescription; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setSessionDescription:(NSString*) value { - resultOffer.hasSessionDescription = YES; - resultOffer.sessionDescription = value; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value { + resultAnswer.hasSessionDescription = YES; + resultAnswer.sessionDescription = value; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearSessionDescription { - resultOffer.hasSessionDescription = NO; - resultOffer.sessionDescription = @""; +- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearSessionDescription { + resultAnswer.hasSessionDescription = NO; + resultAnswer.sessionDescription = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessageAnswer () +@interface OWSSignalServiceProtosCallMessageIceUpdate () @property UInt64 id; -@property (strong) NSString* sessionDescription; +@property (strong) NSString* sdpMid; +@property UInt32 sdpMlineIndex; +@property (strong) NSString* sdp; @end -@implementation OWSSignalServiceProtosCallMessageAnswer +@implementation OWSSignalServiceProtosCallMessageIceUpdate - (BOOL) hasId { return !!hasId_; @@ -2133,31 +1803,47 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall hasId_ = !!_value_; } @synthesize id; -- (BOOL) hasSessionDescription { - return !!hasSessionDescription_; +- (BOOL) hasSdpMid { + return !!hasSdpMid_; } -- (void) setHasSessionDescription:(BOOL) _value_ { - hasSessionDescription_ = !!_value_; +- (void) setHasSdpMid:(BOOL) _value_ { + hasSdpMid_ = !!_value_; } -@synthesize sessionDescription; +@synthesize sdpMid; +- (BOOL) hasSdpMlineIndex { + return !!hasSdpMlineIndex_; +} +- (void) setHasSdpMlineIndex:(BOOL) _value_ { + hasSdpMlineIndex_ = !!_value_; +} +@synthesize sdpMlineIndex; +- (BOOL) hasSdp { + return !!hasSdp_; +} +- (void) setHasSdp:(BOOL) _value_ { + hasSdp_ = !!_value_; +} +@synthesize sdp; - (instancetype) init { if ((self = [super init])) { self.id = 0L; - self.sessionDescription = @""; + self.sdpMid = @""; + self.sdpMlineIndex = 0; + self.sdp = @""; } return self; } -static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCallMessageAnswerInstance = nil; +static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageAnswer class]) { - defaultOWSSignalServiceProtosCallMessageAnswerInstance = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; + if (self == [OWSSignalServiceProtosCallMessageIceUpdate class]) { + defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageAnswerInstance; + return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageAnswerInstance; + return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; } - (BOOL) isInitialized { return YES; @@ -2166,8 +1852,14 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (self.hasId) { [output writeUInt64:1 value:self.id]; } - if (self.hasSessionDescription) { - [output writeString:2 value:self.sessionDescription]; + if (self.hasSdpMid) { + [output writeString:2 value:self.sdpMid]; + } + if (self.hasSdpMlineIndex) { + [output writeUInt32:3 value:self.sdpMlineIndex]; + } + if (self.hasSdp) { + [output writeString:4 value:self.sdp]; } [self.unknownFields writeToCodedOutputStream:output]; } @@ -2181,49 +1873,61 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (self.hasId) { size_ += computeUInt64Size(1, self.id); } - if (self.hasSessionDescription) { - size_ += computeStringSize(2, self.sessionDescription); + if (self.hasSdpMid) { + size_ += computeStringSize(2, self.sdpMid); + } + if (self.hasSdpMlineIndex) { + size_ += computeUInt32Size(3, self.sdpMlineIndex); + } + if (self.hasSdp) { + size_ += computeStringSize(4, self.sdp); } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageAnswerBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageIceUpdateBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageAnswer*) prototype { - return [[OWSSignalServiceProtosCallMessageAnswer builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageIceUpdate*) prototype { + return [[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { - return [OWSSignalServiceProtosCallMessageAnswer builder]; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { + return [OWSSignalServiceProtosCallMessageIceUpdate builder]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; } - if (self.hasSessionDescription) { - [output appendFormat:@"%@%@: %@\n", indent, @"sessionDescription", self.sessionDescription]; + if (self.hasSdpMid) { + [output appendFormat:@"%@%@: %@\n", indent, @"sdpMid", self.sdpMid]; + } + if (self.hasSdpMlineIndex) { + [output appendFormat:@"%@%@: %@\n", indent, @"sdpMlineIndex", [NSNumber numberWithInteger:self.sdpMlineIndex]]; + } + if (self.hasSdp) { + [output appendFormat:@"%@%@: %@\n", indent, @"sdp", self.sdp]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } @@ -2231,8 +1935,14 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (self.hasId) { [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; } - if (self.hasSessionDescription) { - [dictionary setObject: self.sessionDescription forKey: @"sessionDescription"]; + if (self.hasSdpMid) { + [dictionary setObject: self.sdpMid forKey: @"sdpMid"]; + } + if (self.hasSdpMlineIndex) { + [dictionary setObject: [NSNumber numberWithInteger:self.sdpMlineIndex] forKey: @"sdpMlineIndex"]; + } + if (self.hasSdp) { + [dictionary setObject: self.sdp forKey: @"sdp"]; } [self.unknownFields storeInDictionary:dictionary]; } @@ -2240,15 +1950,19 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageAnswer class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageIceUpdate class]]) { return NO; } - OWSSignalServiceProtosCallMessageAnswer *otherMessage = other; + OWSSignalServiceProtosCallMessageIceUpdate *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && - self.hasSessionDescription == otherMessage.hasSessionDescription && - (!self.hasSessionDescription || [self.sessionDescription isEqual:otherMessage.sessionDescription]) && + self.hasSdpMid == otherMessage.hasSdpMid && + (!self.hasSdpMid || [self.sdpMid isEqual:otherMessage.sdpMid]) && + self.hasSdpMlineIndex == otherMessage.hasSdpMlineIndex && + (!self.hasSdpMlineIndex || self.sdpMlineIndex == otherMessage.sdpMlineIndex) && + self.hasSdp == otherMessage.hasSdp && + (!self.hasSdp || [self.sdp isEqual:otherMessage.sdp]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { @@ -2256,65 +1970,77 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (self.hasId) { hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; } - if (self.hasSessionDescription) { - hashCode = hashCode * 31 + [self.sessionDescription hash]; + if (self.hasSdpMid) { + hashCode = hashCode * 31 + [self.sdpMid hash]; + } + if (self.hasSdpMlineIndex) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.sdpMlineIndex] hash]; + } + if (self.hasSdp) { + hashCode = hashCode * 31 + [self.sdp hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -@interface OWSSignalServiceProtosCallMessageAnswerBuilder() -@property (strong) OWSSignalServiceProtosCallMessageAnswer* resultAnswer; +@interface OWSSignalServiceProtosCallMessageIceUpdateBuilder() +@property (strong) OWSSignalServiceProtosCallMessageIceUpdate* resultIceUpdate; @end -@implementation OWSSignalServiceProtosCallMessageAnswerBuilder -@synthesize resultAnswer; +@implementation OWSSignalServiceProtosCallMessageIceUpdateBuilder +@synthesize resultIceUpdate; - (instancetype) init { if ((self = [super init])) { - self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; + self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { - return resultAnswer; + return resultIceUpdate; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clear { - self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clear { + self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clone { - return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:resultAnswer]; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clone { + return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:resultIceUpdate]; } -- (OWSSignalServiceProtosCallMessageAnswer*) defaultInstance { - return [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; +- (OWSSignalServiceProtosCallMessageIceUpdate*) defaultInstance { + return [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]; } -- (OWSSignalServiceProtosCallMessageAnswer*) build { +- (OWSSignalServiceProtosCallMessageIceUpdate*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageAnswer*) buildPartial { - OWSSignalServiceProtosCallMessageAnswer* returnMe = resultAnswer; - self.resultAnswer = nil; +- (OWSSignalServiceProtosCallMessageIceUpdate*) buildPartial { + OWSSignalServiceProtosCallMessageIceUpdate* returnMe = resultIceUpdate; + self.resultIceUpdate = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageAnswer*) other { - if (other == [OWSSignalServiceProtosCallMessageAnswer defaultInstance]) { +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageIceUpdate*) other { + if (other == [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]) { return self; } if (other.hasId) { [self setId:other.id]; } - if (other.hasSessionDescription) { - [self setSessionDescription:other.sessionDescription]; + if (other.hasSdpMid) { + [self setSdpMid:other.sdpMid]; + } + if (other.hasSdpMlineIndex) { + [self setSdpMlineIndex:other.sdpMlineIndex]; + } + if (other.hasSdp) { + [self setSdp:other.sdp]; } [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2334,54 +2060,91 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal break; } case 18: { - [self setSessionDescription:[input readString]]; + [self setSdpMid:[input readString]]; + break; + } + case 24: { + [self setSdpMlineIndex:[input readUInt32]]; + break; + } + case 34: { + [self setSdp:[input readString]]; break; } } } } - (BOOL) hasId { - return resultAnswer.hasId; + return resultIceUpdate.hasId; } - (UInt64) id { - return resultAnswer.id; + return resultIceUpdate.id; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setId:(UInt64) value { - resultAnswer.hasId = YES; - resultAnswer.id = value; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setId:(UInt64) value { + resultIceUpdate.hasId = YES; + resultIceUpdate.id = value; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearId { - resultAnswer.hasId = NO; - resultAnswer.id = 0L; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearId { + resultIceUpdate.hasId = NO; + resultIceUpdate.id = 0L; return self; } -- (BOOL) hasSessionDescription { - return resultAnswer.hasSessionDescription; +- (BOOL) hasSdpMid { + return resultIceUpdate.hasSdpMid; } -- (NSString*) sessionDescription { - return resultAnswer.sessionDescription; +- (NSString*) sdpMid { + return resultIceUpdate.sdpMid; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value { - resultAnswer.hasSessionDescription = YES; - resultAnswer.sessionDescription = value; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value { + resultIceUpdate.hasSdpMid = YES; + resultIceUpdate.sdpMid = value; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearSessionDescription { - resultAnswer.hasSessionDescription = NO; - resultAnswer.sessionDescription = @""; +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMid { + resultIceUpdate.hasSdpMid = NO; + resultIceUpdate.sdpMid = @""; + return self; +} +- (BOOL) hasSdpMlineIndex { + return resultIceUpdate.hasSdpMlineIndex; +} +- (UInt32) sdpMlineIndex { + return resultIceUpdate.sdpMlineIndex; +} +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value { + resultIceUpdate.hasSdpMlineIndex = YES; + resultIceUpdate.sdpMlineIndex = value; + return self; +} +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMlineIndex { + resultIceUpdate.hasSdpMlineIndex = NO; + resultIceUpdate.sdpMlineIndex = 0; + return self; +} +- (BOOL) hasSdp { + return resultIceUpdate.hasSdp; +} +- (NSString*) sdp { + return resultIceUpdate.sdp; +} +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdp:(NSString*) value { + resultIceUpdate.hasSdp = YES; + resultIceUpdate.sdp = value; + return self; +} +- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdp { + resultIceUpdate.hasSdp = NO; + resultIceUpdate.sdp = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessageIceUpdate () +@interface OWSSignalServiceProtosCallMessageBusy () @property UInt64 id; -@property (strong) NSString* sdpMid; -@property UInt32 sdpMlineIndex; -@property (strong) NSString* sdp; @end -@implementation OWSSignalServiceProtosCallMessageIceUpdate +@implementation OWSSignalServiceProtosCallMessageBusy - (BOOL) hasId { return !!hasId_; @@ -2390,47 +2153,23 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal hasId_ = !!_value_; } @synthesize id; -- (BOOL) hasSdpMid { - return !!hasSdpMid_; -} -- (void) setHasSdpMid:(BOOL) _value_ { - hasSdpMid_ = !!_value_; -} -@synthesize sdpMid; -- (BOOL) hasSdpMlineIndex { - return !!hasSdpMlineIndex_; -} -- (void) setHasSdpMlineIndex:(BOOL) _value_ { - hasSdpMlineIndex_ = !!_value_; -} -@synthesize sdpMlineIndex; -- (BOOL) hasSdp { - return !!hasSdp_; -} -- (void) setHasSdp:(BOOL) _value_ { - hasSdp_ = !!_value_; -} -@synthesize sdp; - (instancetype) init { if ((self = [super init])) { self.id = 0L; - self.sdpMid = @""; - self.sdpMlineIndex = 0; - self.sdp = @""; } return self; } -static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = nil; +static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallMessageBusyInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageIceUpdate class]) { - defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; + if (self == [OWSSignalServiceProtosCallMessageBusy class]) { + defaultOWSSignalServiceProtosCallMessageBusyInstance = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; + return defaultOWSSignalServiceProtosCallMessageBusyInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; + return defaultOWSSignalServiceProtosCallMessageBusyInstance; } - (BOOL) isInitialized { return YES; @@ -2439,15 +2178,6 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos if (self.hasId) { [output writeUInt64:1 value:self.id]; } - if (self.hasSdpMid) { - [output writeString:2 value:self.sdpMid]; - } - if (self.hasSdpMlineIndex) { - [output writeUInt32:3 value:self.sdpMlineIndex]; - } - if (self.hasSdp) { - [output writeString:4 value:self.sdp]; - } [self.unknownFields writeToCodedOutputStream:output]; } - (SInt32) serializedSize { @@ -2460,96 +2190,63 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos if (self.hasId) { size_ += computeUInt64Size(1, self.id); } - if (self.hasSdpMid) { - size_ += computeStringSize(2, self.sdpMid); - } - if (self.hasSdpMlineIndex) { - size_ += computeUInt32Size(3, self.sdpMlineIndex); - } - if (self.hasSdp) { - size_ += computeStringSize(4, self.sdp); - } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data] build]; -} -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageIceUpdateBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageIceUpdate*) prototype { - return [[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageBusyBuilder alloc] init]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { - return [OWSSignalServiceProtosCallMessageIceUpdate builder]; ++ (OWSSignalServiceProtosCallMessageBusyBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageBusy*) prototype { + return [[OWSSignalServiceProtosCallMessageBusy builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { + return [OWSSignalServiceProtosCallMessageBusy builder]; +} +- (OWSSignalServiceProtosCallMessageBusyBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; } - if (self.hasSdpMid) { - [output appendFormat:@"%@%@: %@\n", indent, @"sdpMid", self.sdpMid]; - } - if (self.hasSdpMlineIndex) { - [output appendFormat:@"%@%@: %@\n", indent, @"sdpMlineIndex", [NSNumber numberWithInteger:self.sdpMlineIndex]]; - } - if (self.hasSdp) { - [output appendFormat:@"%@%@: %@\n", indent, @"sdp", self.sdp]; - } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { if (self.hasId) { [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; } - if (self.hasSdpMid) { - [dictionary setObject: self.sdpMid forKey: @"sdpMid"]; - } - if (self.hasSdpMlineIndex) { - [dictionary setObject: [NSNumber numberWithInteger:self.sdpMlineIndex] forKey: @"sdpMlineIndex"]; - } - if (self.hasSdp) { - [dictionary setObject: self.sdp forKey: @"sdp"]; - } [self.unknownFields storeInDictionary:dictionary]; } - (BOOL) isEqual:(id)other { if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageIceUpdate class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageBusy class]]) { return NO; } - OWSSignalServiceProtosCallMessageIceUpdate *otherMessage = other; + OWSSignalServiceProtosCallMessageBusy *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && - self.hasSdpMid == otherMessage.hasSdpMid && - (!self.hasSdpMid || [self.sdpMid isEqual:otherMessage.sdpMid]) && - self.hasSdpMlineIndex == otherMessage.hasSdpMlineIndex && - (!self.hasSdpMlineIndex || self.sdpMlineIndex == otherMessage.sdpMlineIndex) && - self.hasSdp == otherMessage.hasSdp && - (!self.hasSdp || [self.sdp isEqual:otherMessage.sdp]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { @@ -2557,77 +2254,59 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos if (self.hasId) { hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; } - if (self.hasSdpMid) { - hashCode = hashCode * 31 + [self.sdpMid hash]; - } - if (self.hasSdpMlineIndex) { - hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.sdpMlineIndex] hash]; - } - if (self.hasSdp) { - hashCode = hashCode * 31 + [self.sdp hash]; - } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -@interface OWSSignalServiceProtosCallMessageIceUpdateBuilder() -@property (strong) OWSSignalServiceProtosCallMessageIceUpdate* resultIceUpdate; +@interface OWSSignalServiceProtosCallMessageBusyBuilder() +@property (strong) OWSSignalServiceProtosCallMessageBusy* resultBusy; @end -@implementation OWSSignalServiceProtosCallMessageIceUpdateBuilder -@synthesize resultIceUpdate; +@implementation OWSSignalServiceProtosCallMessageBusyBuilder +@synthesize resultBusy; - (instancetype) init { if ((self = [super init])) { - self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; + self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { - return resultIceUpdate; + return resultBusy; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clear { - self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; +- (OWSSignalServiceProtosCallMessageBusyBuilder*) clear { + self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clone { - return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:resultIceUpdate]; +- (OWSSignalServiceProtosCallMessageBusyBuilder*) clone { + return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:resultBusy]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) defaultInstance { - return [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]; +- (OWSSignalServiceProtosCallMessageBusy*) defaultInstance { + return [OWSSignalServiceProtosCallMessageBusy defaultInstance]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) build { +- (OWSSignalServiceProtosCallMessageBusy*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) buildPartial { - OWSSignalServiceProtosCallMessageIceUpdate* returnMe = resultIceUpdate; - self.resultIceUpdate = nil; +- (OWSSignalServiceProtosCallMessageBusy*) buildPartial { + OWSSignalServiceProtosCallMessageBusy* returnMe = resultBusy; + self.resultBusy = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageIceUpdate*) other { - if (other == [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]) { +- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageBusy*) other { + if (other == [OWSSignalServiceProtosCallMessageBusy defaultInstance]) { return self; } if (other.hasId) { [self setId:other.id]; } - if (other.hasSdpMid) { - [self setSdpMid:other.sdpMid]; - } - if (other.hasSdpMlineIndex) { - [self setSdpMlineIndex:other.sdpMlineIndex]; - } - if (other.hasSdp) { - [self setSdp:other.sdp]; - } [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2646,92 +2325,32 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos [self setId:[input readUInt64]]; break; } - case 18: { - [self setSdpMid:[input readString]]; - break; - } - case 24: { - [self setSdpMlineIndex:[input readUInt32]]; - break; - } - case 34: { - [self setSdp:[input readString]]; - break; - } } } } - (BOOL) hasId { - return resultIceUpdate.hasId; + return resultBusy.hasId; } - (UInt64) id { - return resultIceUpdate.id; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setId:(UInt64) value { - resultIceUpdate.hasId = YES; - resultIceUpdate.id = value; - return self; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearId { - resultIceUpdate.hasId = NO; - resultIceUpdate.id = 0L; - return self; -} -- (BOOL) hasSdpMid { - return resultIceUpdate.hasSdpMid; -} -- (NSString*) sdpMid { - return resultIceUpdate.sdpMid; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value { - resultIceUpdate.hasSdpMid = YES; - resultIceUpdate.sdpMid = value; - return self; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMid { - resultIceUpdate.hasSdpMid = NO; - resultIceUpdate.sdpMid = @""; - return self; -} -- (BOOL) hasSdpMlineIndex { - return resultIceUpdate.hasSdpMlineIndex; -} -- (UInt32) sdpMlineIndex { - return resultIceUpdate.sdpMlineIndex; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value { - resultIceUpdate.hasSdpMlineIndex = YES; - resultIceUpdate.sdpMlineIndex = value; - return self; -} -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMlineIndex { - resultIceUpdate.hasSdpMlineIndex = NO; - resultIceUpdate.sdpMlineIndex = 0; - return self; -} -- (BOOL) hasSdp { - return resultIceUpdate.hasSdp; -} -- (NSString*) sdp { - return resultIceUpdate.sdp; + return resultBusy.id; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdp:(NSString*) value { - resultIceUpdate.hasSdp = YES; - resultIceUpdate.sdp = value; +- (OWSSignalServiceProtosCallMessageBusyBuilder*) setId:(UInt64) value { + resultBusy.hasId = YES; + resultBusy.id = value; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdp { - resultIceUpdate.hasSdp = NO; - resultIceUpdate.sdp = @""; +- (OWSSignalServiceProtosCallMessageBusyBuilder*) clearId { + resultBusy.hasId = NO; + resultBusy.id = 0L; return self; } @end -@interface OWSSignalServiceProtosCallMessageBusy () +@interface OWSSignalServiceProtosCallMessageHangup () @property UInt64 id; @end -@implementation OWSSignalServiceProtosCallMessageBusy +@implementation OWSSignalServiceProtosCallMessageHangup - (BOOL) hasId { return !!hasId_; @@ -2746,17 +2365,17 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos } return self; } -static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallMessageBusyInstance = nil; +static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCallMessageHangupInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageBusy class]) { - defaultOWSSignalServiceProtosCallMessageBusyInstance = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; + if (self == [OWSSignalServiceProtosCallMessageHangup class]) { + defaultOWSSignalServiceProtosCallMessageHangupInstance = [[OWSSignalServiceProtosCallMessageHangup alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageBusyInstance; + return defaultOWSSignalServiceProtosCallMessageHangupInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageBusyInstance; + return defaultOWSSignalServiceProtosCallMessageHangupInstance; } - (BOOL) isInitialized { return YES; @@ -2781,35 +2400,35 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageBusyBuilder alloc] init]; ++ (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { + return [[OWSSignalServiceProtosCallMessageHangupBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageBusy*) prototype { - return [[OWSSignalServiceProtosCallMessageBusy builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosCallMessageHangupBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageHangup*) prototype { + return [[OWSSignalServiceProtosCallMessageHangup builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { - return [OWSSignalServiceProtosCallMessageBusy builder]; +- (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { + return [OWSSignalServiceProtosCallMessageHangup builder]; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:self]; +- (OWSSignalServiceProtosCallMessageHangupBuilder*) toBuilder { + return [OWSSignalServiceProtosCallMessageHangup builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -2827,216 +2446,10 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageBusy class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageHangup class]]) { return NO; } - OWSSignalServiceProtosCallMessageBusy *otherMessage = other; - return - self.hasId == otherMessage.hasId && - (!self.hasId || self.id == otherMessage.id) && - (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); -} -- (NSUInteger) hash { - __block NSUInteger hashCode = 7; - if (self.hasId) { - hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; - } - hashCode = hashCode * 31 + [self.unknownFields hash]; - return hashCode; -} -@end - -@interface OWSSignalServiceProtosCallMessageBusyBuilder() -@property (strong) OWSSignalServiceProtosCallMessageBusy* resultBusy; -@end - -@implementation OWSSignalServiceProtosCallMessageBusyBuilder -@synthesize resultBusy; -- (instancetype) init { - if ((self = [super init])) { - self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; - } - return self; -} -- (PBGeneratedMessage*) internalGetResult { - return resultBusy; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clear { - self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; - return self; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clone { - return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:resultBusy]; -} -- (OWSSignalServiceProtosCallMessageBusy*) defaultInstance { - return [OWSSignalServiceProtosCallMessageBusy defaultInstance]; -} -- (OWSSignalServiceProtosCallMessageBusy*) build { - [self checkInitialized]; - return [self buildPartial]; -} -- (OWSSignalServiceProtosCallMessageBusy*) buildPartial { - OWSSignalServiceProtosCallMessageBusy* returnMe = resultBusy; - self.resultBusy = nil; - return returnMe; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageBusy*) other { - if (other == [OWSSignalServiceProtosCallMessageBusy defaultInstance]) { - return self; - } - if (other.hasId) { - [self setId:other.id]; - } - [self mergeUnknownFields:other.unknownFields]; - return self; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { - return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; - while (YES) { - SInt32 tag = [input readTag]; - switch (tag) { - case 0: - [self setUnknownFields:[unknownFields build]]; - return self; - default: { - if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { - [self setUnknownFields:[unknownFields build]]; - return self; - } - break; - } - case 8: { - [self setId:[input readUInt64]]; - break; - } - } - } -} -- (BOOL) hasId { - return resultBusy.hasId; -} -- (UInt64) id { - return resultBusy.id; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) setId:(UInt64) value { - resultBusy.hasId = YES; - resultBusy.id = value; - return self; -} -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clearId { - resultBusy.hasId = NO; - resultBusy.id = 0L; - return self; -} -@end - -@interface OWSSignalServiceProtosCallMessageHangup () -@property UInt64 id; -@end - -@implementation OWSSignalServiceProtosCallMessageHangup - -- (BOOL) hasId { - return !!hasId_; -} -- (void) setHasId:(BOOL) _value_ { - hasId_ = !!_value_; -} -@synthesize id; -- (instancetype) init { - if ((self = [super init])) { - self.id = 0L; - } - return self; -} -static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCallMessageHangupInstance = nil; -+ (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageHangup class]) { - defaultOWSSignalServiceProtosCallMessageHangupInstance = [[OWSSignalServiceProtosCallMessageHangup alloc] init]; - } -} -+ (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageHangupInstance; -} -- (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageHangupInstance; -} -- (BOOL) isInitialized { - return YES; -} -- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasId) { - [output writeUInt64:1 value:self.id]; - } - [self.unknownFields writeToCodedOutputStream:output]; -} -- (SInt32) serializedSize { - __block SInt32 size_ = memoizedSerializedSize; - if (size_ != -1) { - return size_; - } - - size_ = 0; - if (self.hasId) { - size_ += computeUInt64Size(1, self.id); - } - size_ += self.unknownFields.serializedSize; - memoizedSerializedSize = size_; - return size_; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data] build]; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input] build]; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input] build]; -} -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; -} -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageHangupBuilder alloc] init]; -} -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageHangup*) prototype { - return [[OWSSignalServiceProtosCallMessageHangup builder] mergeFrom:prototype]; -} -- (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { - return [OWSSignalServiceProtosCallMessageHangup builder]; -} -- (OWSSignalServiceProtosCallMessageHangupBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageHangup builderWithPrototype:self]; -} -- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasId) { - [output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; - } - [self.unknownFields writeDescriptionTo:output withIndent:indent]; -} -- (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasId) { - [dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; - } - [self.unknownFields storeInDictionary:dictionary]; -} -- (BOOL) isEqual:(id)other { - if (other == self) { - return YES; - } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageHangup class]]) { - return NO; - } - OWSSignalServiceProtosCallMessageHangup *otherMessage = other; + OWSSignalServiceProtosCallMessageHangup *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -3465,66 +2878,758 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal - (BOOL) hasExpireTimer { return !!hasExpireTimer_; } -- (void) setHasExpireTimer:(BOOL) _value_ { - hasExpireTimer_ = !!_value_; +- (void) setHasExpireTimer:(BOOL) _value_ { + hasExpireTimer_ = !!_value_; +} +@synthesize expireTimer; +- (BOOL) hasProfileKey { + return !!hasProfileKey_; +} +- (void) setHasProfileKey:(BOOL) _value_ { + hasProfileKey_ = !!_value_; +} +@synthesize profileKey; +- (instancetype) init { + if ((self = [super init])) { + self.body = @""; + self.group = [OWSSignalServiceProtosGroupContext defaultInstance]; + self.flags = 0; + self.expireTimer = 0; + self.profileKey = [NSData data]; + } + return self; +} +static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessageInstance = nil; ++ (void) initialize { + if (self == [OWSSignalServiceProtosDataMessage class]) { + defaultOWSSignalServiceProtosDataMessageInstance = [[OWSSignalServiceProtosDataMessage alloc] init]; + } +} ++ (instancetype) defaultInstance { + return defaultOWSSignalServiceProtosDataMessageInstance; +} +- (instancetype) defaultInstance { + return defaultOWSSignalServiceProtosDataMessageInstance; +} +- (NSArray *)attachments { + return attachmentsArray; +} +- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { + return [attachmentsArray objectAtIndex:index]; +} +- (BOOL) isInitialized { + return YES; +} +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { + if (self.hasBody) { + [output writeString:1 value:self.body]; + } + [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + [output writeMessage:2 value:element]; + }]; + if (self.hasGroup) { + [output writeMessage:3 value:self.group]; + } + if (self.hasFlags) { + [output writeUInt32:4 value:self.flags]; + } + if (self.hasExpireTimer) { + [output writeUInt32:5 value:self.expireTimer]; + } + if (self.hasProfileKey) { + [output writeData:6 value:self.profileKey]; + } + [self.unknownFields writeToCodedOutputStream:output]; +} +- (SInt32) serializedSize { + __block SInt32 size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; + } + + size_ = 0; + if (self.hasBody) { + size_ += computeStringSize(1, self.body); + } + [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + size_ += computeMessageSize(2, element); + }]; + if (self.hasGroup) { + size_ += computeMessageSize(3, self.group); + } + if (self.hasFlags) { + size_ += computeUInt32Size(4, self.flags); + } + if (self.hasExpireTimer) { + size_ += computeUInt32Size(5, self.expireTimer); + } + if (self.hasProfileKey) { + size_ += computeDataSize(6, self.profileKey); + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data] build]; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input] build]; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input] build]; +} ++ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosDataMessageBuilder*) builder { + return [[OWSSignalServiceProtosDataMessageBuilder alloc] init]; +} ++ (OWSSignalServiceProtosDataMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessage*) prototype { + return [[OWSSignalServiceProtosDataMessage builder] mergeFrom:prototype]; +} +- (OWSSignalServiceProtosDataMessageBuilder*) builder { + return [OWSSignalServiceProtosDataMessage builder]; +} +- (OWSSignalServiceProtosDataMessageBuilder*) toBuilder { + return [OWSSignalServiceProtosDataMessage builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasBody) { + [output appendFormat:@"%@%@: %@\n", indent, @"body", self.body]; + } + [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + [output appendFormat:@"%@%@ {\n", indent, @"attachments"]; + [element writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + }]; + if (self.hasGroup) { + [output appendFormat:@"%@%@ {\n", indent, @"group"]; + [self.group writeDescriptionTo:output + withIndent:[NSString stringWithFormat:@"%@ ", indent]]; + [output appendFormat:@"%@}\n", indent]; + } + if (self.hasFlags) { + [output appendFormat:@"%@%@: %@\n", indent, @"flags", [NSNumber numberWithInteger:self.flags]]; + } + if (self.hasExpireTimer) { + [output appendFormat:@"%@%@: %@\n", indent, @"expireTimer", [NSNumber numberWithInteger:self.expireTimer]]; + } + if (self.hasProfileKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (void) storeInDictionary:(NSMutableDictionary *)dictionary { + if (self.hasBody) { + [dictionary setObject: self.body forKey: @"body"]; + } + for (OWSSignalServiceProtosAttachmentPointer* element in self.attachmentsArray) { + NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; + [element storeInDictionary:elementDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"attachments"]; + } + if (self.hasGroup) { + NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; + [self.group storeInDictionary:messageDictionary]; + [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"group"]; + } + if (self.hasFlags) { + [dictionary setObject: [NSNumber numberWithInteger:self.flags] forKey: @"flags"]; + } + if (self.hasExpireTimer) { + [dictionary setObject: [NSNumber numberWithInteger:self.expireTimer] forKey: @"expireTimer"]; + } + if (self.hasProfileKey) { + [dictionary setObject: self.profileKey forKey: @"profileKey"]; + } + [self.unknownFields storeInDictionary:dictionary]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[OWSSignalServiceProtosDataMessage class]]) { + return NO; + } + OWSSignalServiceProtosDataMessage *otherMessage = other; + return + self.hasBody == otherMessage.hasBody && + (!self.hasBody || [self.body isEqual:otherMessage.body]) && + [self.attachmentsArray isEqualToArray:otherMessage.attachmentsArray] && + self.hasGroup == otherMessage.hasGroup && + (!self.hasGroup || [self.group isEqual:otherMessage.group]) && + self.hasFlags == otherMessage.hasFlags && + (!self.hasFlags || self.flags == otherMessage.flags) && + self.hasExpireTimer == otherMessage.hasExpireTimer && + (!self.hasExpireTimer || self.expireTimer == otherMessage.expireTimer) && + self.hasProfileKey == otherMessage.hasProfileKey && + (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + __block NSUInteger hashCode = 7; + if (self.hasBody) { + hashCode = hashCode * 31 + [self.body hash]; + } + [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + hashCode = hashCode * 31 + [element hash]; + }]; + if (self.hasGroup) { + hashCode = hashCode * 31 + [self.group hash]; + } + if (self.hasFlags) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.flags] hash]; + } + if (self.hasExpireTimer) { + hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.expireTimer] hash]; + } + if (self.hasProfileKey) { + hashCode = hashCode * 31 + [self.profileKey hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} +@end + +BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value) { + switch (value) { + case OWSSignalServiceProtosDataMessageFlagsEndSession: + case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: + return YES; + default: + return NO; + } +} +NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value) { + switch (value) { + case OWSSignalServiceProtosDataMessageFlagsEndSession: + return @"OWSSignalServiceProtosDataMessageFlagsEndSession"; + case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: + return @"OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate"; + default: + return nil; + } +} + +@interface OWSSignalServiceProtosDataMessageBuilder() +@property (strong) OWSSignalServiceProtosDataMessage* resultDataMessage; +@end + +@implementation OWSSignalServiceProtosDataMessageBuilder +@synthesize resultDataMessage; +- (instancetype) init { + if ((self = [super init])) { + self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; + } + return self; +} +- (PBGeneratedMessage*) internalGetResult { + return resultDataMessage; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clear { + self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clone { + return [OWSSignalServiceProtosDataMessage builderWithPrototype:resultDataMessage]; +} +- (OWSSignalServiceProtosDataMessage*) defaultInstance { + return [OWSSignalServiceProtosDataMessage defaultInstance]; +} +- (OWSSignalServiceProtosDataMessage*) build { + [self checkInitialized]; + return [self buildPartial]; +} +- (OWSSignalServiceProtosDataMessage*) buildPartial { + OWSSignalServiceProtosDataMessage* returnMe = resultDataMessage; + self.resultDataMessage = nil; + return returnMe; +} +- (OWSSignalServiceProtosDataMessageBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessage*) other { + if (other == [OWSSignalServiceProtosDataMessage defaultInstance]) { + return self; + } + if (other.hasBody) { + [self setBody:other.body]; + } + if (other.attachmentsArray.count > 0) { + if (resultDataMessage.attachmentsArray == nil) { + resultDataMessage.attachmentsArray = [[NSMutableArray alloc] initWithArray:other.attachmentsArray]; + } else { + [resultDataMessage.attachmentsArray addObjectsFromArray:other.attachmentsArray]; + } + } + if (other.hasGroup) { + [self mergeGroup:other.group]; + } + if (other.hasFlags) { + [self setFlags:other.flags]; + } + if (other.hasExpireTimer) { + [self setExpireTimer:other.expireTimer]; + } + if (other.hasProfileKey) { + [self setProfileKey:other.profileKey]; + } + [self mergeUnknownFields:other.unknownFields]; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { + return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; +} +- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; + while (YES) { + SInt32 tag = [input readTag]; + switch (tag) { + case 0: + [self setUnknownFields:[unknownFields build]]; + return self; + default: { + if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { + [self setUnknownFields:[unknownFields build]]; + return self; + } + break; + } + case 10: { + [self setBody:[input readString]]; + break; + } + case 18: { + OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + [input readMessage:subBuilder extensionRegistry:extensionRegistry]; + [self addAttachments:[subBuilder buildPartial]]; + break; + } + case 26: { + OWSSignalServiceProtosGroupContextBuilder* subBuilder = [OWSSignalServiceProtosGroupContext builder]; + if (self.hasGroup) { + [subBuilder mergeFrom:self.group]; + } + [input readMessage:subBuilder extensionRegistry:extensionRegistry]; + [self setGroup:[subBuilder buildPartial]]; + break; + } + case 32: { + [self setFlags:[input readUInt32]]; + break; + } + case 40: { + [self setExpireTimer:[input readUInt32]]; + break; + } + case 50: { + [self setProfileKey:[input readData]]; + break; + } + } + } +} +- (BOOL) hasBody { + return resultDataMessage.hasBody; +} +- (NSString*) body { + return resultDataMessage.body; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setBody:(NSString*) value { + resultDataMessage.hasBody = YES; + resultDataMessage.body = value; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clearBody { + resultDataMessage.hasBody = NO; + resultDataMessage.body = @""; + return self; +} +- (NSMutableArray *)attachments { + return resultDataMessage.attachmentsArray; +} +- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { + return [resultDataMessage attachmentsAtIndex:index]; +} +- (OWSSignalServiceProtosDataMessageBuilder *)addAttachments:(OWSSignalServiceProtosAttachmentPointer*)value { + if (resultDataMessage.attachmentsArray == nil) { + resultDataMessage.attachmentsArray = [[NSMutableArray alloc]init]; + } + [resultDataMessage.attachmentsArray addObject:value]; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder *)setAttachmentsArray:(NSArray *)array { + resultDataMessage.attachmentsArray = [[NSMutableArray alloc]initWithArray:array]; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder *)clearAttachments { + resultDataMessage.attachmentsArray = nil; + return self; +} +- (BOOL) hasGroup { + return resultDataMessage.hasGroup; +} +- (OWSSignalServiceProtosGroupContext*) group { + return resultDataMessage.group; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setGroup:(OWSSignalServiceProtosGroupContext*) value { + resultDataMessage.hasGroup = YES; + resultDataMessage.group = value; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setGroupBuilder:(OWSSignalServiceProtosGroupContextBuilder*) builderForValue { + return [self setGroup:[builderForValue build]]; +} +- (OWSSignalServiceProtosDataMessageBuilder*) mergeGroup:(OWSSignalServiceProtosGroupContext*) value { + if (resultDataMessage.hasGroup && + resultDataMessage.group != [OWSSignalServiceProtosGroupContext defaultInstance]) { + resultDataMessage.group = + [[[OWSSignalServiceProtosGroupContext builderWithPrototype:resultDataMessage.group] mergeFrom:value] buildPartial]; + } else { + resultDataMessage.group = value; + } + resultDataMessage.hasGroup = YES; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clearGroup { + resultDataMessage.hasGroup = NO; + resultDataMessage.group = [OWSSignalServiceProtosGroupContext defaultInstance]; + return self; +} +- (BOOL) hasFlags { + return resultDataMessage.hasFlags; +} +- (UInt32) flags { + return resultDataMessage.flags; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setFlags:(UInt32) value { + resultDataMessage.hasFlags = YES; + resultDataMessage.flags = value; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clearFlags { + resultDataMessage.hasFlags = NO; + resultDataMessage.flags = 0; + return self; +} +- (BOOL) hasExpireTimer { + return resultDataMessage.hasExpireTimer; +} +- (UInt32) expireTimer { + return resultDataMessage.expireTimer; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setExpireTimer:(UInt32) value { + resultDataMessage.hasExpireTimer = YES; + resultDataMessage.expireTimer = value; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clearExpireTimer { + resultDataMessage.hasExpireTimer = NO; + resultDataMessage.expireTimer = 0; + return self; +} +- (BOOL) hasProfileKey { + return resultDataMessage.hasProfileKey; +} +- (NSData*) profileKey { + return resultDataMessage.profileKey; +} +- (OWSSignalServiceProtosDataMessageBuilder*) setProfileKey:(NSData*) value { + resultDataMessage.hasProfileKey = YES; + resultDataMessage.profileKey = value; + return self; +} +- (OWSSignalServiceProtosDataMessageBuilder*) clearProfileKey { + resultDataMessage.hasProfileKey = NO; + resultDataMessage.profileKey = [NSData data]; + return self; +} +@end + +@interface OWSSignalServiceProtosNullMessage () +@property (strong) NSData* padding; +@end + +@implementation OWSSignalServiceProtosNullMessage + +- (BOOL) hasPadding { + return !!hasPadding_; +} +- (void) setHasPadding:(BOOL) _value_ { + hasPadding_ = !!_value_; +} +@synthesize padding; +- (instancetype) init { + if ((self = [super init])) { + self.padding = [NSData data]; + } + return self; +} +static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessageInstance = nil; ++ (void) initialize { + if (self == [OWSSignalServiceProtosNullMessage class]) { + defaultOWSSignalServiceProtosNullMessageInstance = [[OWSSignalServiceProtosNullMessage alloc] init]; + } +} ++ (instancetype) defaultInstance { + return defaultOWSSignalServiceProtosNullMessageInstance; +} +- (instancetype) defaultInstance { + return defaultOWSSignalServiceProtosNullMessageInstance; +} +- (BOOL) isInitialized { + return YES; +} +- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { + if (self.hasPadding) { + [output writeData:1 value:self.padding]; + } + [self.unknownFields writeToCodedOutputStream:output]; +} +- (SInt32) serializedSize { + __block SInt32 size_ = memoizedSerializedSize; + if (size_ != -1) { + return size_; + } + + size_ = 0; + if (self.hasPadding) { + size_ += computeDataSize(1, self.padding); + } + size_ += self.unknownFields.serializedSize; + memoizedSerializedSize = size_; + return size_; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data] build]; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input] build]; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input] build]; +} ++ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; +} ++ (OWSSignalServiceProtosNullMessageBuilder*) builder { + return [[OWSSignalServiceProtosNullMessageBuilder alloc] init]; +} ++ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype { + return [[OWSSignalServiceProtosNullMessage builder] mergeFrom:prototype]; +} +- (OWSSignalServiceProtosNullMessageBuilder*) builder { + return [OWSSignalServiceProtosNullMessage builder]; +} +- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder { + return [OWSSignalServiceProtosNullMessage builderWithPrototype:self]; +} +- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { + if (self.hasPadding) { + [output appendFormat:@"%@%@: %@\n", indent, @"padding", self.padding]; + } + [self.unknownFields writeDescriptionTo:output withIndent:indent]; +} +- (void) storeInDictionary:(NSMutableDictionary *)dictionary { + if (self.hasPadding) { + [dictionary setObject: self.padding forKey: @"padding"]; + } + [self.unknownFields storeInDictionary:dictionary]; +} +- (BOOL) isEqual:(id)other { + if (other == self) { + return YES; + } + if (![other isKindOfClass:[OWSSignalServiceProtosNullMessage class]]) { + return NO; + } + OWSSignalServiceProtosNullMessage *otherMessage = other; + return + self.hasPadding == otherMessage.hasPadding && + (!self.hasPadding || [self.padding isEqual:otherMessage.padding]) && + (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); +} +- (NSUInteger) hash { + __block NSUInteger hashCode = 7; + if (self.hasPadding) { + hashCode = hashCode * 31 + [self.padding hash]; + } + hashCode = hashCode * 31 + [self.unknownFields hash]; + return hashCode; +} +@end + +@interface OWSSignalServiceProtosNullMessageBuilder() +@property (strong) OWSSignalServiceProtosNullMessage* resultNullMessage; +@end + +@implementation OWSSignalServiceProtosNullMessageBuilder +@synthesize resultNullMessage; +- (instancetype) init { + if ((self = [super init])) { + self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; + } + return self; +} +- (PBGeneratedMessage*) internalGetResult { + return resultNullMessage; +} +- (OWSSignalServiceProtosNullMessageBuilder*) clear { + self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; + return self; +} +- (OWSSignalServiceProtosNullMessageBuilder*) clone { + return [OWSSignalServiceProtosNullMessage builderWithPrototype:resultNullMessage]; +} +- (OWSSignalServiceProtosNullMessage*) defaultInstance { + return [OWSSignalServiceProtosNullMessage defaultInstance]; +} +- (OWSSignalServiceProtosNullMessage*) build { + [self checkInitialized]; + return [self buildPartial]; +} +- (OWSSignalServiceProtosNullMessage*) buildPartial { + OWSSignalServiceProtosNullMessage* returnMe = resultNullMessage; + self.resultNullMessage = nil; + return returnMe; +} +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other { + if (other == [OWSSignalServiceProtosNullMessage defaultInstance]) { + return self; + } + if (other.hasPadding) { + [self setPadding:other.padding]; + } + [self mergeUnknownFields:other.unknownFields]; + return self; +} +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { + return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; +} +- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; + while (YES) { + SInt32 tag = [input readTag]; + switch (tag) { + case 0: + [self setUnknownFields:[unknownFields build]]; + return self; + default: { + if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) { + [self setUnknownFields:[unknownFields build]]; + return self; + } + break; + } + case 10: { + [self setPadding:[input readData]]; + break; + } + } + } +} +- (BOOL) hasPadding { + return resultNullMessage.hasPadding; +} +- (NSData*) padding { + return resultNullMessage.padding; +} +- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value { + resultNullMessage.hasPadding = YES; + resultNullMessage.padding = value; + return self; +} +- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding { + resultNullMessage.hasPadding = NO; + resultNullMessage.padding = [NSData data]; + return self; +} +@end + +@interface OWSSignalServiceProtosVerified () +@property (strong) NSString* destination; +@property (strong) NSData* identityKey; +@property OWSSignalServiceProtosVerifiedState state; +@property (strong) NSData* nullMessage; +@end + +@implementation OWSSignalServiceProtosVerified + +- (BOOL) hasDestination { + return !!hasDestination_; +} +- (void) setHasDestination:(BOOL) _value_ { + hasDestination_ = !!_value_; +} +@synthesize destination; +- (BOOL) hasIdentityKey { + return !!hasIdentityKey_; +} +- (void) setHasIdentityKey:(BOOL) _value_ { + hasIdentityKey_ = !!_value_; +} +@synthesize identityKey; +- (BOOL) hasState { + return !!hasState_; +} +- (void) setHasState:(BOOL) _value_ { + hasState_ = !!_value_; } -@synthesize expireTimer; -- (BOOL) hasProfileKey { - return !!hasProfileKey_; +@synthesize state; +- (BOOL) hasNullMessage { + return !!hasNullMessage_; } -- (void) setHasProfileKey:(BOOL) _value_ { - hasProfileKey_ = !!_value_; +- (void) setHasNullMessage:(BOOL) _value_ { + hasNullMessage_ = !!_value_; } -@synthesize profileKey; +@synthesize nullMessage; - (instancetype) init { if ((self = [super init])) { - self.body = @""; - self.group = [OWSSignalServiceProtosGroupContext defaultInstance]; - self.flags = 0; - self.expireTimer = 0; - self.profileKey = [NSData data]; + self.destination = @""; + self.identityKey = [NSData data]; + self.state = OWSSignalServiceProtosVerifiedStateDefault; + self.nullMessage = [NSData data]; } return self; } -static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessageInstance = nil; +static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessage class]) { - defaultOWSSignalServiceProtosDataMessageInstance = [[OWSSignalServiceProtosDataMessage alloc] init]; + if (self == [OWSSignalServiceProtosVerified class]) { + defaultOWSSignalServiceProtosVerifiedInstance = [[OWSSignalServiceProtosVerified alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageInstance; + return defaultOWSSignalServiceProtosVerifiedInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageInstance; -} -- (NSArray *)attachments { - return attachmentsArray; -} -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { - return [attachmentsArray objectAtIndex:index]; + return defaultOWSSignalServiceProtosVerifiedInstance; } - (BOOL) isInitialized { return YES; } - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - if (self.hasBody) { - [output writeString:1 value:self.body]; - } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { - [output writeMessage:2 value:element]; - }]; - if (self.hasGroup) { - [output writeMessage:3 value:self.group]; + if (self.hasDestination) { + [output writeString:1 value:self.destination]; } - if (self.hasFlags) { - [output writeUInt32:4 value:self.flags]; + if (self.hasIdentityKey) { + [output writeData:2 value:self.identityKey]; } - if (self.hasExpireTimer) { - [output writeUInt32:5 value:self.expireTimer]; + if (self.hasState) { + [output writeEnum:3 value:self.state]; } - if (self.hasProfileKey) { - [output writeData:6 value:self.profileKey]; + if (self.hasNullMessage) { + [output writeData:4 value:self.nullMessage]; } [self.unknownFields writeToCodedOutputStream:output]; } @@ -3535,107 +3640,79 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa } size_ = 0; - if (self.hasBody) { - size_ += computeStringSize(1, self.body); - } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { - size_ += computeMessageSize(2, element); - }]; - if (self.hasGroup) { - size_ += computeMessageSize(3, self.group); + if (self.hasDestination) { + size_ += computeStringSize(1, self.destination); } - if (self.hasFlags) { - size_ += computeUInt32Size(4, self.flags); + if (self.hasIdentityKey) { + size_ += computeDataSize(2, self.identityKey); } - if (self.hasExpireTimer) { - size_ += computeUInt32Size(5, self.expireTimer); + if (self.hasState) { + size_ += computeEnumSize(3, self.state); } - if (self.hasProfileKey) { - size_ += computeDataSize(6, self.profileKey); + if (self.hasNullMessage) { + size_ += computeDataSize(4, self.nullMessage); } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data] build]; ++ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input] build]; ++ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input] build]; ++ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageBuilder alloc] init]; ++ (OWSSignalServiceProtosVerifiedBuilder*) builder { + return [[OWSSignalServiceProtosVerifiedBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessage*) prototype { - return [[OWSSignalServiceProtosDataMessage builder] mergeFrom:prototype]; ++ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype { + return [[OWSSignalServiceProtosVerified builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageBuilder*) builder { - return [OWSSignalServiceProtosDataMessage builder]; +- (OWSSignalServiceProtosVerifiedBuilder*) builder { + return [OWSSignalServiceProtosVerified builder]; } -- (OWSSignalServiceProtosDataMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessage builderWithPrototype:self]; +- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder { + return [OWSSignalServiceProtosVerified builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - if (self.hasBody) { - [output appendFormat:@"%@%@: %@\n", indent, @"body", self.body]; - } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { - [output appendFormat:@"%@%@ {\n", indent, @"attachments"]; - [element writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; - }]; - if (self.hasGroup) { - [output appendFormat:@"%@%@ {\n", indent, @"group"]; - [self.group writeDescriptionTo:output - withIndent:[NSString stringWithFormat:@"%@ ", indent]]; - [output appendFormat:@"%@}\n", indent]; + if (self.hasDestination) { + [output appendFormat:@"%@%@: %@\n", indent, @"destination", self.destination]; } - if (self.hasFlags) { - [output appendFormat:@"%@%@: %@\n", indent, @"flags", [NSNumber numberWithInteger:self.flags]]; + if (self.hasIdentityKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"identityKey", self.identityKey]; } - if (self.hasExpireTimer) { - [output appendFormat:@"%@%@: %@\n", indent, @"expireTimer", [NSNumber numberWithInteger:self.expireTimer]]; + if (self.hasState) { + [output appendFormat:@"%@%@: %@\n", indent, @"state", NSStringFromOWSSignalServiceProtosVerifiedState(self.state)]; } - if (self.hasProfileKey) { - [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; + if (self.hasNullMessage) { + [output appendFormat:@"%@%@: %@\n", indent, @"nullMessage", self.nullMessage]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { - if (self.hasBody) { - [dictionary setObject: self.body forKey: @"body"]; - } - for (OWSSignalServiceProtosAttachmentPointer* element in self.attachmentsArray) { - NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; - [element storeInDictionary:elementDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"attachments"]; - } - if (self.hasGroup) { - NSMutableDictionary *messageDictionary = [NSMutableDictionary dictionary]; - [self.group storeInDictionary:messageDictionary]; - [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"group"]; + if (self.hasDestination) { + [dictionary setObject: self.destination forKey: @"destination"]; } - if (self.hasFlags) { - [dictionary setObject: [NSNumber numberWithInteger:self.flags] forKey: @"flags"]; + if (self.hasIdentityKey) { + [dictionary setObject: self.identityKey forKey: @"identityKey"]; } - if (self.hasExpireTimer) { - [dictionary setObject: [NSNumber numberWithInteger:self.expireTimer] forKey: @"expireTimer"]; + if (self.hasState) { + [dictionary setObject: @(self.state) forKey: @"state"]; } - if (self.hasProfileKey) { - [dictionary setObject: self.profileKey forKey: @"profileKey"]; + if (self.hasNullMessage) { + [dictionary setObject: self.nullMessage forKey: @"nullMessage"]; } [self.unknownFields storeInDictionary:dictionary]; } @@ -3643,136 +3720,120 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessage class]]) { + if (![other isKindOfClass:[OWSSignalServiceProtosVerified class]]) { return NO; } - OWSSignalServiceProtosDataMessage *otherMessage = other; + OWSSignalServiceProtosVerified *otherMessage = other; return - self.hasBody == otherMessage.hasBody && - (!self.hasBody || [self.body isEqual:otherMessage.body]) && - [self.attachmentsArray isEqualToArray:otherMessage.attachmentsArray] && - self.hasGroup == otherMessage.hasGroup && - (!self.hasGroup || [self.group isEqual:otherMessage.group]) && - self.hasFlags == otherMessage.hasFlags && - (!self.hasFlags || self.flags == otherMessage.flags) && - self.hasExpireTimer == otherMessage.hasExpireTimer && - (!self.hasExpireTimer || self.expireTimer == otherMessage.expireTimer) && - self.hasProfileKey == otherMessage.hasProfileKey && - (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && + self.hasDestination == otherMessage.hasDestination && + (!self.hasDestination || [self.destination isEqual:otherMessage.destination]) && + self.hasIdentityKey == otherMessage.hasIdentityKey && + (!self.hasIdentityKey || [self.identityKey isEqual:otherMessage.identityKey]) && + self.hasState == otherMessage.hasState && + (!self.hasState || self.state == otherMessage.state) && + self.hasNullMessage == otherMessage.hasNullMessage && + (!self.hasNullMessage || [self.nullMessage isEqual:otherMessage.nullMessage]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { __block NSUInteger hashCode = 7; - if (self.hasBody) { - hashCode = hashCode * 31 + [self.body hash]; - } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { - hashCode = hashCode * 31 + [element hash]; - }]; - if (self.hasGroup) { - hashCode = hashCode * 31 + [self.group hash]; + if (self.hasDestination) { + hashCode = hashCode * 31 + [self.destination hash]; } - if (self.hasFlags) { - hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.flags] hash]; + if (self.hasIdentityKey) { + hashCode = hashCode * 31 + [self.identityKey hash]; } - if (self.hasExpireTimer) { - hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.expireTimer] hash]; + if (self.hasState) { + hashCode = hashCode * 31 + self.state; } - if (self.hasProfileKey) { - hashCode = hashCode * 31 + [self.profileKey hash]; + if (self.hasNullMessage) { + hashCode = hashCode * 31 + [self.nullMessage hash]; } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @end -BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value) { +BOOL OWSSignalServiceProtosVerifiedStateIsValidValue(OWSSignalServiceProtosVerifiedState value) { switch (value) { - case OWSSignalServiceProtosDataMessageFlagsEndSession: - case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: + case OWSSignalServiceProtosVerifiedStateDefault: + case OWSSignalServiceProtosVerifiedStateVerified: + case OWSSignalServiceProtosVerifiedStateUnverified: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value) { +NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtosVerifiedState value) { switch (value) { - case OWSSignalServiceProtosDataMessageFlagsEndSession: - return @"OWSSignalServiceProtosDataMessageFlagsEndSession"; - case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: - return @"OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate"; + case OWSSignalServiceProtosVerifiedStateDefault: + return @"OWSSignalServiceProtosVerifiedStateDefault"; + case OWSSignalServiceProtosVerifiedStateVerified: + return @"OWSSignalServiceProtosVerifiedStateVerified"; + case OWSSignalServiceProtosVerifiedStateUnverified: + return @"OWSSignalServiceProtosVerifiedStateUnverified"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageBuilder() -@property (strong) OWSSignalServiceProtosDataMessage* resultDataMessage; +@interface OWSSignalServiceProtosVerifiedBuilder() +@property (strong) OWSSignalServiceProtosVerified* resultVerified; @end -@implementation OWSSignalServiceProtosDataMessageBuilder -@synthesize resultDataMessage; +@implementation OWSSignalServiceProtosVerifiedBuilder +@synthesize resultVerified; - (instancetype) init { if ((self = [super init])) { - self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; + self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { - return resultDataMessage; + return resultVerified; } -- (OWSSignalServiceProtosDataMessageBuilder*) clear { - self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; +- (OWSSignalServiceProtosVerifiedBuilder*) clear { + self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clone { - return [OWSSignalServiceProtosDataMessage builderWithPrototype:resultDataMessage]; +- (OWSSignalServiceProtosVerifiedBuilder*) clone { + return [OWSSignalServiceProtosVerified builderWithPrototype:resultVerified]; } -- (OWSSignalServiceProtosDataMessage*) defaultInstance { - return [OWSSignalServiceProtosDataMessage defaultInstance]; +- (OWSSignalServiceProtosVerified*) defaultInstance { + return [OWSSignalServiceProtosVerified defaultInstance]; } -- (OWSSignalServiceProtosDataMessage*) build { +- (OWSSignalServiceProtosVerified*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessage*) buildPartial { - OWSSignalServiceProtosDataMessage* returnMe = resultDataMessage; - self.resultDataMessage = nil; +- (OWSSignalServiceProtosVerified*) buildPartial { + OWSSignalServiceProtosVerified* returnMe = resultVerified; + self.resultVerified = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessage*) other { - if (other == [OWSSignalServiceProtosDataMessage defaultInstance]) { +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other { + if (other == [OWSSignalServiceProtosVerified defaultInstance]) { return self; } - if (other.hasBody) { - [self setBody:other.body]; - } - if (other.attachmentsArray.count > 0) { - if (resultDataMessage.attachmentsArray == nil) { - resultDataMessage.attachmentsArray = [[NSMutableArray alloc] initWithArray:other.attachmentsArray]; - } else { - [resultDataMessage.attachmentsArray addObjectsFromArray:other.attachmentsArray]; - } - } - if (other.hasGroup) { - [self mergeGroup:other.group]; + if (other.hasDestination) { + [self setDestination:other.destination]; } - if (other.hasFlags) { - [self setFlags:other.flags]; + if (other.hasIdentityKey) { + [self setIdentityKey:other.identityKey]; } - if (other.hasExpireTimer) { - [self setExpireTimer:other.expireTimer]; + if (other.hasState) { + [self setState:other.state]; } - if (other.hasProfileKey) { - [self setProfileKey:other.profileKey]; + if (other.hasNullMessage) { + [self setNullMessage:other.nullMessage]; } [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -3788,152 +3849,91 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServicePro break; } case 10: { - [self setBody:[input readString]]; + [self setDestination:[input readString]]; break; } case 18: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; - [input readMessage:subBuilder extensionRegistry:extensionRegistry]; - [self addAttachments:[subBuilder buildPartial]]; + [self setIdentityKey:[input readData]]; break; } - case 26: { - OWSSignalServiceProtosGroupContextBuilder* subBuilder = [OWSSignalServiceProtosGroupContext builder]; - if (self.hasGroup) { - [subBuilder mergeFrom:self.group]; + case 24: { + OWSSignalServiceProtosVerifiedState value = (OWSSignalServiceProtosVerifiedState)[input readEnum]; + if (OWSSignalServiceProtosVerifiedStateIsValidValue(value)) { + [self setState:value]; + } else { + [unknownFields mergeVarintField:3 value:value]; } - [input readMessage:subBuilder extensionRegistry:extensionRegistry]; - [self setGroup:[subBuilder buildPartial]]; - break; - } - case 32: { - [self setFlags:[input readUInt32]]; - break; - } - case 40: { - [self setExpireTimer:[input readUInt32]]; break; } - case 50: { - [self setProfileKey:[input readData]]; + case 34: { + [self setNullMessage:[input readData]]; break; } } } } -- (BOOL) hasBody { - return resultDataMessage.hasBody; -} -- (NSString*) body { - return resultDataMessage.body; -} -- (OWSSignalServiceProtosDataMessageBuilder*) setBody:(NSString*) value { - resultDataMessage.hasBody = YES; - resultDataMessage.body = value; - return self; -} -- (OWSSignalServiceProtosDataMessageBuilder*) clearBody { - resultDataMessage.hasBody = NO; - resultDataMessage.body = @""; - return self; -} -- (NSMutableArray *)attachments { - return resultDataMessage.attachmentsArray; -} -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { - return [resultDataMessage attachmentsAtIndex:index]; -} -- (OWSSignalServiceProtosDataMessageBuilder *)addAttachments:(OWSSignalServiceProtosAttachmentPointer*)value { - if (resultDataMessage.attachmentsArray == nil) { - resultDataMessage.attachmentsArray = [[NSMutableArray alloc]init]; - } - [resultDataMessage.attachmentsArray addObject:value]; - return self; -} -- (OWSSignalServiceProtosDataMessageBuilder *)setAttachmentsArray:(NSArray *)array { - resultDataMessage.attachmentsArray = [[NSMutableArray alloc]initWithArray:array]; - return self; -} -- (OWSSignalServiceProtosDataMessageBuilder *)clearAttachments { - resultDataMessage.attachmentsArray = nil; - return self; -} -- (BOOL) hasGroup { - return resultDataMessage.hasGroup; -} -- (OWSSignalServiceProtosGroupContext*) group { - return resultDataMessage.group; -} -- (OWSSignalServiceProtosDataMessageBuilder*) setGroup:(OWSSignalServiceProtosGroupContext*) value { - resultDataMessage.hasGroup = YES; - resultDataMessage.group = value; - return self; +- (BOOL) hasDestination { + return resultVerified.hasDestination; } -- (OWSSignalServiceProtosDataMessageBuilder*) setGroupBuilder:(OWSSignalServiceProtosGroupContextBuilder*) builderForValue { - return [self setGroup:[builderForValue build]]; +- (NSString*) destination { + return resultVerified.destination; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeGroup:(OWSSignalServiceProtosGroupContext*) value { - if (resultDataMessage.hasGroup && - resultDataMessage.group != [OWSSignalServiceProtosGroupContext defaultInstance]) { - resultDataMessage.group = - [[[OWSSignalServiceProtosGroupContext builderWithPrototype:resultDataMessage.group] mergeFrom:value] buildPartial]; - } else { - resultDataMessage.group = value; - } - resultDataMessage.hasGroup = YES; +- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value { + resultVerified.hasDestination = YES; + resultVerified.destination = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearGroup { - resultDataMessage.hasGroup = NO; - resultDataMessage.group = [OWSSignalServiceProtosGroupContext defaultInstance]; +- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination { + resultVerified.hasDestination = NO; + resultVerified.destination = @""; return self; } -- (BOOL) hasFlags { - return resultDataMessage.hasFlags; +- (BOOL) hasIdentityKey { + return resultVerified.hasIdentityKey; } -- (UInt32) flags { - return resultDataMessage.flags; +- (NSData*) identityKey { + return resultVerified.identityKey; } -- (OWSSignalServiceProtosDataMessageBuilder*) setFlags:(UInt32) value { - resultDataMessage.hasFlags = YES; - resultDataMessage.flags = value; +- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value { + resultVerified.hasIdentityKey = YES; + resultVerified.identityKey = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearFlags { - resultDataMessage.hasFlags = NO; - resultDataMessage.flags = 0; +- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey { + resultVerified.hasIdentityKey = NO; + resultVerified.identityKey = [NSData data]; return self; } -- (BOOL) hasExpireTimer { - return resultDataMessage.hasExpireTimer; +- (BOOL) hasState { + return resultVerified.hasState; } -- (UInt32) expireTimer { - return resultDataMessage.expireTimer; +- (OWSSignalServiceProtosVerifiedState) state { + return resultVerified.state; } -- (OWSSignalServiceProtosDataMessageBuilder*) setExpireTimer:(UInt32) value { - resultDataMessage.hasExpireTimer = YES; - resultDataMessage.expireTimer = value; +- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value { + resultVerified.hasState = YES; + resultVerified.state = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearExpireTimer { - resultDataMessage.hasExpireTimer = NO; - resultDataMessage.expireTimer = 0; +- (OWSSignalServiceProtosVerifiedBuilder*) clearState { + resultVerified.hasState = NO; + resultVerified.state = OWSSignalServiceProtosVerifiedStateDefault; return self; } -- (BOOL) hasProfileKey { - return resultDataMessage.hasProfileKey; +- (BOOL) hasNullMessage { + return resultVerified.hasNullMessage; } -- (NSData*) profileKey { - return resultDataMessage.profileKey; +- (NSData*) nullMessage { + return resultVerified.nullMessage; } -- (OWSSignalServiceProtosDataMessageBuilder*) setProfileKey:(NSData*) value { - resultDataMessage.hasProfileKey = YES; - resultDataMessage.profileKey = value; +- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value { + resultVerified.hasNullMessage = YES; + resultVerified.nullMessage = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearProfileKey { - resultDataMessage.hasProfileKey = NO; - resultDataMessage.profileKey = [NSData data]; +- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage { + resultVerified.hasNullMessage = NO; + resultVerified.nullMessage = [NSData data]; return self; } @end @@ -7340,6 +7340,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro @property (strong) OWSSignalServiceProtosContactDetailsAvatar* avatar; @property (strong) NSString* color; @property (strong) OWSSignalServiceProtosVerified* verified; +@property (strong) NSData* profileKey; @end @implementation OWSSignalServiceProtosContactDetails @@ -7379,6 +7380,13 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro hasVerified_ = !!_value_; } @synthesize verified; +- (BOOL) hasProfileKey { + return !!hasProfileKey_; +} +- (void) setHasProfileKey:(BOOL) _value_ { + hasProfileKey_ = !!_value_; +} +@synthesize profileKey; - (instancetype) init { if ((self = [super init])) { self.number = @""; @@ -7386,6 +7394,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro self.avatar = [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]; self.color = @""; self.verified = [OWSSignalServiceProtosVerified defaultInstance]; + self.profileKey = [NSData data]; } return self; } @@ -7420,6 +7429,9 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac if (self.hasVerified) { [output writeMessage:5 value:self.verified]; } + if (self.hasProfileKey) { + [output writeData:6 value:self.profileKey]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (SInt32) serializedSize { @@ -7444,6 +7456,9 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac if (self.hasVerified) { size_ += computeMessageSize(5, self.verified); } + if (self.hasProfileKey) { + size_ += computeDataSize(6, self.profileKey); + } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; @@ -7500,6 +7515,9 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } + if (self.hasProfileKey) { + [output appendFormat:@"%@%@: %@\n", indent, @"profileKey", self.profileKey]; + } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { @@ -7522,6 +7540,9 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac [self.verified storeInDictionary:messageDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"verified"]; } + if (self.hasProfileKey) { + [dictionary setObject: self.profileKey forKey: @"profileKey"]; + } [self.unknownFields storeInDictionary:dictionary]; } - (BOOL) isEqual:(id)other { @@ -7543,6 +7564,8 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac (!self.hasColor || [self.color isEqual:otherMessage.color]) && self.hasVerified == otherMessage.hasVerified && (!self.hasVerified || [self.verified isEqual:otherMessage.verified]) && + self.hasProfileKey == otherMessage.hasProfileKey && + (!self.hasProfileKey || [self.profileKey isEqual:otherMessage.profileKey]) && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); } - (NSUInteger) hash { @@ -7562,6 +7585,9 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac if (self.hasVerified) { hashCode = hashCode * 31 + [self.verified hash]; } + if (self.hasProfileKey) { + hashCode = hashCode * 31 + [self.profileKey hash]; + } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -7875,6 +7901,9 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos if (other.hasVerified) { [self mergeVerified:other.verified]; } + if (other.hasProfileKey) { + [self setProfileKey:other.profileKey]; + } [self mergeUnknownFields:other.unknownFields]; return self; } @@ -7926,6 +7955,10 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos [self setVerified:[subBuilder buildPartial]]; break; } + case 50: { + [self setProfileKey:[input readData]]; + break; + } } } } @@ -8037,6 +8070,22 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos resultContactDetails.verified = [OWSSignalServiceProtosVerified defaultInstance]; return self; } +- (BOOL) hasProfileKey { + return resultContactDetails.hasProfileKey; +} +- (NSData*) profileKey { + return resultContactDetails.profileKey; +} +- (OWSSignalServiceProtosContactDetailsBuilder*) setProfileKey:(NSData*) value { + resultContactDetails.hasProfileKey = YES; + resultContactDetails.profileKey = value; + return self; +} +- (OWSSignalServiceProtosContactDetailsBuilder*) clearProfileKey { + resultContactDetails.hasProfileKey = NO; + resultContactDetails.profileKey = [NSData data]; + return self; +} @end @interface OWSSignalServiceProtosGroupDetails ()