|
|
@ -281,6 +281,7 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi
|
|
|
|
@property (strong) NSData* identityKeyPrivate;
|
|
|
|
@property (strong) NSData* identityKeyPrivate;
|
|
|
|
@property (strong) NSString* number;
|
|
|
|
@property (strong) NSString* number;
|
|
|
|
@property (strong) NSString* provisioningCode;
|
|
|
|
@property (strong) NSString* provisioningCode;
|
|
|
|
|
|
|
|
@property (strong) NSString* userAgent;
|
|
|
|
@end
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
@implementation OWSProvisioningProtosProvisionMessage
|
|
|
|
@implementation OWSProvisioningProtosProvisionMessage
|
|
|
@ -313,12 +314,20 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi
|
|
|
|
hasProvisioningCode_ = !!_value_;
|
|
|
|
hasProvisioningCode_ = !!_value_;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@synthesize provisioningCode;
|
|
|
|
@synthesize provisioningCode;
|
|
|
|
|
|
|
|
- (BOOL) hasUserAgent {
|
|
|
|
|
|
|
|
return !!hasUserAgent_;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void) setHasUserAgent:(BOOL) _value_ {
|
|
|
|
|
|
|
|
hasUserAgent_ = !!_value_;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@synthesize userAgent;
|
|
|
|
- (instancetype) init {
|
|
|
|
- (instancetype) init {
|
|
|
|
if ((self = [super init])) {
|
|
|
|
if ((self = [super init])) {
|
|
|
|
self.identityKeyPublic = [NSData data];
|
|
|
|
self.identityKeyPublic = [NSData data];
|
|
|
|
self.identityKeyPrivate = [NSData data];
|
|
|
|
self.identityKeyPrivate = [NSData data];
|
|
|
|
self.number = @"";
|
|
|
|
self.number = @"";
|
|
|
|
self.provisioningCode = @"";
|
|
|
|
self.provisioningCode = @"";
|
|
|
|
|
|
|
|
self.userAgent = @"";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -350,6 +359,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
[output writeString:4 value:self.provisioningCode];
|
|
|
|
[output writeString:4 value:self.provisioningCode];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.hasUserAgent) {
|
|
|
|
|
|
|
|
[output writeString:5 value:self.userAgent];
|
|
|
|
|
|
|
|
}
|
|
|
|
[self.unknownFields writeToCodedOutputStream:output];
|
|
|
|
[self.unknownFields writeToCodedOutputStream:output];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- (SInt32) serializedSize {
|
|
|
|
- (SInt32) serializedSize {
|
|
|
@ -371,6 +383,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
size_ += computeStringSize(4, self.provisioningCode);
|
|
|
|
size_ += computeStringSize(4, self.provisioningCode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.hasUserAgent) {
|
|
|
|
|
|
|
|
size_ += computeStringSize(5, self.userAgent);
|
|
|
|
|
|
|
|
}
|
|
|
|
size_ += self.unknownFields.serializedSize;
|
|
|
|
size_ += self.unknownFields.serializedSize;
|
|
|
|
memoizedSerializedSize = size_;
|
|
|
|
memoizedSerializedSize = size_;
|
|
|
|
return size_;
|
|
|
|
return size_;
|
|
|
@ -418,6 +433,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
[output appendFormat:@"%@%@: %@\n", indent, @"provisioningCode", self.provisioningCode];
|
|
|
|
[output appendFormat:@"%@%@: %@\n", indent, @"provisioningCode", self.provisioningCode];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.hasUserAgent) {
|
|
|
|
|
|
|
|
[output appendFormat:@"%@%@: %@\n", indent, @"userAgent", self.userAgent];
|
|
|
|
|
|
|
|
}
|
|
|
|
[self.unknownFields writeDescriptionTo:output withIndent:indent];
|
|
|
|
[self.unknownFields writeDescriptionTo:output withIndent:indent];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
|
|
|
|
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
|
|
|
@ -433,6 +451,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
[dictionary setObject: self.provisioningCode forKey: @"provisioningCode"];
|
|
|
|
[dictionary setObject: self.provisioningCode forKey: @"provisioningCode"];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.hasUserAgent) {
|
|
|
|
|
|
|
|
[dictionary setObject: self.userAgent forKey: @"userAgent"];
|
|
|
|
|
|
|
|
}
|
|
|
|
[self.unknownFields storeInDictionary:dictionary];
|
|
|
|
[self.unknownFields storeInDictionary:dictionary];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- (BOOL) isEqual:(id)other {
|
|
|
|
- (BOOL) isEqual:(id)other {
|
|
|
@ -452,6 +473,8 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
(!self.hasNumber || [self.number isEqual:otherMessage.number]) &&
|
|
|
|
(!self.hasNumber || [self.number isEqual:otherMessage.number]) &&
|
|
|
|
self.hasProvisioningCode == otherMessage.hasProvisioningCode &&
|
|
|
|
self.hasProvisioningCode == otherMessage.hasProvisioningCode &&
|
|
|
|
(!self.hasProvisioningCode || [self.provisioningCode isEqual:otherMessage.provisioningCode]) &&
|
|
|
|
(!self.hasProvisioningCode || [self.provisioningCode isEqual:otherMessage.provisioningCode]) &&
|
|
|
|
|
|
|
|
self.hasUserAgent == otherMessage.hasUserAgent &&
|
|
|
|
|
|
|
|
(!self.hasUserAgent || [self.userAgent isEqual:otherMessage.userAgent]) &&
|
|
|
|
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
|
|
|
|
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- (NSUInteger) hash {
|
|
|
|
- (NSUInteger) hash {
|
|
|
@ -468,6 +491,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
if (self.hasProvisioningCode) {
|
|
|
|
hashCode = hashCode * 31 + [self.provisioningCode hash];
|
|
|
|
hashCode = hashCode * 31 + [self.provisioningCode hash];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.hasUserAgent) {
|
|
|
|
|
|
|
|
hashCode = hashCode * 31 + [self.userAgent hash];
|
|
|
|
|
|
|
|
}
|
|
|
|
hashCode = hashCode * 31 + [self.unknownFields hash];
|
|
|
|
hashCode = hashCode * 31 + [self.unknownFields hash];
|
|
|
|
return hashCode;
|
|
|
|
return hashCode;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -523,6 +549,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
if (other.hasProvisioningCode) {
|
|
|
|
if (other.hasProvisioningCode) {
|
|
|
|
[self setProvisioningCode:other.provisioningCode];
|
|
|
|
[self setProvisioningCode:other.provisioningCode];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (other.hasUserAgent) {
|
|
|
|
|
|
|
|
[self setUserAgent:other.userAgent];
|
|
|
|
|
|
|
|
}
|
|
|
|
[self mergeUnknownFields:other.unknownFields];
|
|
|
|
[self mergeUnknownFields:other.unknownFields];
|
|
|
|
return self;
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -560,6 +589,10 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
[self setProvisioningCode:[input readString]];
|
|
|
|
[self setProvisioningCode:[input readString]];
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
case 42: {
|
|
|
|
|
|
|
|
[self setUserAgent:[input readString]];
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -627,6 +660,22 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis
|
|
|
|
resultProvisionMessage.provisioningCode = @"";
|
|
|
|
resultProvisionMessage.provisioningCode = @"";
|
|
|
|
return self;
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL) hasUserAgent {
|
|
|
|
|
|
|
|
return resultProvisionMessage.hasUserAgent;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSString*) userAgent {
|
|
|
|
|
|
|
|
return resultProvisionMessage.userAgent;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- (OWSProvisioningProtosProvisionMessageBuilder*) setUserAgent:(NSString*) value {
|
|
|
|
|
|
|
|
resultProvisionMessage.hasUserAgent = YES;
|
|
|
|
|
|
|
|
resultProvisionMessage.userAgent = value;
|
|
|
|
|
|
|
|
return self;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- (OWSProvisioningProtosProvisionMessageBuilder*) clearUserAgent {
|
|
|
|
|
|
|
|
resultProvisionMessage.hasUserAgent = NO;
|
|
|
|
|
|
|
|
resultProvisionMessage.userAgent = @"";
|
|
|
|
|
|
|
|
return self;
|
|
|
|
|
|
|
|
}
|
|
|
|
@end
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|