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

tentative proto changes

Browse Source 
// FREEBIE
pull/1/head
Michael Kirk 7 years ago
parent 51a4298c14
commit 3334f2a063
6 changed files with 890 additions and 578 deletions
Show Stats Download Patch File Download Diff File

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

@ -88,10 +88,16 @@ message DataMessage {
} }
message Quote { message Quote {
message QuotedAttachment {
optional string contentType = 1;
optional string fileName = 2;
optional AttachmentPointer thumbnail = 3;
}
optional uint64 id = 1; optional uint64 id = 1;
optional string author = 2; optional string author = 2;
optional string text = 3; optional string text = 3;
repeated AttachmentPointer attachments = 4; repeated QuotedAttachment attachments = 4;
} }
optional string body = 1; optional string body = 1;

19
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
Unescape Escape View File

@ -476,18 +476,17 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
for (OWSAttachmentInfo *attachment in quotedMessage.quotedAttachments) { for (OWSAttachmentInfo *attachment in quotedMessage.quotedAttachments) {
hasQuotedAttachment = YES; hasQuotedAttachment = YES;
// Add non-thumbnail quoted attachment OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder *quotedAttachmentBuilder = [OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder new];
OWSSignalServiceProtosAttachmentPointerBuilder *attachmentBuilder =
[OWSSignalServiceProtosAttachmentPointerBuilder new]; quotedAttachmentBuilder.contentType = attachment.contentType;
attachmentBuilder.contentType = attachment.contentType; quotedAttachmentBuilder.fileName = attachment.sourceFilename;
attachmentBuilder.fileName = attachment.sourceFilename;
[quoteBuilder addAttachments:[attachmentBuilder build]];
// FIXME handle thumbnail uploading. The proto changes for this are up in the air. // FIXME handle thumbnail uploading. The proto changes for this are up in the air.
// OWSAssert([attachment isKindOfClass:[TSAttachmentStream class]]); // if (attachment.thumbnailAttachmentId) {
// [quoteBuilder addAttachments:[self buildProtoForAttachmentStream:attachment // quotedAttachmentBuilder.thumbnail = [self buildProtoForAttachmentId:attachment.attachmentThumbnailId];
// filename:attachment.sourceFilename]];] // }
[quoteBuilder addAttachments:[quotedAttachmentBuilder build]];
} }
} }

64
SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m
Unescape Escape View File

@ -214,38 +214,38 @@ NS_ASSUME_NONNULL_BEGIN
// //
- (void)createThumbnailAttachmentIfNecessaryWithTransaction:(YapDatabaseReadWriteTransaction *)transaction - (void)createThumbnailAttachmentIfNecessaryWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
{ {
for (OWSAttachmentInfo *info in self.quotedAttachments) { // for (OWSAttachmentInfo *info in self.quotedAttachments) {
// TODO should we just cach an optional TSAttachment on the info? // // TODO should we just cach an optional TSAttachment on the info?
OWSAssert(info.attachmentId); // OWSAssert(info.attachmentId);
TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:info.attachmentId transaction:transaction]; // TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:info.attachmentId transaction:transaction];
if (![attachment isKindOfClass:[TSAttachmentStream class]]) { // if (![attachment isKindOfClass:[TSAttachmentStream class]]) {
return; // return;
} // }
//
TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachmentStream; // TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachmentStream;
NSData *thumbnailData = attachmentStream.thumbnailData; // NSData *thumbnailData = attachmentStream.thumbnailData;
// Only some media types have thumbnails // // Only some media types have thumbnails
if (thumbnailData) { // if (thumbnailData) {
// Copy the thumbnail to a new attachment. // // Copy the thumbnail to a new attachment.
NSString *thumbnailName = // NSString *thumbnailName =
[NSString stringWithFormat:@"quoted-thumbnail-%@", attachmentStream.sourceFilename]; // [NSString stringWithFormat:@"quoted-thumbnail-%@", attachmentStream.sourceFilename];
TSAttachmentStream *thumbnailAttachment = // TSAttachmentStream *thumbnailAttachment =
[[TSAttachmentStream alloc] initWithContentType:OWSMimeTypeJpeg // [[TSAttachmentStream alloc] initWithContentType:OWSMimeTypeJpeg
byteCount:attachmentStream.byteCount // byteCount:attachmentStream.byteCount
sourceFilename:thumbnailName]; // sourceFilename:thumbnailName];
//
NSError *error; // NSError *error;
[thumbnailAttachment writeData:thumbnailData error:&error]; // [thumbnailAttachment writeData:thumbnailData error:&error];
if (error) { // if (error) {
DDLogError(@"%@ Couldn't copy attachment data for message sent to self: %@.", self.logTag, error); // DDLogError(@"%@ Couldn't copy attachment data for message sent to self: %@.", self.logTag, error);
} else { // } else {
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { // [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[thumbnailAttachment saveWithTransaction:transaction]; // [thumbnailAttachment saveWithTransaction:transaction];
quotedMessage.attachments = [message saveWithTransaction:transaction]; // quotedMessage.attachments = [message saveWithTransaction:transaction];
}]; // }];
} // }
} // }
} // }
} }
@end @end

