keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update cocoapods.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent bd7c8e4a4b
commit ee9a13cdf0
4 changed files with 126 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
Pods

@ -1 +1 @@
Subproject commit 60da392e16648441b23dd3491e14d5bf4c94aaf9
Subproject commit 086242800e27b3ee431ad23e9f29f3358e813059

12
SignalServiceKit/protobuf/OWSSignalServiceProtos.proto
Unescape Escape View File

@ -107,11 +107,12 @@ message DataMessage {
message Contact {
message Name {
optional string givenName = 1;
optional string familyName = 2;
optional string prefix = 3;
optional string suffix = 4;
optional string middleName = 5;
optional string givenName = 1;
optional string familyName = 2;
optional string prefix = 3;
optional string suffix = 4;
optional string middleName = 5;
optional string displayName = 6;
}
message Phone {
@ -168,6 +169,7 @@ message DataMessage {
repeated Email email = 4;
repeated PostalAddress address = 5;
optional Avatar avatar = 6;
optional string organization = 7;
}
optional string body = 1;

20
SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h
Unescape Escape View File

@ -1077,10 +1077,13 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
#define Contact_email @"email"
#define Contact_address @"address"
#define Contact_avatar @"avatar"
#define Contact_organization @"organization"
@interface OWSSignalServiceProtosDataMessageContact : PBGeneratedMessage<GeneratedMessageProtocol> {
@private
BOOL hasOrganization_:1;
BOOL hasName_:1;
BOOL hasAvatar_:1;
NSString* organization;
OWSSignalServiceProtosDataMessageContactName* name;
OWSSignalServiceProtosDataMessageContactAvatar* avatar;
NSMutableArray * numberArray;
@ -1089,11 +1092,13 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
}
- (BOOL) hasName;
- (BOOL) hasAvatar;
- (BOOL) hasOrganization;
@property (readonly, strong) OWSSignalServiceProtosDataMessageContactName* name;
@property (readonly, strong) NSArray<OWSSignalServiceProtosDataMessageContactPhone*> * number;
@property (readonly, strong) NSArray<OWSSignalServiceProtosDataMessageContactEmail*> * email;
@property (readonly, strong) NSArray<OWSSignalServiceProtosDataMessageContactPostalAddress*> * address;
@property (readonly, strong) OWSSignalServiceProtosDataMessageContactAvatar* avatar;
@property (readonly, strong) NSString* organization;
- (OWSSignalServiceProtosDataMessageContactPhone*)numberAtIndex:(NSUInteger)index;
- (OWSSignalServiceProtosDataMessageContactEmail*)emailAtIndex:(NSUInteger)index;
- (OWSSignalServiceProtosDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index;
@ -1121,6 +1126,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
#define Name_prefix @"prefix"
#define Name_suffix @"suffix"
#define Name_middleName @"middleName"
#define Name_displayName @"displayName"
@interface OWSSignalServiceProtosDataMessageContactName : PBGeneratedMessage<GeneratedMessageProtocol> {
@private
BOOL hasGivenName_:1;
@ -1128,22 +1134,26 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
BOOL hasPrefix_:1;
BOOL hasSuffix_:1;
BOOL hasMiddleName_:1;
BOOL hasDisplayName_:1;
NSString* givenName;
NSString* familyName;
NSString* prefix;
NSString* suffix;
NSString* middleName;
NSString* displayName;
}
- (BOOL) hasGivenName;
- (BOOL) hasFamilyName;
- (BOOL) hasPrefix;
- (BOOL) hasSuffix;
- (BOOL) hasMiddleName;
- (BOOL) hasDisplayName;
@property (readonly, strong) NSString* givenName;
@property (readonly, strong) NSString* familyName;
@property (readonly, strong) NSString* prefix;
@property (readonly, strong) NSString* suffix;
@property (readonly, strong) NSString* middleName;
@property (readonly, strong) NSString* displayName;
+ (instancetype) defaultInstance;
- (instancetype) defaultInstance;
@ -1204,6 +1214,11 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (NSString*) middleName;
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setMiddleName:(NSString*) value;
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearMiddleName;
- (BOOL) hasDisplayName;
- (NSString*) displayName;
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setDisplayName:(NSString*) value;
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearDisplayName;
@end
#define Phone_value @"value"
@ -1586,6 +1601,11 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (OWSSignalServiceProtosDataMessageContactBuilder*) setAvatarBuilder:(OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builderForValue;
- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeAvatar:(OWSSignalServiceProtosDataMessageContactAvatar*) value;
- (OWSSignalServiceProtosDataMessageContactBuilder*) clearAvatar;
- (BOOL) hasOrganization;
- (NSString*) organization;
- (OWSSignalServiceProtosDataMessageContactBuilder*) setOrganization:(NSString*) value;
- (OWSSignalServiceProtosDataMessageContactBuilder*) clearOrganization;
@end
@interface OWSSignalServiceProtosDataMessageBuilder : PBGeneratedMessageBuilder {

98
SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m
Unescape Escape View File

@ -4050,6 +4050,7 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag
@property (strong) NSMutableArray<OWSSignalServiceProtosDataMessageContactEmail*> * emailArray;
@property (strong) NSMutableArray<OWSSignalServiceProtosDataMessageContactPostalAddress*> * addressArray;
@property (strong) OWSSignalServiceProtosDataMessageContactAvatar* avatar;
@property (strong) NSString* organization;
@end
@implementation OWSSignalServiceProtosDataMessageContact
@ -4074,10 +4075,18 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag
hasAvatar_ = !!_value_;
}
@synthesize avatar;
- (BOOL) hasOrganization {
return !!hasOrganization_;
}
- (void) setHasOrganization:(BOOL) _value_ {
hasOrganization_ = !!_value_;
}
@synthesize organization;
- (instancetype) init {
if ((self = [super init])) {
self.name = [OWSSignalServiceProtosDataMessageContactName defaultInstance];
self.avatar = [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance];
self.organization = @"";
}
return self;
}
@ -4130,6 +4139,9 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
if (self.hasAvatar) {
[output writeMessage:6 value:self.avatar];
}
if (self.hasOrganization) {
[output writeString:7 value:self.organization];
}
[self.unknownFields writeToCodedOutputStream:output];
}
- (SInt32) serializedSize {
@ -4154,6 +4166,9 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
if (self.hasAvatar) {
size_ += computeMessageSize(6, self.avatar);
}
if (self.hasOrganization) {
size_ += computeStringSize(7, self.organization);
}
size_ += self.unknownFields.serializedSize;
memoizedSerializedSize = size_;
return size_;
@ -4219,6 +4234,9 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
withIndent:[NSString stringWithFormat:@"%@ ", indent]];
[output appendFormat:@"%@}\n", indent];
}
if (self.hasOrganization) {
[output appendFormat:@"%@%@: %@\n", indent, @"organization", self.organization];
}
[self.unknownFields writeDescriptionTo:output withIndent:indent];
}
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
@ -4247,6 +4265,9 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
[self.avatar storeInDictionary:messageDictionary];
[dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"avatar"];
}
if (self.hasOrganization) {
[dictionary setObject: self.organization forKey: @"organization"];
}
[self.unknownFields storeInDictionary:dictionary];
}
- (BOOL) isEqual:(id)other {
@ -4265,6 +4286,8 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
[self.addressArray isEqualToArray:otherMessage.addressArray] &&
self.hasAvatar == otherMessage.hasAvatar &&
(!self.hasAvatar || [self.avatar isEqual:otherMessage.avatar]) &&
self.hasOrganization == otherMessage.hasOrganization &&
(!self.hasOrganization || [self.organization isEqual:otherMessage.organization]) &&
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
}
- (NSUInteger) hash {
@ -4284,6 +4307,9 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
if (self.hasAvatar) {
hashCode = hashCode * 31 + [self.avatar hash];
}
if (self.hasOrganization) {
hashCode = hashCode * 31 + [self.organization hash];
}
hashCode = hashCode * 31 + [self.unknownFields hash];
return hashCode;
}
@ -4295,6 +4321,7 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
@property (strong) NSString* prefix;
@property (strong) NSString* suffix;
@property (strong) NSString* middleName;
@property (strong) NSString* displayName;
@end
@implementation OWSSignalServiceProtosDataMessageContactName
@ -4334,6 +4361,13 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
hasMiddleName_ = !!_value_;
}
@synthesize middleName;
- (BOOL) hasDisplayName {
return !!hasDisplayName_;
}
- (void) setHasDisplayName:(BOOL) _value_ {
hasDisplayName_ = !!_value_;
}
@synthesize displayName;
- (instancetype) init {
if ((self = [super init])) {
self.givenName = @"";
@ -4341,6 +4375,7 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa
self.prefix = @"";
self.suffix = @"";
self.middleName = @"";
self.displayName = @"";
}
return self;
}
@ -4375,6 +4410,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (self.hasMiddleName) {
[output writeString:5 value:self.middleName];
}
if (self.hasDisplayName) {
[output writeString:6 value:self.displayName];
}
[self.unknownFields writeToCodedOutputStream:output];
}
- (SInt32) serializedSize {
@ -4399,6 +4437,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (self.hasMiddleName) {
size_ += computeStringSize(5, self.middleName);
}
if (self.hasDisplayName) {
size_ += computeStringSize(6, self.displayName);
}
size_ += self.unknownFields.serializedSize;
memoizedSerializedSize = size_;
return size_;
@ -4449,6 +4490,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (self.hasMiddleName) {
[output appendFormat:@"%@%@: %@\n", indent, @"middleName", self.middleName];
}
if (self.hasDisplayName) {
[output appendFormat:@"%@%@: %@\n", indent, @"displayName", self.displayName];
}
[self.unknownFields writeDescriptionTo:output withIndent:indent];
}
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
@ -4467,6 +4511,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (self.hasMiddleName) {
[dictionary setObject: self.middleName forKey: @"middleName"];
}
if (self.hasDisplayName) {
[dictionary setObject: self.displayName forKey: @"displayName"];
}
[self.unknownFields storeInDictionary:dictionary];
}
- (BOOL) isEqual:(id)other {
@ -4488,6 +4535,8 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
(!self.hasSuffix || [self.suffix isEqual:otherMessage.suffix]) &&
self.hasMiddleName == otherMessage.hasMiddleName &&
(!self.hasMiddleName || [self.middleName isEqual:otherMessage.middleName]) &&
self.hasDisplayName == otherMessage.hasDisplayName &&
(!self.hasDisplayName || [self.displayName isEqual:otherMessage.displayName]) &&
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
}
- (NSUInteger) hash {
@ -4507,6 +4556,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (self.hasMiddleName) {
hashCode = hashCode * 31 + [self.middleName hash];
}
if (self.hasDisplayName) {
hashCode = hashCode * 31 + [self.displayName hash];
}
hashCode = hashCode * 31 + [self.unknownFields hash];
return hashCode;
}
@ -4565,6 +4617,9 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
if (other.hasMiddleName) {
[self setMiddleName:other.middleName];
}
if (other.hasDisplayName) {
[self setDisplayName:other.displayName];
}
[self mergeUnknownFields:other.unknownFields];
return self;
}
@ -4606,6 +4661,10 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
[self setMiddleName:[input readString]];
break;
}
case 50: {
[self setDisplayName:[input readString]];
break;
}
}
}
}
@ -4689,6 +4748,22 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt
resultName.middleName = @"";
return self;
}
- (BOOL) hasDisplayName {
return resultName.hasDisplayName;
}
- (NSString*) displayName {
return resultName.displayName;
}
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setDisplayName:(NSString*) value {
resultName.hasDisplayName = YES;
resultName.displayName = value;
return self;
}
- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearDisplayName {
resultName.hasDisplayName = NO;
resultName.displayName = @"";
return self;
}
@end
@interface OWSSignalServiceProtosDataMessageContactPhone ()
@ -6336,6 +6411,9 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr
if (other.hasAvatar) {
[self mergeAvatar:other.avatar];
}
if (other.hasOrganization) {
[self setOrganization:other.organization];
}
[self mergeUnknownFields:other.unknownFields];
return self;
}
@ -6393,6 +6471,10 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr
[self setAvatar:[subBuilder buildPartial]];
break;
}
case 58: {
[self setOrganization:[input readString]];
break;
}
}
}
}
@ -6519,6 +6601,22 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr
resultContact.avatar = [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance];
return self;
}
- (BOOL) hasOrganization {
return resultContact.hasOrganization;
}
- (NSString*) organization {
return resultContact.organization;
}
- (OWSSignalServiceProtosDataMessageContactBuilder*) setOrganization:(NSString*) value {
resultContact.hasOrganization = YES;
resultContact.organization = value;
return self;
}
- (OWSSignalServiceProtosDataMessageContactBuilder*) clearOrganization {
resultContact.hasOrganization = NO;
resultContact.organization = @"";
return self;
}
@end
@interface OWSSignalServiceProtosDataMessageBuilder()

Write Preview
Loading…
Cancel
Save