From eb96f846a4bb95e57da4ea946f6629b74fc9b423 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 12 Sep 2016 14:20:34 -0400 Subject: [PATCH] Send user agent to desktop so they can pick a theme for us // FREEBIE --- protobuf/OWSProvisioningProtos.proto | 1 + src/Devices/OWSProvisioningMessage.m | 1 + src/Devices/OWSProvisioningProtos.pb.h | 10 ++++++ src/Devices/OWSProvisioningProtos.pb.m | 49 ++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/protobuf/OWSProvisioningProtos.proto b/protobuf/OWSProvisioningProtos.proto index dc2342d28..66ef7facd 100644 --- a/protobuf/OWSProvisioningProtos.proto +++ b/protobuf/OWSProvisioningProtos.proto @@ -16,4 +16,5 @@ message ProvisionMessage { optional bytes identityKeyPrivate = 2; optional string number = 3; optional string provisioningCode = 4; + optional string userAgent = 5; } diff --git a/src/Devices/OWSProvisioningMessage.m b/src/Devices/OWSProvisioningMessage.m index c4d1fc0a3..eef05e9c0 100644 --- a/src/Devices/OWSProvisioningMessage.m +++ b/src/Devices/OWSProvisioningMessage.m @@ -48,6 +48,7 @@ NS_ASSUME_NONNULL_BEGIN [messageBuilder setIdentityKeyPrivate:self.myPrivateKey]; [messageBuilder setNumber:self.accountIdentifier]; [messageBuilder setProvisioningCode:self.provisioningCode]; + [messageBuilder setUserAgent:@"OWI"]; NSData *plainTextProvisionMessage = [[messageBuilder build] data]; diff --git a/src/Devices/OWSProvisioningProtos.pb.h b/src/Devices/OWSProvisioningProtos.pb.h index 72cd448b1..85faa8c4c 100644 --- a/src/Devices/OWSProvisioningProtos.pb.h +++ b/src/Devices/OWSProvisioningProtos.pb.h @@ -125,14 +125,17 @@ #define ProvisionMessage_identityKeyPrivate @"identityKeyPrivate" #define ProvisionMessage_number @"number" #define ProvisionMessage_provisioningCode @"provisioningCode" +#define ProvisionMessage_userAgent @"userAgent" @interface OWSProvisioningProtosProvisionMessage : PBGeneratedMessage { @private BOOL hasNumber_:1; BOOL hasProvisioningCode_:1; + BOOL hasUserAgent_:1; BOOL hasIdentityKeyPublic_:1; BOOL hasIdentityKeyPrivate_:1; NSString* number; NSString* provisioningCode; + NSString* userAgent; NSData* identityKeyPublic; NSData* identityKeyPrivate; } @@ -140,10 +143,12 @@ - (BOOL) hasIdentityKeyPrivate; - (BOOL) hasNumber; - (BOOL) hasProvisioningCode; +- (BOOL) hasUserAgent; @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; + (instancetype) defaultInstance; - (instancetype) defaultInstance; @@ -199,6 +204,11 @@ - (NSString*) provisioningCode; - (OWSProvisioningProtosProvisionMessageBuilder*) setProvisioningCode:(NSString*) value; - (OWSProvisioningProtosProvisionMessageBuilder*) clearProvisioningCode; + +- (BOOL) hasUserAgent; +- (NSString*) userAgent; +- (OWSProvisioningProtosProvisionMessageBuilder*) setUserAgent:(NSString*) value; +- (OWSProvisioningProtosProvisionMessageBuilder*) clearUserAgent; @end diff --git a/src/Devices/OWSProvisioningProtos.pb.m b/src/Devices/OWSProvisioningProtos.pb.m index be600b826..21e1922de 100644 --- a/src/Devices/OWSProvisioningProtos.pb.m +++ b/src/Devices/OWSProvisioningProtos.pb.m @@ -281,6 +281,7 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi @property (strong) NSData* identityKeyPrivate; @property (strong) NSString* number; @property (strong) NSString* provisioningCode; +@property (strong) NSString* userAgent; @end @implementation OWSProvisioningProtosProvisionMessage @@ -313,12 +314,20 @@ static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvi hasProvisioningCode_ = !!_value_; } @synthesize provisioningCode; +- (BOOL) hasUserAgent { + return !!hasUserAgent_; +} +- (void) setHasUserAgent:(BOOL) _value_ { + hasUserAgent_ = !!_value_; +} +@synthesize userAgent; - (instancetype) init { if ((self = [super init])) { self.identityKeyPublic = [NSData data]; self.identityKeyPrivate = [NSData data]; self.number = @""; self.provisioningCode = @""; + self.userAgent = @""; } return self; } @@ -350,6 +359,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasProvisioningCode) { [output writeString:4 value:self.provisioningCode]; } + if (self.hasUserAgent) { + [output writeString:5 value:self.userAgent]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (SInt32) serializedSize { @@ -371,6 +383,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasProvisioningCode) { size_ += computeStringSize(4, self.provisioningCode); } + if (self.hasUserAgent) { + size_ += computeStringSize(5, self.userAgent); + } size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; @@ -418,6 +433,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasProvisioningCode) { [output appendFormat:@"%@%@: %@\n", indent, @"provisioningCode", self.provisioningCode]; } + if (self.hasUserAgent) { + [output appendFormat:@"%@%@: %@\n", indent, @"userAgent", self.userAgent]; + } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } - (void) storeInDictionary:(NSMutableDictionary *)dictionary { @@ -433,6 +451,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasProvisioningCode) { [dictionary setObject: self.provisioningCode forKey: @"provisioningCode"]; } + if (self.hasUserAgent) { + [dictionary setObject: self.userAgent forKey: @"userAgent"]; + } [self.unknownFields storeInDictionary:dictionary]; } - (BOOL) isEqual:(id)other { @@ -452,6 +473,8 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis (!self.hasNumber || [self.number isEqual:otherMessage.number]) && self.hasProvisioningCode == otherMessage.hasProvisioningCode && (!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])); } - (NSUInteger) hash { @@ -468,6 +491,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (self.hasProvisioningCode) { hashCode = hashCode * 31 + [self.provisioningCode hash]; } + if (self.hasUserAgent) { + hashCode = hashCode * 31 + [self.userAgent hash]; + } hashCode = hashCode * 31 + [self.unknownFields hash]; return hashCode; } @@ -523,6 +549,9 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis if (other.hasProvisioningCode) { [self setProvisioningCode:other.provisioningCode]; } + if (other.hasUserAgent) { + [self setUserAgent:other.userAgent]; + } [self mergeUnknownFields:other.unknownFields]; return self; } @@ -560,6 +589,10 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis [self setProvisioningCode:[input readString]]; break; } + case 42: { + [self setUserAgent:[input readString]]; + break; + } } } } @@ -627,6 +660,22 @@ static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvis resultProvisionMessage.provisioningCode = @""; 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