23
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -1096,12 +1096,12 @@ NS_ASSUME_NONNULL_BEGIN
} }
NSMutableArray<OWSAttachmentInfo *> *attachmentInfos = [NSMutableArray new]; NSMutableArray<OWSAttachmentInfo *> *attachmentInfos = [NSMutableArray new];
for (OWSSignalServiceProtosAttachmentPointer *attachmentPointer in quoteProto.attachments) { for (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *quotedAttachment in quoteProto.attachments) {
hasAttachment = YES; hasAttachment = YES;
OWSAttachmentInfo *attachmentInfo = OWSAttachmentInfo *attachmentInfo =
[[OWSAttachmentInfo alloc] initWithAttachmentId:nil [[OWSAttachmentInfo alloc] initWithAttachmentId:nil
contentType:attachmentPointer.contentType contentType:quotedAttachment.contentType
sourceFilename:attachmentPointer.fileName]; sourceFilename:quotedAttachment.fileName];
[attachmentInfos addObject:attachmentInfo]; [attachmentInfos addObject:attachmentInfo];
} }
// TODO - but only if the attachment can't be found locally. // TODO - but only if the attachment can't be found locally.
@ -1137,19 +1137,10 @@ NS_ASSUME_NONNULL_BEGIN
return nil; return nil;
} }
// TSQuotedMessage *quotedMessage = [[TSQuotedMessage alloc] initIncomingWithTimestamp:timestamp return [[TSQuotedMessage alloc] initWithTimestamp:timestamp
// authorId:authorId authorId:authorId
// body:body body:body
// sourceFilename:sourceFilename quotedAttachmentInfos:attachmentInfos];
// thumbnailData:thumbnailData
// contentType:contentType];
TSQuotedMessage *quotedMessage = [[TSQuotedMessage alloc] initWithTimestamp:timestamp
authorId:authorId
body:body
quotedAttachmentInfos:attachmentInfos];
return quotedMessage;
} }
- (void)finalizeIncomingMessage:(TSIncomingMessage *)incomingMessage - (void)finalizeIncomingMessage:(TSIncomingMessage *)incomingMessage

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

@ -28,6 +28,8 @@
@class OWSSignalServiceProtosDataMessageBuilder; @class OWSSignalServiceProtosDataMessageBuilder;
@class OWSSignalServiceProtosDataMessageQuote; @class OWSSignalServiceProtosDataMessageQuote;
@class OWSSignalServiceProtosDataMessageQuoteBuilder; @class OWSSignalServiceProtosDataMessageQuoteBuilder;
@class OWSSignalServiceProtosDataMessageQuoteQuotedAttachment;
@class OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder;
@class OWSSignalServiceProtosEnvelope; @class OWSSignalServiceProtosEnvelope;
@class OWSSignalServiceProtosEnvelopeBuilder; @class OWSSignalServiceProtosEnvelopeBuilder;
@class OWSSignalServiceProtosGroupContext; @class OWSSignalServiceProtosGroupContext;
@ -808,14 +810,14 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
BOOL hasTimestamp_:1; BOOL hasTimestamp_:1;
BOOL hasBody_:1; BOOL hasBody_:1;
BOOL hasGroup_:1; BOOL hasGroup_:1;
BOOL hasQuote_ : 1; BOOL hasQuote_:1;
BOOL hasProfileKey_:1; BOOL hasProfileKey_:1;
BOOL hasFlags_:1; BOOL hasFlags_:1;
BOOL hasExpireTimer_:1; BOOL hasExpireTimer_:1;
UInt64 timestamp; UInt64 timestamp;
NSString* body; NSString* body;
OWSSignalServiceProtosGroupContext* group; OWSSignalServiceProtosGroupContext* group;
OWSSignalServiceProtosDataMessageQuote *quote; OWSSignalServiceProtosDataMessageQuote* quote;
NSData* profileKey; NSData* profileKey;
UInt32 flags; UInt32 flags;
UInt32 expireTimer; UInt32 expireTimer;
@ -827,7 +829,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (BOOL) hasExpireTimer; - (BOOL) hasExpireTimer;
- (BOOL) hasProfileKey; - (BOOL) hasProfileKey;
- (BOOL) hasTimestamp; - (BOOL) hasTimestamp;
- (BOOL)hasQuote; - (BOOL) hasQuote;
@property (readonly, strong) NSString* body; @property (readonly, strong) NSString* body;
@property (readonly, strong) NSArray<OWSSignalServiceProtosAttachmentPointer*> * attachments; @property (readonly, strong) NSArray<OWSSignalServiceProtosAttachmentPointer*> * attachments;
@property (readonly, strong) OWSSignalServiceProtosGroupContext* group; @property (readonly, strong) OWSSignalServiceProtosGroupContext* group;
@ -835,7 +837,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
@property (readonly) UInt32 expireTimer; @property (readonly) UInt32 expireTimer;
@property (readonly, strong) NSData* profileKey; @property (readonly, strong) NSData* profileKey;
@property (readonly) UInt64 timestamp; @property (readonly) UInt64 timestamp;
@property (readonly, strong) OWSSignalServiceProtosDataMessageQuote *quote; @property (readonly, strong) OWSSignalServiceProtosDataMessageQuote* quote;
- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index; - (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index;
+ (instancetype) defaultInstance; + (instancetype) defaultInstance;
@ -860,85 +862,151 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
#define Quote_author @"author" #define Quote_author @"author"
#define Quote_text @"text" #define Quote_text @"text"
#define Quote_attachments @"attachments" #define Quote_attachments @"attachments"
@interface OWSSignalServiceProtosDataMessageQuote : PBGeneratedMessage <GeneratedMessageProtocol> { @interface OWSSignalServiceProtosDataMessageQuote : PBGeneratedMessage<GeneratedMessageProtocol> {
@private @private
BOOL hasId_ : 1; BOOL hasId_:1;
BOOL hasAuthor_ : 1; BOOL hasAuthor_:1;
BOOL hasText_ : 1; BOOL hasText_:1;
UInt64 id; UInt64 id;
NSString *author; NSString* author;
NSString *text; NSString* text;
NSMutableArray *attachmentsArray; NSMutableArray * attachmentsArray;
} }
- (BOOL)hasId; - (BOOL) hasId;
- (BOOL)hasAuthor; - (BOOL) hasAuthor;
- (BOOL)hasText; - (BOOL) hasText;
@property (readonly) UInt64 id; @property (readonly) UInt64 id;
@property (readonly, strong) NSString *author; @property (readonly, strong) NSString* author;
@property (readonly, strong) NSString *text; @property (readonly, strong) NSString* text;
@property (readonly, strong) NSArray<OWSSignalServiceProtosAttachmentPointer *> *attachments; @property (readonly, strong) NSArray<OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*> * attachments;
- (OWSSignalServiceProtosAttachmentPointer *)attachmentsAtIndex:(NSUInteger)index; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index;
+ (instancetype)defaultInstance; + (instancetype) defaultInstance;
- (instancetype)defaultInstance; - (instancetype) defaultInstance;
- (BOOL)isInitialized; - (BOOL) isInitialized;
- (void)writeToCodedOutputStream:(PBCodedOutputStream *)output; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)builder; - (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder;
+ (OWSSignalServiceProtosDataMessageQuoteBuilder *)builder; + (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder;
+ (OWSSignalServiceProtosDataMessageQuoteBuilder *)builderWithPrototype: + (OWSSignalServiceProtosDataMessageQuoteBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuote*) prototype;
(OWSSignalServiceProtosDataMessageQuote *)prototype; - (OWSSignalServiceProtosDataMessageQuoteBuilder*) toBuilder;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)toBuilder;
+ (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromData:(NSData *)data; + (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromData:(NSData *)data + (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input;
extensionRegistry:(PBExtensionRegistry *)extensionRegistry; + (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromInputStream:(NSInputStream *)input; + (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromInputStream:(NSInputStream *)input + (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
extensionRegistry:(PBExtensionRegistry *)extensionRegistry;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromCodedInputStream:(PBCodedInputStream *)input;
+ (OWSSignalServiceProtosDataMessageQuote *)parseFromCodedInputStream:(PBCodedInputStream *)input
extensionRegistry:(PBExtensionRegistry *)extensionRegistry;
@end @end
@interface OWSSignalServiceProtosDataMessageQuoteBuilder : PBGeneratedMessageBuilder { #define QuotedAttachment_contentType @"contentType"
#define QuotedAttachment_fileName @"fileName"
#define QuotedAttachment_thumbnail @"thumbnail"
@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachment : PBGeneratedMessage<GeneratedMessageProtocol> {
@private @private
OWSSignalServiceProtosDataMessageQuote *resultQuote; BOOL hasContentType_:1;
BOOL hasFileName_:1;
BOOL hasThumbnail_:1;
NSString* contentType;
NSString* fileName;
OWSSignalServiceProtosAttachmentPointer* thumbnail;
} }
- (BOOL) hasContentType;
- (BOOL) hasFileName;
- (BOOL) hasThumbnail;
@property (readonly, strong) NSString* contentType;
@property (readonly, strong) NSString* fileName;
@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* thumbnail;
- (OWSSignalServiceProtosDataMessageQuote *)defaultInstance; + (instancetype) defaultInstance;
- (instancetype) defaultInstance;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clear; - (BOOL) isInitialized;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clone; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) prototype;
- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) toBuilder;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input;
+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
@end
@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder : PBGeneratedMessageBuilder {
@private
OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* resultQuotedAttachment;
}
- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) defaultInstance;
- (OWSSignalServiceProtosDataMessageQuote *)build; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clear;
- (OWSSignalServiceProtosDataMessageQuote *)buildPartial; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clone;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)mergeFrom:(OWSSignalServiceProtosDataMessageQuote *)other; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) build;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)mergeFromCodedInputStream:(PBCodedInputStream *)input; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) buildPartial;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)mergeFromCodedInputStream:(PBCodedInputStream *)input
extensionRegistry:(PBExtensionRegistry *)extensionRegistry;
- (BOOL)hasId; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) other;
- (UInt64)id; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setId:(UInt64)value; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearId;
- (BOOL)hasAuthor; - (BOOL) hasContentType;
- (NSString *)author; - (NSString*) contentType;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setAuthor:(NSString *)value; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setContentType:(NSString*) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearAuthor; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearContentType;
- (BOOL)hasText; - (BOOL) hasFileName;
- (NSString *)text; - (NSString*) fileName;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setText:(NSString *)value; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setFileName:(NSString*) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearText; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearFileName;
- (NSMutableArray<OWSSignalServiceProtosAttachmentPointer *> *)attachments; - (BOOL) hasThumbnail;
- (OWSSignalServiceProtosAttachmentPointer *)attachmentsAtIndex:(NSUInteger)index; - (OWSSignalServiceProtosAttachmentPointer*) thumbnail;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)addAttachments:(OWSSignalServiceProtosAttachmentPointer *)value; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setAttachmentsArray: - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnailBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue;
(NSArray<OWSSignalServiceProtosAttachmentPointer *> *)array; - (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value;
- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearThumbnail;
@end
@interface OWSSignalServiceProtosDataMessageQuoteBuilder : PBGeneratedMessageBuilder {
@private
OWSSignalServiceProtosDataMessageQuote* resultQuote;
}
- (OWSSignalServiceProtosDataMessageQuote*) defaultInstance;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clear;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clone;
- (OWSSignalServiceProtosDataMessageQuote*) build;
- (OWSSignalServiceProtosDataMessageQuote*) buildPartial;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuote*) other;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
- (BOOL) hasId;
- (UInt64) id;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setId:(UInt64) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearId;
- (BOOL) hasAuthor;
- (NSString*) author;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setAuthor:(NSString*) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearAuthor;
- (BOOL) hasText;
- (NSString*) text;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setText:(NSString*) value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearText;
- (NSMutableArray<OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*> *)attachments;
- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)addAttachments:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)value;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setAttachmentsArray:(NSArray<OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*> *)array;
- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearAttachments; - (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearAttachments;
@end @end
@ -997,13 +1065,12 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (OWSSignalServiceProtosDataMessageBuilder*) setTimestamp:(UInt64) value; - (OWSSignalServiceProtosDataMessageBuilder*) setTimestamp:(UInt64) value;
- (OWSSignalServiceProtosDataMessageBuilder*) clearTimestamp; - (OWSSignalServiceProtosDataMessageBuilder*) clearTimestamp;
- (BOOL)hasQuote; - (BOOL) hasQuote;
- (OWSSignalServiceProtosDataMessageQuote *)quote; - (OWSSignalServiceProtosDataMessageQuote*) quote;
- (OWSSignalServiceProtosDataMessageBuilder *)setQuote:(OWSSignalServiceProtosDataMessageQuote *)value; - (OWSSignalServiceProtosDataMessageBuilder*) setQuote:(OWSSignalServiceProtosDataMessageQuote*) value;
- (OWSSignalServiceProtosDataMessageBuilder *)setQuoteBuilder: - (OWSSignalServiceProtosDataMessageBuilder*) setQuoteBuilder:(OWSSignalServiceProtosDataMessageQuoteBuilder*) builderForValue;
(OWSSignalServiceProtosDataMessageQuoteBuilder *)builderForValue; - (OWSSignalServiceProtosDataMessageBuilder*) mergeQuote:(OWSSignalServiceProtosDataMessageQuote*) value;
- (OWSSignalServiceProtosDataMessageBuilder *)mergeQuote:(OWSSignalServiceProtosDataMessageQuote *)value; - (OWSSignalServiceProtosDataMessageBuilder*) clearQuote;
- (OWSSignalServiceProtosDataMessageBuilder *)clearQuote;
@end @end
#define NullMessage_padding @"padding" #define NullMessage_padding @"padding"

1137
SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save