diff --git a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m index d331ad0e6..20e96a194 100644 --- a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m +++ b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m @@ -3,7 +3,7 @@ // #import "OWSBlockedPhoneNumbersMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -32,12 +32,12 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { - OWSSignalServiceProtosSyncMessageBlockedBuilder *blockedPhoneNumbersBuilder = - [OWSSignalServiceProtosSyncMessageBlockedBuilder new]; + SSKProtoSyncMessageBlockedBuilder *blockedPhoneNumbersBuilder = + [SSKProtoSyncMessageBlockedBuilder new]; [blockedPhoneNumbersBuilder setNumbersArray:_phoneNumbers]; - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; [syncMessageBuilder setBlocked:[blockedPhoneNumbersBuilder build]]; return syncMessageBuilder; diff --git a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m index fdcb5a8c2..c772f3c11 100644 --- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m @@ -11,10 +11,10 @@ #import "OWSBlockingManager.h" #import "OWSDisappearingMessagesConfiguration.h" #import "OWSRecipientIdentity.h" -#import "OWSSignalServiceProtos.pb.h" #import "SignalAccount.h" #import "TSContactThread.h" #import +#import NS_ASSUME_NONNULL_BEGIN @@ -31,7 +31,7 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration OWSAssert(signalAccount.contact); OWSAssert(contactsManager); - OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new]; + SSKProtoContactDetailsBuilder *contactBuilder = [SSKProtoContactDetailsBuilder new]; [contactBuilder setName:signalAccount.contact.fullName]; [contactBuilder setNumber:signalAccount.recipientId]; #ifdef CONVERSATION_COLORS_ENABLED @@ -39,7 +39,7 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration #endif if (recipientIdentity != nil) { - OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new]; + SSKProtoVerifiedBuilder *verifiedBuilder = [SSKProtoVerifiedBuilder new]; verifiedBuilder.destination = recipientIdentity.recipientId; verifiedBuilder.identityKey = [recipientIdentity.identityKey prependKeyType]; verifiedBuilder.state = OWSVerificationStateToProtoState(recipientIdentity.verificationState); @@ -51,8 +51,8 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration if (rawAvatar) { avatarPng = UIImagePNGRepresentation(rawAvatar); if (avatarPng) { - OWSSignalServiceProtosContactDetailsAvatarBuilder *avatarBuilder = - [OWSSignalServiceProtosContactDetailsAvatarBuilder new]; + SSKProtoContactDetailsAvatarBuilder *avatarBuilder = + [SSKProtoContactDetailsAvatarBuilder new]; [avatarBuilder setContentType:OWSMimeTypeImagePng]; [avatarBuilder setLength:(uint32_t)avatarPng.length]; diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m index 99051ab2a..00459cee3 100644 --- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m @@ -5,10 +5,10 @@ #import "OWSGroupsOutputStream.h" #import "MIMETypeUtil.h" #import "OWSDisappearingMessagesConfiguration.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSGroupModel.h" #import "TSGroupThread.h" #import +#import NS_ASSUME_NONNULL_BEGIN @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN TSGroupModel *group = groupThread.groupModel; OWSAssert(group); - OWSSignalServiceProtosGroupDetailsBuilder *groupBuilder = [OWSSignalServiceProtosGroupDetailsBuilder new]; + SSKProtoGroupDetailsBuilder *groupBuilder = [SSKProtoGroupDetailsBuilder new]; [groupBuilder setId:group.groupId]; [groupBuilder setName:group.groupName]; [groupBuilder setMembersArray:group.groupMemberIds]; @@ -32,8 +32,8 @@ NS_ASSUME_NONNULL_BEGIN NSData *avatarPng; if (group.groupImage) { - OWSSignalServiceProtosGroupDetailsAvatarBuilder *avatarBuilder = - [OWSSignalServiceProtosGroupDetailsAvatarBuilder new]; + SSKProtoGroupDetailsAvatarBuilder *avatarBuilder = + [SSKProtoGroupDetailsAvatarBuilder new]; [avatarBuilder setContentType:OWSMimeTypeImagePng]; avatarPng = UIImagePNGRepresentation(group.groupImage); diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m index 9934508c1..0aece176b 100644 --- a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m +++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m @@ -4,7 +4,7 @@ #import "OWSReadReceiptsForLinkedDevicesMessage.h" #import "OWSLinkedDeviceReadReceipt.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -33,12 +33,12 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; for (OWSLinkedDeviceReadReceipt *readReceipt in self.readReceipts) { - OWSSignalServiceProtosSyncMessageReadBuilder *readProtoBuilder = - [OWSSignalServiceProtosSyncMessageReadBuilder new]; + SSKProtoSyncMessageReadBuilder *readProtoBuilder = + [SSKProtoSyncMessageReadBuilder new]; [readProtoBuilder setSender:readReceipt.senderId]; [readProtoBuilder setTimestamp:readReceipt.messageIdTimestamp]; [syncMessageBuilder addRead:[readProtoBuilder build]]; diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m b/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m index 37fd29c0e..d17e9a1e3 100644 --- a/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m +++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForSenderMessage.m @@ -4,8 +4,8 @@ #import "OWSReadReceiptsForSenderMessage.h" #import "NSDate+OWS.h" -#import "OWSSignalServiceProtos.pb.h" #import "SignalRecipient.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -54,20 +54,20 @@ NS_ASSUME_NONNULL_BEGIN return YES; } -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { OWSAssert(recipient); - OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new]; + SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new]; [contentBuilder setReceiptMessage:[self buildReceiptMessage:recipient.recipientId]]; return [[contentBuilder build] data]; } -- (OWSSignalServiceProtosReceiptMessage *)buildReceiptMessage:(NSString *)recipientId +- (SSKProtoReceiptMessage *)buildReceiptMessage:(NSString *)recipientId { - OWSSignalServiceProtosReceiptMessageBuilder *builder = [OWSSignalServiceProtosReceiptMessageBuilder new]; + SSKProtoReceiptMessageBuilder *builder = [SSKProtoReceiptMessageBuilder new]; - [builder setType:OWSSignalServiceProtosReceiptMessageTypeRead]; + [builder setType:SSKProtoReceiptMessageTypeRead]; OWSAssert(self.messageTimestamps.count > 0); for (NSNumber *messageTimestamp in self.messageTimestamps) { [builder addTimestamp:[messageTimestamp unsignedLongLongValue]]; diff --git a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m index 546709cb7..ad0083b81 100644 --- a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m +++ b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m @@ -5,7 +5,7 @@ #import "OWSVerificationStateSyncMessage.h" #import "Cryptography.h" #import "OWSIdentityManager.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { OWSAssert(self.identityKey.length == kIdentityKeyLength); OWSAssert(self.verificationForRecipientId.length > 0); @@ -63,9 +63,9 @@ NS_ASSUME_NONNULL_BEGIN // will figure that out on it's own. OWSAssert(self.verificationState != OWSVerificationStateNoLongerVerified); - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; - OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new]; + SSKProtoVerifiedBuilder *verifiedBuilder = [SSKProtoVerifiedBuilder new]; verifiedBuilder.destination = self.verificationForRecipientId; verifiedBuilder.identityKey = self.identityKey; verifiedBuilder.state = OWSVerificationStateToProtoState(self.verificationState); @@ -93,7 +93,7 @@ NS_ASSUME_NONNULL_BEGIN // will figure that out on it's own. OWSAssert(self.verificationState != OWSVerificationStateNoLongerVerified); - OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new]; + SSKProtoVerifiedBuilder *verifiedBuilder = [SSKProtoVerifiedBuilder new]; verifiedBuilder.destination = self.verificationForRecipientId; verifiedBuilder.identityKey = self.identityKey; verifiedBuilder.state = OWSVerificationStateToProtoState(self.verificationState); diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h index 361aa9676..30bfd0f1d 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.h @@ -9,7 +9,7 @@ extern NSString *const kAttachmentDownloadProgressKey; extern NSString *const kAttachmentDownloadAttachmentIDKey; @class OWSPrimaryStorage; -@class OWSSignalServiceProtosAttachmentPointer; +@class SSKProtoAttachmentPointer; @class TSAttachmentPointer; @class TSAttachmentStream; @class TSMessage; @@ -29,7 +29,7 @@ extern NSString *const kAttachmentDownloadAttachmentIDKey; - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithAttachmentProtos:(NSArray *)attachmentProtos +- (instancetype)initWithAttachmentProtos:(NSArray *)attachmentProtos networkManager:(TSNetworkManager *)networkManager transaction:(YapDatabaseReadWriteTransaction *)transaction NS_DESIGNATED_INITIALIZER; diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m index f99cf0f19..4ceab32f1 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m @@ -11,7 +11,6 @@ #import "OWSError.h" #import "OWSPrimaryStorage.h" #import "OWSRequestFactory.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSAttachmentPointer.h" #import "TSAttachmentStream.h" #import "TSGroupModel.h" @@ -20,6 +19,7 @@ #import "TSMessage.h" #import "TSNetworkManager.h" #import "TSThread.h" +#import #import NS_ASSUME_NONNULL_BEGIN @@ -56,7 +56,7 @@ static const CGFloat kAttachmentDownloadProgressTheta = 0.001f; return self; } -- (instancetype)initWithAttachmentProtos:(NSArray *)attachmentProtos +- (instancetype)initWithAttachmentProtos:(NSArray *)attachmentProtos networkManager:(TSNetworkManager *)networkManager transaction:(YapDatabaseReadWriteTransaction *)transaction { @@ -70,7 +70,7 @@ static const CGFloat kAttachmentDownloadProgressTheta = 0.001f; NSMutableArray *attachmentIds = [NSMutableArray new]; NSMutableArray *attachmentPointers = [NSMutableArray new]; - for (OWSSignalServiceProtosAttachmentPointer *attachmentProto in attachmentProtos) { + for (SSKProtoAttachmentPointer *attachmentProto in attachmentProtos) { TSAttachmentPointer *pointer = [TSAttachmentPointer attachmentPointerFromProto:attachmentProto]; [attachmentIds addObject:pointer.uniqueId]; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h index 9920d6813..3baa16022 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import "OWSSignalServiceProtos.pb.h" +#import "SignalServiceKit-Swift.h" #import "TSAttachment.h" NS_ASSUME_NONNULL_BEGIN @@ -28,7 +28,7 @@ typedef NS_ENUM(NSUInteger, TSAttachmentPointerState) { sourceFilename:(nullable NSString *)sourceFilename attachmentType:(TSAttachmentType)attachmentType NS_DESIGNATED_INITIALIZER; -+ (TSAttachmentPointer *)attachmentPointerFromProto:(OWSSignalServiceProtosAttachmentPointer *)attachmentProto; ++ (TSAttachmentPointer *)attachmentPointerFromProto:(SSKProtoAttachmentPointer *)attachmentProto; @property (atomic) TSAttachmentPointerState state; @property (nullable, atomic) NSString *mostRecentFailureLocalizedText; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m index 00a61c68d..ef19ef974 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN } -+ (TSAttachmentPointer *)attachmentPointerFromProto:(OWSSignalServiceProtosAttachmentPointer *)attachmentProto ++ (TSAttachmentPointer *)attachmentPointerFromProto:(SSKProtoAttachmentPointer *)attachmentProto { OWSAssert(attachmentProto.id != 0); OWSAssert(attachmentProto.key != nil); @@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN TSAttachmentType attachmentType = TSAttachmentTypeDefault; if ([attachmentProto hasFlags]) { UInt32 flags = attachmentProto.flags; - if ((flags & (UInt32)OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage) > 0) { + if ((flags & (UInt32)SSKProtoAttachmentPointerFlagsVoiceMessage) > 0) { attachmentType = TSAttachmentTypeVoiceMessage; } } diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h index 2d2d43c8b..bc73c6bce 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosAttachmentPointer; +@class SSKProtoAttachmentPointer; @class TSAttachmentPointer; @class YapDatabaseReadWriteTransaction; @@ -90,9 +90,9 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Protobuf -+ (nullable OWSSignalServiceProtosAttachmentPointer *)buildProtoForAttachmentId:(nullable NSString *)attachmentId; ++ (nullable SSKProtoAttachmentPointer *)buildProtoForAttachmentId:(nullable NSString *)attachmentId; -- (OWSSignalServiceProtosAttachmentPointer *)buildProto; +- (SSKProtoAttachmentPointer *)buildProto; @end diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index a42666d52..1094bcd91 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -769,7 +769,7 @@ NS_ASSUME_NONNULL_BEGIN // MARK: Protobuf serialization -+ (nullable OWSSignalServiceProtosAttachmentPointer *)buildProtoForAttachmentId:(nullable NSString *)attachmentId ++ (nullable SSKProtoAttachmentPointer *)buildProtoForAttachmentId:(nullable NSString *)attachmentId { OWSAssert(attachmentId.length > 0); @@ -787,9 +787,9 @@ NS_ASSUME_NONNULL_BEGIN } -- (OWSSignalServiceProtosAttachmentPointer *)buildProto +- (SSKProtoAttachmentPointer *)buildProto { - OWSSignalServiceProtosAttachmentPointerBuilder *builder = [OWSSignalServiceProtosAttachmentPointerBuilder new]; + SSKProtoAttachmentPointerBuilder *builder = [SSKProtoAttachmentPointerBuilder new]; builder.id = self.serverId; @@ -802,7 +802,7 @@ NS_ASSUME_NONNULL_BEGIN builder.size = self.byteCount; builder.key = self.encryptionKey; builder.digest = self.digest; - builder.flags = self.isVoiceMessage ? OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage : 0; + builder.flags = self.isVoiceMessage ? SSKProtoAttachmentPointerFlagsVoiceMessage : 0; if (self.shouldHaveImageSize) { CGSize imageSize = self.imageSize; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h index a6b9d3737..4a7ad6175 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h @@ -5,9 +5,9 @@ NS_ASSUME_NONNULL_BEGIN @class OWSContact; -@class OWSSignalServiceProtosAttachmentPointer; -@class OWSSignalServiceProtosDataMessage; -@class OWSSignalServiceProtosSyncMessageSent; +@class SSKProtoAttachmentPointer; +@class SSKProtoDataMessage; +@class SSKProtoSyncMessageSent; @class TSQuotedMessage; @class TSThread; @class YapDatabaseReadWriteTransaction; @@ -18,10 +18,10 @@ NS_ASSUME_NONNULL_BEGIN */ @interface OWSIncomingSentMessageTranscript : NSObject -- (instancetype)initWithProto:(OWSSignalServiceProtosSyncMessageSent *)sentProto +- (instancetype)initWithProto:(SSKProtoSyncMessageSent *)sentProto transaction:(YapDatabaseReadWriteTransaction *)transaction; -@property (nonatomic, readonly) OWSSignalServiceProtosDataMessage *dataMessage; +@property (nonatomic, readonly) SSKProtoDataMessage *dataMessage; @property (nonatomic, readonly) NSString *recipientId; @property (nonatomic, readonly) uint64_t timestamp; @property (nonatomic, readonly) uint64_t expirationStartedAt; @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) BOOL isEndSessionMessage; @property (nonatomic, readonly, nullable) NSData *groupId; @property (nonatomic, readonly) NSString *body; -@property (nonatomic, readonly) NSArray *attachmentPointerProtos; +@property (nonatomic, readonly) NSArray *attachmentPointerProtos; @property (nonatomic, readonly) TSThread *thread; @property (nonatomic, readonly, nullable) TSQuotedMessage *quotedMessage; @property (nonatomic, readonly, nullable) OWSContact *contact; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m index 333fd0dad..dee162ed0 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m @@ -6,19 +6,19 @@ #import "OWSContact.h" #import "OWSMessageManager.h" #import "OWSPrimaryStorage.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSContactThread.h" #import "TSGroupModel.h" #import "TSGroupThread.h" #import "TSOutgoingMessage.h" #import "TSQuotedMessage.h" #import "TSThread.h" +#import NS_ASSUME_NONNULL_BEGIN @implementation OWSIncomingSentMessageTranscript -- (instancetype)initWithProto:(OWSSignalServiceProtosSyncMessageSent *)sentProto +- (instancetype)initWithProto:(SSKProtoSyncMessageSent *)sentProto transaction:(YapDatabaseReadWriteTransaction *)transaction { self = [super init]; @@ -33,9 +33,9 @@ NS_ASSUME_NONNULL_BEGIN _expirationDuration = sentProto.message.expireTimer; _body = _dataMessage.body; _groupId = _dataMessage.group.id; - _isGroupUpdate = _dataMessage.hasGroup && (_dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeUpdate); - _isExpirationTimerUpdate = (_dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate) != 0; - _isEndSessionMessage = (_dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsEndSession) != 0; + _isGroupUpdate = _dataMessage.hasGroup && (_dataMessage.group.type == SSKProtoGroupContextTypeUpdate); + _isExpirationTimerUpdate = (_dataMessage.flags & SSKProtoDataMessageFlagsExpirationTimerUpdate) != 0; + _isEndSessionMessage = (_dataMessage.flags & SSKProtoDataMessageFlagsEndSession) != 0; if (self.dataMessage.hasGroup) { _thread = [TSGroupThread getOrCreateThreadWithGroupId:_dataMessage.group.id transaction:transaction]; @@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (NSArray *)attachmentPointerProtos +- (NSArray *)attachmentPointerProtos { if (self.isGroupUpdate && self.dataMessage.group.hasAvatar) { return @[ self.dataMessage.group.avatar ]; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m index 3b8e1b3fe..fcfc55aa7 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m @@ -3,9 +3,9 @@ // #import "OWSOutgoingSentMessageTranscript.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSOutgoingMessage.h" #import "TSThread.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN * recipientId is nil when building "sent" sync messages for messages * sent to groups. */ -- (OWSSignalServiceProtosDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId; +- (SSKProtoDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId; @end @@ -53,11 +53,11 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; - OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder = [OWSSignalServiceProtosSyncMessageSentBuilder new]; + SSKProtoSyncMessageSentBuilder *sentBuilder = [SSKProtoSyncMessageSentBuilder new]; [sentBuilder setTimestamp:self.message.timestamp]; [sentBuilder setDestination:self.sentRecipientId]; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m index 2efe3c5d2..6e03fefc2 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m @@ -5,8 +5,8 @@ #import "OWSOutgoingSyncMessage.h" #import "Cryptography.h" #import "NSDate+OWS.h" -#import "OWSSignalServiceProtos.pb.h" #import "ProtoBuf+OWS.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -48,9 +48,9 @@ NS_ASSUME_NONNULL_BEGIN } // This method should not be overridden, since we want to add random padding to *every* sync message -- (OWSSignalServiceProtosSyncMessage *)buildSyncMessage +- (SSKProtoSyncMessage *)buildSyncMessage { - OWSSignalServiceProtosSyncMessageBuilder *builder = [self syncMessageBuilder]; + SSKProtoSyncMessageBuilder *builder = [self syncMessageBuilder]; // Add a random 1-512 bytes to obscure sync message type size_t paddingBytesLength = arc4random_uniform(512) + 1; @@ -59,15 +59,15 @@ NS_ASSUME_NONNULL_BEGIN return [builder build]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { OWSFail(@"Abstract method should be overridden in subclass."); - return [OWSSignalServiceProtosSyncMessageBuilder new]; + return [SSKProtoSyncMessageBuilder new]; } -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { - OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new]; + SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new]; [contentBuilder setSyncMessage:[self buildSyncMessage]]; return [[contentBuilder build] data]; } diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m index 6e086eeeb..5f18517b0 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m @@ -3,7 +3,7 @@ // #import "OWSSyncConfigurationMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -32,14 +32,14 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { - OWSSignalServiceProtosSyncMessageConfigurationBuilder *configurationBuilder = - [OWSSignalServiceProtosSyncMessageConfigurationBuilder new]; + SSKProtoSyncMessageConfigurationBuilder *configurationBuilder = + [SSKProtoSyncMessageConfigurationBuilder new]; configurationBuilder.readReceipts = self.areReadReceiptsEnabled; - OWSSignalServiceProtosSyncMessageBuilder *builder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *builder = [SSKProtoSyncMessageBuilder new]; builder.configurationBuilder = configurationBuilder; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m index 3b0a3d948..c91326e2a 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m @@ -8,13 +8,13 @@ #import "NSDate+OWS.h" #import "OWSContactsOutputStream.h" #import "OWSIdentityManager.h" -#import "OWSSignalServiceProtos.pb.h" #import "ProfileManagerProtocol.h" #import "SignalAccount.h" #import "TSAttachment.h" #import "TSAttachmentStream.h" #import "TSContactThread.h" #import "TextSecureKitEnv.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -49,23 +49,23 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { if (self.attachmentIds.count != 1) { DDLogError(@"expected sync contact message to have exactly one attachment, but found %lu", (unsigned long)self.attachmentIds.count); } - OWSSignalServiceProtosAttachmentPointer *attachmentProto = + SSKProtoAttachmentPointer *attachmentProto = [TSAttachmentStream buildProtoForAttachmentId:self.attachmentIds.firstObject]; - OWSSignalServiceProtosSyncMessageContactsBuilder *contactsBuilder = - [OWSSignalServiceProtosSyncMessageContactsBuilder new]; + SSKProtoSyncMessageContactsBuilder *contactsBuilder = + [SSKProtoSyncMessageContactsBuilder new]; [contactsBuilder setBlob:attachmentProto]; [contactsBuilder setIsComplete:YES]; - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; [syncMessageBuilder setContactsBuilder:contactsBuilder]; return syncMessageBuilder; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m index 80cdcec2d..513cf6525 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m @@ -5,12 +5,12 @@ #import "OWSSyncGroupsMessage.h" #import "NSDate+OWS.h" #import "OWSGroupsOutputStream.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSAttachment.h" #import "TSAttachmentStream.h" #import "TSContactThread.h" #import "TSGroupModel.h" #import "TSGroupThread.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -26,21 +26,21 @@ NS_ASSUME_NONNULL_BEGIN return [super initWithCoder:coder]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder +- (SSKProtoSyncMessageBuilder *)syncMessageBuilder { if (self.attachmentIds.count != 1) { DDLogError(@"expected sync groups message to have exactly one attachment, but found %lu", (unsigned long)self.attachmentIds.count); } - OWSSignalServiceProtosAttachmentPointer *attachmentProto = [TSAttachmentStream buildProtoForAttachmentId:self.attachmentIds.firstObject]; + SSKProtoAttachmentPointer *attachmentProto = [TSAttachmentStream buildProtoForAttachmentId:self.attachmentIds.firstObject]; - OWSSignalServiceProtosSyncMessageGroupsBuilder *groupsBuilder = - [OWSSignalServiceProtosSyncMessageGroupsBuilder new]; + SSKProtoSyncMessageGroupsBuilder *groupsBuilder = + [SSKProtoSyncMessageGroupsBuilder new]; [groupsBuilder setBlob:attachmentProto]; - OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new]; + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessageBuilder new]; [syncMessageBuilder setGroupsBuilder:groupsBuilder]; return syncMessageBuilder; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m index 2c35a02e2..f92d4e15f 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m @@ -4,7 +4,7 @@ #import "OWSSyncGroupsRequestMessage.h" #import "NSDate+OWS.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -57,13 +57,13 @@ NS_ASSUME_NONNULL_BEGIN return YES; } -- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder +- (SSKProtoDataMessageBuilder *)dataMessageBuilder { - OWSSignalServiceProtosGroupContextBuilder *groupContextBuilder = [OWSSignalServiceProtosGroupContextBuilder new]; - [groupContextBuilder setType:OWSSignalServiceProtosGroupContextTypeRequestInfo]; + SSKProtoGroupContextBuilder *groupContextBuilder = [SSKProtoGroupContextBuilder new]; + [groupContextBuilder setType:SSKProtoGroupContextTypeRequestInfo]; [groupContextBuilder setId:self.groupId]; - OWSSignalServiceProtosDataMessageBuilder *builder = [OWSSignalServiceProtosDataMessageBuilder new]; + SSKProtoDataMessageBuilder *builder = [SSKProtoDataMessageBuilder new]; [builder setTimestamp:self.timestamp]; [builder setGroupBuilder:groupContextBuilder]; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.h b/SignalServiceKit/src/Messages/Interactions/OWSContact.h index 254436f39..3702cf4df 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSContact.h +++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.h @@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN @class CNContact; @class OWSAttachmentInfo; -@class OWSSignalServiceProtosDataMessage; -@class OWSSignalServiceProtosDataMessageContact; +@class SSKProtoDataMessage; +@class SSKProtoDataMessageContact; @class TSAttachment; @class TSAttachmentStream; @class YapDatabaseReadTransaction; @@ -173,9 +173,9 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value); #pragma mark - Proto Serialization -+ (nullable OWSSignalServiceProtosDataMessageContact *)protoForContact:(OWSContact *)contact; ++ (nullable SSKProtoDataMessageContact *)protoForContact:(OWSContact *)contact; -+ (nullable OWSContact *)contactForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage ++ (nullable OWSContact *)contactForDataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction; @end diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.m b/SignalServiceKit/src/Messages/Interactions/OWSContact.m index b105602f1..9518acc4c 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSContact.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.m @@ -7,11 +7,11 @@ #import "MimeTypeUtil.h" #import "NSString+SSK.h" #import "OWSContact+Private.h" -#import "OWSSignalServiceProtos.pb.h" #import "PhoneNumber.h" #import "TSAttachment.h" #import "TSAttachmentPointer.h" #import "TSAttachmentStream.h" +#import #import @import Contacts; @@ -766,15 +766,15 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) #pragma mark - Proto Serialization -+ (nullable OWSSignalServiceProtosDataMessageContact *)protoForContact:(OWSContact *)contact ++ (nullable SSKProtoDataMessageContact *)protoForContact:(OWSContact *)contact { OWSAssert(contact); - OWSSignalServiceProtosDataMessageContactBuilder *contactBuilder = - [OWSSignalServiceProtosDataMessageContactBuilder new]; + SSKProtoDataMessageContactBuilder *contactBuilder = + [SSKProtoDataMessageContactBuilder new]; - OWSSignalServiceProtosDataMessageContactNameBuilder *nameBuilder = - [OWSSignalServiceProtosDataMessageContactNameBuilder new]; + SSKProtoDataMessageContactNameBuilder *nameBuilder = + [SSKProtoDataMessageContactNameBuilder new]; OWSContactName *contactName = contact.name; if (contactName.givenName.ows_stripped.length > 0) { @@ -799,56 +799,56 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) [contactBuilder setNameBuilder:nameBuilder]; for (OWSContactPhoneNumber *phoneNumber in contact.phoneNumbers) { - OWSSignalServiceProtosDataMessageContactPhoneBuilder *phoneBuilder = - [OWSSignalServiceProtosDataMessageContactPhoneBuilder new]; + SSKProtoDataMessageContactPhoneBuilder *phoneBuilder = + [SSKProtoDataMessageContactPhoneBuilder new]; phoneBuilder.value = phoneNumber.phoneNumber; if (phoneNumber.label.ows_stripped.length > 0) { phoneBuilder.label = phoneNumber.label.ows_stripped; } switch (phoneNumber.phoneType) { case OWSContactPhoneType_Home: - phoneBuilder.type = OWSSignalServiceProtosDataMessageContactPhoneTypeHome; + phoneBuilder.type = SSKProtoDataMessageContactPhoneTypeHome; break; case OWSContactPhoneType_Mobile: - phoneBuilder.type = OWSSignalServiceProtosDataMessageContactPhoneTypeMobile; + phoneBuilder.type = SSKProtoDataMessageContactPhoneTypeMobile; break; case OWSContactPhoneType_Work: - phoneBuilder.type = OWSSignalServiceProtosDataMessageContactPhoneTypeWork; + phoneBuilder.type = SSKProtoDataMessageContactPhoneTypeWork; break; case OWSContactPhoneType_Custom: - phoneBuilder.type = OWSSignalServiceProtosDataMessageContactPhoneTypeCustom; + phoneBuilder.type = SSKProtoDataMessageContactPhoneTypeCustom; break; } [contactBuilder addNumber:phoneBuilder.build]; } for (OWSContactEmail *email in contact.emails) { - OWSSignalServiceProtosDataMessageContactEmailBuilder *emailBuilder = - [OWSSignalServiceProtosDataMessageContactEmailBuilder new]; + SSKProtoDataMessageContactEmailBuilder *emailBuilder = + [SSKProtoDataMessageContactEmailBuilder new]; emailBuilder.value = email.email; if (email.label.ows_stripped.length > 0) { emailBuilder.label = email.label.ows_stripped; } switch (email.emailType) { case OWSContactEmailType_Home: - emailBuilder.type = OWSSignalServiceProtosDataMessageContactEmailTypeHome; + emailBuilder.type = SSKProtoDataMessageContactEmailTypeHome; break; case OWSContactEmailType_Mobile: - emailBuilder.type = OWSSignalServiceProtosDataMessageContactEmailTypeMobile; + emailBuilder.type = SSKProtoDataMessageContactEmailTypeMobile; break; case OWSContactEmailType_Work: - emailBuilder.type = OWSSignalServiceProtosDataMessageContactEmailTypeWork; + emailBuilder.type = SSKProtoDataMessageContactEmailTypeWork; break; case OWSContactEmailType_Custom: - emailBuilder.type = OWSSignalServiceProtosDataMessageContactEmailTypeCustom; + emailBuilder.type = SSKProtoDataMessageContactEmailTypeCustom; break; } [contactBuilder addEmail:emailBuilder.build]; } for (OWSContactAddress *address in contact.addresses) { - OWSSignalServiceProtosDataMessageContactPostalAddressBuilder *addressBuilder = - [OWSSignalServiceProtosDataMessageContactPostalAddressBuilder new]; + SSKProtoDataMessageContactPostalAddressBuilder *addressBuilder = + [SSKProtoDataMessageContactPostalAddressBuilder new]; if (address.label.ows_stripped.length > 0) { addressBuilder.label = address.label.ows_stripped; } @@ -877,14 +877,14 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) } if (contact.avatarAttachmentId != nil) { - OWSSignalServiceProtosDataMessageContactAvatarBuilder *avatarBuilder = - [OWSSignalServiceProtosDataMessageContactAvatarBuilder new]; + SSKProtoDataMessageContactAvatarBuilder *avatarBuilder = + [SSKProtoDataMessageContactAvatarBuilder new]; avatarBuilder.avatar = [TSAttachmentStream buildProtoForAttachmentId:contact.avatarAttachmentId]; contactBuilder.avatar = [avatarBuilder build]; } - OWSSignalServiceProtosDataMessageContact *contactProto = [contactBuilder build]; + SSKProtoDataMessageContact *contactProto = [contactBuilder build]; if (contactProto.number.count < 1 && contactProto.email.count < 1 && contactProto.address.count < 1) { OWSProdLogAndFail(@"%@ contact has neither phone, email or address.", self.logTag); return nil; @@ -892,7 +892,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) return contactProto; } -+ (nullable OWSContact *)contactForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage ++ (nullable OWSContact *)contactForDataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(dataMessage); @@ -901,13 +901,13 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) return nil; } OWSAssert(dataMessage.contact.count == 1); - OWSSignalServiceProtosDataMessageContact *contactProto = dataMessage.contact.firstObject; + SSKProtoDataMessageContact *contactProto = dataMessage.contact.firstObject; OWSContact *contact = [OWSContact new]; OWSContactName *contactName = [OWSContactName new]; if (contactProto.hasName) { - OWSSignalServiceProtosDataMessageContactName *nameProto = contactProto.name; + SSKProtoDataMessageContactName *nameProto = contactProto.name; if (nameProto.hasGivenName) { contactName.givenName = nameProto.givenName.ows_stripped; @@ -935,7 +935,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) contact.name = contactName; NSMutableArray *phoneNumbers = [NSMutableArray new]; - for (OWSSignalServiceProtosDataMessageContactPhone *phoneNumberProto in contactProto.number) { + for (SSKProtoDataMessageContactPhone *phoneNumberProto in contactProto.number) { OWSContactPhoneNumber *_Nullable phoneNumber = [self phoneNumberForProto:phoneNumberProto]; if (phoneNumber) { [phoneNumbers addObject:phoneNumber]; @@ -944,7 +944,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) contact.phoneNumbers = [phoneNumbers copy]; NSMutableArray *emails = [NSMutableArray new]; - for (OWSSignalServiceProtosDataMessageContactEmail *emailProto in contactProto.email) { + for (SSKProtoDataMessageContactEmail *emailProto in contactProto.email) { OWSContactEmail *_Nullable email = [self emailForProto:emailProto]; if (email) { [emails addObject:email]; @@ -953,7 +953,7 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) contact.emails = [emails copy]; NSMutableArray *addresses = [NSMutableArray new]; - for (OWSSignalServiceProtosDataMessageContactPostalAddress *addressProto in contactProto.address) { + for (SSKProtoDataMessageContactPostalAddress *addressProto in contactProto.address) { OWSContactAddress *_Nullable address = [self addressForProto:addressProto]; if (address) { [addresses addObject:address]; @@ -962,10 +962,10 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) contact.addresses = [addresses copy]; if (contactProto.hasAvatar) { - OWSSignalServiceProtosDataMessageContactAvatar *avatarInfo = contactProto.avatar; + SSKProtoDataMessageContactAvatar *avatarInfo = contactProto.avatar; if (avatarInfo.hasAvatar) { - OWSSignalServiceProtosAttachmentPointer *avatarAttachment = avatarInfo.avatar; + SSKProtoAttachmentPointer *avatarAttachment = avatarInfo.avatar; TSAttachmentPointer *attachmentPointer = [TSAttachmentPointer attachmentPointerFromProto:avatarAttachment]; [attachmentPointer saveWithTransaction:transaction]; @@ -982,19 +982,19 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) } + (nullable OWSContactPhoneNumber *)phoneNumberForProto: - (OWSSignalServiceProtosDataMessageContactPhone *)phoneNumberProto + (SSKProtoDataMessageContactPhone *)phoneNumberProto { OWSContactPhoneNumber *result = [OWSContactPhoneNumber new]; result.phoneType = OWSContactPhoneType_Custom; if (phoneNumberProto.hasType) { switch (phoneNumberProto.type) { - case OWSSignalServiceProtosDataMessageContactPhoneTypeHome: + case SSKProtoDataMessageContactPhoneTypeHome: result.phoneType = OWSContactPhoneType_Home; break; - case OWSSignalServiceProtosDataMessageContactPhoneTypeMobile: + case SSKProtoDataMessageContactPhoneTypeMobile: result.phoneType = OWSContactPhoneType_Mobile; break; - case OWSSignalServiceProtosDataMessageContactPhoneTypeWork: + case SSKProtoDataMessageContactPhoneTypeWork: result.phoneType = OWSContactPhoneType_Work; break; default: @@ -1012,19 +1012,19 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) return result; } -+ (nullable OWSContactEmail *)emailForProto:(OWSSignalServiceProtosDataMessageContactEmail *)emailProto ++ (nullable OWSContactEmail *)emailForProto:(SSKProtoDataMessageContactEmail *)emailProto { OWSContactEmail *result = [OWSContactEmail new]; result.emailType = OWSContactEmailType_Custom; if (emailProto.hasType) { switch (emailProto.type) { - case OWSSignalServiceProtosDataMessageContactEmailTypeHome: + case SSKProtoDataMessageContactEmailTypeHome: result.emailType = OWSContactEmailType_Home; break; - case OWSSignalServiceProtosDataMessageContactEmailTypeMobile: + case SSKProtoDataMessageContactEmailTypeMobile: result.emailType = OWSContactEmailType_Mobile; break; - case OWSSignalServiceProtosDataMessageContactEmailTypeWork: + case SSKProtoDataMessageContactEmailTypeWork: result.emailType = OWSContactEmailType_Work; break; default: @@ -1042,16 +1042,16 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value) return result; } -+ (nullable OWSContactAddress *)addressForProto:(OWSSignalServiceProtosDataMessageContactPostalAddress *)addressProto ++ (nullable OWSContactAddress *)addressForProto:(SSKProtoDataMessageContactPostalAddress *)addressProto { OWSContactAddress *result = [OWSContactAddress new]; result.addressType = OWSContactAddressType_Custom; if (addressProto.hasType) { switch (addressProto.type) { - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome: + case SSKProtoDataMessageContactPostalAddressTypeHome: result.addressType = OWSContactAddressType_Home; break; - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeWork: + case SSKProtoDataMessageContactPostalAddressTypeWork: result.addressType = OWSContactAddressType_Work; break; default: diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m index 998cef14b..d0ea4d17d 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m @@ -5,7 +5,7 @@ #import "OWSDisappearingMessagesConfigurationMessage.h" #import "NSDate+OWS.h" #import "OWSDisappearingMessagesConfiguration.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -46,11 +46,11 @@ NS_ASSUME_NONNULL_BEGIN } -- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder +- (SSKProtoDataMessageBuilder *)dataMessageBuilder { - OWSSignalServiceProtosDataMessageBuilder *dataMessageBuilder = [super dataMessageBuilder]; + SSKProtoDataMessageBuilder *dataMessageBuilder = [super dataMessageBuilder]; [dataMessageBuilder setTimestamp:self.timestamp]; - [dataMessageBuilder setFlags:OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate]; + [dataMessageBuilder setFlags:SSKProtoDataMessageFlagsExpirationTimerUpdate]; if (self.configuration.isEnabled) { [dataMessageBuilder setExpireTimer:self.configuration.durationSeconds]; } else { diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h index ea8f21e11..035da057d 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosDataMessageBuilder; +@class SSKProtoDataMessageBuilder; @class SignalRecipient; typedef NSData *_Nonnull (^DynamicOutgoingMessageBlock)(SignalRecipient *); diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m index a2e727738..6ece14215 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m @@ -4,7 +4,7 @@ #import "OWSDynamicOutgoingMessage.h" #import "NSDate+OWS.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN return NO; } -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { NSData *plainTextData = self.block(recipient); OWSAssert(plainTextData); diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m index 6ad21affa..8dab2fccc 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m @@ -3,7 +3,7 @@ // #import "OWSEndSessionMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -33,11 +33,11 @@ NS_ASSUME_NONNULL_BEGIN return NO; } -- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder +- (SSKProtoDataMessageBuilder *)dataMessageBuilder { - OWSSignalServiceProtosDataMessageBuilder *builder = [super dataMessageBuilder]; + SSKProtoDataMessageBuilder *builder = [super dataMessageBuilder]; [builder setTimestamp:self.timestamp]; - [builder setFlags:OWSSignalServiceProtosDataMessageFlagsEndSession]; + [builder setFlags:SSKProtoDataMessageFlagsEndSession]; return builder; } diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h index 1d00b6ecd..62f254bf1 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h @@ -49,9 +49,9 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { TSGroupMessageRequestInfo, }; -@class OWSSignalServiceProtosAttachmentPointer; -@class OWSSignalServiceProtosContentBuilder; -@class OWSSignalServiceProtosDataMessageBuilder; +@class SSKProtoAttachmentPointer; +@class SSKProtoContentBuilder; +@class SSKProtoDataMessageBuilder; @class SignalRecipient; @interface TSOutgoingMessageRecipientState : MTLModel @@ -130,13 +130,13 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { /** * The data representation of this message, to be encrypted, before being sent. */ -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient; +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient; /** * Intermediate protobuf representation * Subclasses can augment if they want to manipulate the data message before building. */ -- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder; +- (SSKProtoDataMessageBuilder *)dataMessageBuilder; /** * Should this message be synced to the users other registered devices? This is diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 8f1f96a06..95df57851 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -9,7 +9,6 @@ #import "OWSMessageSender.h" #import "OWSOutgoingSyncMessage.h" #import "OWSPrimaryStorage.h" -#import "OWSSignalServiceProtos.pb.h" #import "ProtoBuf+OWS.h" #import "SignalRecipient.h" #import "TSAccountManager.h" @@ -18,6 +17,7 @@ #import "TSGroupThread.h" #import "TSQuotedMessage.h" #import "TextSecureKitEnv.h" +#import #import #import @@ -802,12 +802,12 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt } #pragma mark - -- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder +- (SSKProtoDataMessageBuilder *)dataMessageBuilder { TSThread *thread = self.thread; OWSAssert(thread); - OWSSignalServiceProtosDataMessageBuilder *builder = [OWSSignalServiceProtosDataMessageBuilder new]; + SSKProtoDataMessageBuilder *builder = [SSKProtoDataMessageBuilder new]; [builder setTimestamp:self.timestamp]; @@ -830,11 +830,11 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt BOOL attachmentWasGroupAvatar = NO; if ([thread isKindOfClass:[TSGroupThread class]]) { TSGroupThread *gThread = (TSGroupThread *)thread; - OWSSignalServiceProtosGroupContextBuilder *groupBuilder = [OWSSignalServiceProtosGroupContextBuilder new]; + SSKProtoGroupContextBuilder *groupBuilder = [SSKProtoGroupContextBuilder new]; switch (self.groupMetaMessage) { case TSGroupMessageQuit: - [groupBuilder setType:OWSSignalServiceProtosGroupContextTypeQuit]; + [groupBuilder setType:SSKProtoGroupContextTypeQuit]; break; case TSGroupMessageUpdate: case TSGroupMessageNew: { @@ -845,11 +845,11 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt [groupBuilder setMembersArray:gThread.groupModel.groupMemberIds]; [groupBuilder setName:gThread.groupModel.groupName]; - [groupBuilder setType:OWSSignalServiceProtosGroupContextTypeUpdate]; + [groupBuilder setType:SSKProtoGroupContextTypeUpdate]; break; } default: - [groupBuilder setType:OWSSignalServiceProtosGroupContextTypeDeliver]; + [groupBuilder setType:SSKProtoGroupContextTypeDeliver]; break; } [groupBuilder setId:gThread.groupModel.groupId]; @@ -866,14 +866,14 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt } // Quoted Reply - OWSSignalServiceProtosDataMessageQuoteBuilder *_Nullable quotedMessageBuilder = self.quotedMessageBuilder; + SSKProtoDataMessageQuoteBuilder *_Nullable quotedMessageBuilder = self.quotedMessageBuilder; if (quotedMessageBuilder) { [builder setQuoteBuilder:quotedMessageBuilder]; } // Contact Share if (self.contactShare) { - OWSSignalServiceProtosDataMessageContact *_Nullable contactProto = + SSKProtoDataMessageContact *_Nullable contactProto = [OWSContacts protoForContact:self.contactShare]; if (contactProto) { [builder addContact:contactProto]; @@ -885,14 +885,14 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt return builder; } -- (nullable OWSSignalServiceProtosDataMessageQuoteBuilder *)quotedMessageBuilder +- (nullable SSKProtoDataMessageQuoteBuilder *)quotedMessageBuilder { if (!self.quotedMessage) { return nil; } TSQuotedMessage *quotedMessage = self.quotedMessage; - OWSSignalServiceProtosDataMessageQuoteBuilder *quoteBuilder = [OWSSignalServiceProtosDataMessageQuoteBuilder new]; + SSKProtoDataMessageQuoteBuilder *quoteBuilder = [SSKProtoDataMessageQuoteBuilder new]; [quoteBuilder setId:quotedMessage.timestamp]; [quoteBuilder setAuthor:quotedMessage.authorId]; @@ -907,8 +907,8 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt for (OWSAttachmentInfo *attachment in quotedMessage.quotedAttachments) { hasQuotedAttachment = YES; - OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder *quotedAttachmentBuilder = - [OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder new]; + SSKProtoDataMessageQuoteQuotedAttachmentBuilder *quotedAttachmentBuilder = + [SSKProtoDataMessageQuoteQuotedAttachmentBuilder new]; quotedAttachmentBuilder.contentType = attachment.contentType; quotedAttachmentBuilder.fileName = attachment.sourceFilename; @@ -930,18 +930,18 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt } // recipientId is nil when building "sent" sync messages for messages sent to groups. -- (OWSSignalServiceProtosDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId +- (SSKProtoDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId { OWSAssert(self.thread); - OWSSignalServiceProtosDataMessageBuilder *builder = [self dataMessageBuilder]; + SSKProtoDataMessageBuilder *builder = [self dataMessageBuilder]; [builder addLocalProfileKeyIfNecessary:self.thread recipientId:recipientId]; return [builder build]; } -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { - OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new]; + SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new]; contentBuilder.dataMessage = [self buildDataMessage:recipient.recipientId]; return [[contentBuilder build] data]; } diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h index 3105c2de0..1f85b2900 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h @@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosDataMessage; +@class SSKProtoDataMessage; @class TSAttachment; @class TSAttachmentStream; @class TSQuotedMessage; @@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN quotedAttachmentsForSending:(NSArray *)attachments; -+ (nullable instancetype)quotedMessageForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage ++ (nullable instancetype)quotedMessageForDataMessage:(SSKProtoDataMessage *)dataMessage thread:(TSThread *)thread transaction:(YapDatabaseReadWriteTransaction *)transaction; diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m index 4dc7881e0..525c73564 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m @@ -3,7 +3,6 @@ // #import "TSQuotedMessage.h" -#import "OWSSignalServiceProtos.pb.h" #import "TSAccountManager.h" #import "TSAttachment.h" #import "TSAttachmentPointer.h" @@ -12,6 +11,7 @@ #import "TSInteraction.h" #import "TSOutgoingMessage.h" #import "TSThread.h" +#import #import NS_ASSUME_NONNULL_BEGIN @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN return self; } -+ (TSQuotedMessage *_Nullable)quotedMessageForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage ++ (TSQuotedMessage *_Nullable)quotedMessageForDataMessage:(SSKProtoDataMessage *)dataMessage thread:(TSThread *)thread transaction:(YapDatabaseReadWriteTransaction *)transaction { @@ -113,7 +113,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - OWSSignalServiceProtosDataMessageQuote *quoteProto = [dataMessage quote]; + SSKProtoDataMessageQuote *quoteProto = [dataMessage quote]; if (![quoteProto hasId] || [quoteProto id] == 0) { OWSFail(@"%@ quoted message missing id", self.logTag); @@ -137,7 +137,7 @@ NS_ASSUME_NONNULL_BEGIN } NSMutableArray *attachmentInfos = [NSMutableArray new]; - for (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *quotedAttachment in quoteProto.attachments) { + for (SSKProtoDataMessageQuoteQuotedAttachment *quotedAttachment in quoteProto.attachments) { hasAttachment = YES; OWSAttachmentInfo *attachmentInfo = [[OWSAttachmentInfo alloc] initWithAttachmentId:nil contentType:quotedAttachment.contentType @@ -166,7 +166,7 @@ NS_ASSUME_NONNULL_BEGIN thread.uniqueId, (unsigned long)timestamp); - OWSSignalServiceProtosAttachmentPointer *thumbnailAttachmentProto = quotedAttachment.thumbnail; + SSKProtoAttachmentPointer *thumbnailAttachmentProto = quotedAttachment.thumbnail; TSAttachmentPointer *thumbnailPointer = [TSAttachmentPointer attachmentPointerFromProto:thumbnailAttachmentProto]; [thumbnailPointer saveWithTransaction:transaction]; diff --git a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m index e224d797c..fe9506f5a 100644 --- a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m +++ b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m @@ -12,7 +12,6 @@ #import "OWSPrimaryStorage+SessionStore.h" #import "OWSPrimaryStorage.h" #import "OWSQueues.h" -#import "OWSSignalServiceProtos.pb.h" #import "OWSStorage.h" #import "TSDatabaseView.h" #import "TSErrorMessage.h" diff --git a/SignalServiceKit/src/Messages/OWSCallAnswerMessage.h b/SignalServiceKit/src/Messages/OWSCallAnswerMessage.h index 910cb94f5..0d2d3dd9b 100644 --- a/SignalServiceKit/src/Messages/OWSCallAnswerMessage.h +++ b/SignalServiceKit/src/Messages/OWSCallAnswerMessage.h @@ -1,10 +1,10 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageAnswer; +@class SSKProtoCallMessageAnswer; /** * Sent by the call recipient upon accepting a CallOffer @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) UInt64 callId; @property (nonatomic, readonly, copy) NSString *sessionDescription; -- (OWSSignalServiceProtosCallMessageAnswer *)asProtobuf; +- (nullable SSKProtoCallMessageAnswer *)asProtobuf; @end diff --git a/SignalServiceKit/src/Messages/OWSCallAnswerMessage.m b/SignalServiceKit/src/Messages/OWSCallAnswerMessage.m index ae5f8e8f3..c204240e7 100644 --- a/SignalServiceKit/src/Messages/OWSCallAnswerMessage.m +++ b/SignalServiceKit/src/Messages/OWSCallAnswerMessage.m @@ -1,9 +1,9 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSCallAnswerMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -22,14 +22,20 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (OWSSignalServiceProtosCallMessageAnswer *)asProtobuf +- (nullable SSKProtoCallMessageAnswer *)asProtobuf { - OWSSignalServiceProtosCallMessageAnswerBuilder *builder = [OWSSignalServiceProtosCallMessageAnswerBuilder new]; + SSKProtoCallMessageAnswerBuilder *builder = [SSKProtoCallMessageAnswerBuilder new]; builder.id = self.callId; builder.sessionDescription = self.sessionDescription; - - return [builder build]; + + NSError *error; + SSKProtoCallMessageAnswer *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } @end diff --git a/SignalServiceKit/src/Messages/OWSCallBusyMessage.h b/SignalServiceKit/src/Messages/OWSCallBusyMessage.h index 06d166c05..634e686c9 100644 --- a/SignalServiceKit/src/Messages/OWSCallBusyMessage.h +++ b/SignalServiceKit/src/Messages/OWSCallBusyMessage.h @@ -1,12 +1,12 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSOutgoingCallMessage.h" NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageBusy; +@class SSKProtoCallMessageBusy; /** * Sent by the call recipient after receiving a call offer when they are already in a call. @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) UInt64 callId; -- (OWSSignalServiceProtosCallMessageBusy *)asProtobuf; +- (nullable SSKProtoCallMessageBusy *)asProtobuf; @end diff --git a/SignalServiceKit/src/Messages/OWSCallBusyMessage.m b/SignalServiceKit/src/Messages/OWSCallBusyMessage.m index cac55d1ee..d1c3fa5a7 100644 --- a/SignalServiceKit/src/Messages/OWSCallBusyMessage.m +++ b/SignalServiceKit/src/Messages/OWSCallBusyMessage.m @@ -1,9 +1,9 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSCallBusyMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -21,13 +21,19 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (OWSSignalServiceProtosCallMessageBusy *)asProtobuf +- (nullable SSKProtoCallMessageBusy *)asProtobuf { - OWSSignalServiceProtosCallMessageBusyBuilder *builder = [OWSSignalServiceProtosCallMessageBusyBuilder new]; + SSKProtoCallMessageBusyBuilder *builder = [SSKProtoCallMessageBusyBuilder new]; builder.id = self.callId; - - return [builder build]; + + NSError *error; + SSKProtoCallMessageBusy *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } @end diff --git a/SignalServiceKit/src/Messages/OWSCallHangupMessage.h b/SignalServiceKit/src/Messages/OWSCallHangupMessage.h index 4ec22f2fa..994fb2ef5 100644 --- a/SignalServiceKit/src/Messages/OWSCallHangupMessage.h +++ b/SignalServiceKit/src/Messages/OWSCallHangupMessage.h @@ -1,12 +1,12 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSOutgoingCallMessage.h" NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageHangup; +@class SSKProtoCallMessageHangup; /** * Sent by either party in a call to indicate the user intentionally ended the call. @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) UInt64 callId; -- (OWSSignalServiceProtosCallMessageHangup *)asProtobuf; +- (nullable SSKProtoCallMessageHangup *)asProtobuf; @end diff --git a/SignalServiceKit/src/Messages/OWSCallHangupMessage.m b/SignalServiceKit/src/Messages/OWSCallHangupMessage.m index 797eef86b..f2955499f 100644 --- a/SignalServiceKit/src/Messages/OWSCallHangupMessage.m +++ b/SignalServiceKit/src/Messages/OWSCallHangupMessage.m @@ -1,8 +1,9 @@ -// Created by Michael Kirk on 12/8/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSCallHangupMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -20,13 +21,19 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (OWSSignalServiceProtosCallMessageHangup *)asProtobuf +- (nullable SSKProtoCallMessageHangup *)asProtobuf { - OWSSignalServiceProtosCallMessageHangupBuilder *builder = [OWSSignalServiceProtosCallMessageHangupBuilder new]; + SSKProtoCallMessageHangupBuilder *builder = [SSKProtoCallMessageHangupBuilder new]; builder.id = self.callId; - - return [builder build]; + + NSError *error; + SSKProtoCallMessageHangup *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } diff --git a/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.h b/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.h index e5743ecf3..a21dd55c6 100644 --- a/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.h +++ b/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.h @@ -1,10 +1,10 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageIceUpdate; +@class SSKProtoCallMessageIceUpdate; /** * Sent by both parties out of band of the RTC calling channels, as part of setting up those channels. The messages @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) SInt32 sdpMLineIndex; @property (nullable, nonatomic, readonly, copy) NSString *sdpMid; -- (OWSSignalServiceProtosCallMessageIceUpdate *)asProtobuf; +- (nullable SSKProtoCallMessageIceUpdate *)asProtobuf; @end diff --git a/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.m b/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.m index a6051933a..373dd9192 100644 --- a/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.m +++ b/SignalServiceKit/src/Messages/OWSCallIceUpdateMessage.m @@ -1,8 +1,9 @@ -// Created by Michael Kirk on 12/6/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSCallIceUpdateMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import @implementation OWSCallIceUpdateMessage @@ -24,17 +25,23 @@ return self; } -- (OWSSignalServiceProtosCallMessageIceUpdate *)asProtobuf +- (nullable SSKProtoCallMessageIceUpdate *)asProtobuf { - OWSSignalServiceProtosCallMessageIceUpdateBuilder *builder = - [OWSSignalServiceProtosCallMessageIceUpdateBuilder new]; + SSKProtoCallMessageIceUpdateBuilder *builder = + [SSKProtoCallMessageIceUpdateBuilder new]; [builder setId:self.callId]; [builder setSdp:self.sdp]; [builder setSdpMlineIndex:self.sdpMLineIndex]; [builder setSdpMid:self.sdpMid]; - return [builder build]; + NSError *error; + SSKProtoCallMessageIceUpdate *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } @end diff --git a/SignalServiceKit/src/Messages/OWSCallOfferMessage.h b/SignalServiceKit/src/Messages/OWSCallOfferMessage.h index d8c2c84ac..3006991ef 100644 --- a/SignalServiceKit/src/Messages/OWSCallOfferMessage.h +++ b/SignalServiceKit/src/Messages/OWSCallOfferMessage.h @@ -1,10 +1,10 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageOffer; +@class SSKProtoCallMessageOffer; /** * Sent by the call initiator to Signal their intention to set up a call with the recipient. @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) UInt64 callId; @property (nonatomic, readonly, copy) NSString *sessionDescription; -- (OWSSignalServiceProtosCallMessageOffer *)asProtobuf; +- (nullable SSKProtoCallMessageOffer *)asProtobuf; @end diff --git a/SignalServiceKit/src/Messages/OWSCallOfferMessage.m b/SignalServiceKit/src/Messages/OWSCallOfferMessage.m index 67f251b95..27e631289 100644 --- a/SignalServiceKit/src/Messages/OWSCallOfferMessage.m +++ b/SignalServiceKit/src/Messages/OWSCallOfferMessage.m @@ -1,9 +1,9 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSCallOfferMessage.h" -#import "OWSSignalServiceProtos.pb.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -22,14 +22,20 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (OWSSignalServiceProtosCallMessageOffer *)asProtobuf +- (nullable SSKProtoCallMessageOffer *)asProtobuf { - OWSSignalServiceProtosCallMessageOfferBuilder *builder = [OWSSignalServiceProtosCallMessageOfferBuilder new]; + SSKProtoCallMessageOfferBuilder *builder = [SSKProtoCallMessageOfferBuilder new]; builder.id = self.callId; builder.sessionDescription = self.sessionDescription; - - return [builder build]; + + NSError *error; + SSKProtoCallMessageOffer *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } @end diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.h b/SignalServiceKit/src/Messages/OWSIdentityManager.h index ed5d5e665..6391af58d 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.h +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.h @@ -17,8 +17,8 @@ extern NSString *const kNSNotificationName_IdentityStateDidChange; extern const NSUInteger kIdentityKeyLength; @class OWSRecipientIdentity; -@class OWSSignalServiceProtosVerified; @class OWSStorage; +@class SSKProtoVerified; @class YapDatabaseReadWriteTransaction; // This class can be safely accessed and used from any thread. @@ -60,7 +60,7 @@ extern const NSUInteger kIdentityKeyLength; - (nullable OWSRecipientIdentity *)untrustedIdentityForSendingToRecipientId:(NSString *)recipientId; // This method can be called from any thread. -- (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified +- (void)processIncomingSyncMessage:(SSKProtoVerified *)verified transaction:(YapDatabaseReadWriteTransaction *)transaction; - (BOOL)saveRemoteIdentity:(NSData *)identityKey recipientId:(NSString *)recipientId; diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m index 78e0b60eb..728b5742a 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.m +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m @@ -679,7 +679,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa [transaction removeObjectForKey:recipientId inCollection:OWSIdentityManager_QueuedVerificationStateSyncMessages]; } -- (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified +- (void)processIncomingSyncMessage:(SSKProtoVerified *)verified transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(verified); @@ -700,21 +700,21 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa NSData *identityKey = [rawIdentityKey removeKeyType]; switch (verified.state) { - case OWSSignalServiceProtosVerifiedStateDefault: + case SSKProtoVerifiedStateDefault: [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateDefault recipientId:recipientId identityKey:identityKey overwriteOnConflict:NO transaction:transaction]; break; - case OWSSignalServiceProtosVerifiedStateVerified: + case SSKProtoVerifiedStateVerified: [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateVerified recipientId:recipientId identityKey:identityKey overwriteOnConflict:YES transaction:transaction]; break; - case OWSSignalServiceProtosVerifiedStateUnverified: + case SSKProtoVerifiedStateUnverified: OWSFail(@"Verification state sync message for recipientId: %@ has unexpected value: %@.", recipientId, OWSVerificationStateToString(OWSVerificationStateNoLongerVerified)); diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index 633181db9..20863d8a8 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -13,7 +13,6 @@ #import "OWSPrimaryStorage+SessionStore.h" #import "OWSPrimaryStorage+SignedPreKeyStore.h" #import "OWSPrimaryStorage.h" -#import "OWSSignalServiceProtos.pb.h" #import "SignalRecipient.h" #import "TSAccountManager.h" #import "TSContactThread.h" diff --git a/SignalServiceKit/src/Messages/OWSMessageHandler.h b/SignalServiceKit/src/Messages/OWSMessageHandler.h index 07b532ff7..8544dfefe 100644 --- a/SignalServiceKit/src/Messages/OWSMessageHandler.h +++ b/SignalServiceKit/src/Messages/OWSMessageHandler.h @@ -4,8 +4,8 @@ NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosContent; -@class OWSSignalServiceProtosDataMessage; +@class SSKProtoContent; +@class SSKProtoDataMessage; @class SSKProtoEnvelope; NSString *envelopeAddress(SSKProtoEnvelope *envelope); @@ -14,8 +14,8 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope); - (NSString *)descriptionForEnvelopeType:(SSKProtoEnvelope *)envelope; - (NSString *)descriptionForEnvelope:(SSKProtoEnvelope *)envelope; -- (NSString *)descriptionForContent:(OWSSignalServiceProtosContent *)content; -- (NSString *)descriptionForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage; +- (NSString *)descriptionForContent:(SSKProtoContent *)content; +- (NSString *)descriptionForDataMessage:(SSKProtoDataMessage *)dataMessage; @end diff --git a/SignalServiceKit/src/Messages/OWSMessageHandler.m b/SignalServiceKit/src/Messages/OWSMessageHandler.m index da3d20137..21bd9213e 100644 --- a/SignalServiceKit/src/Messages/OWSMessageHandler.m +++ b/SignalServiceKit/src/Messages/OWSMessageHandler.m @@ -3,7 +3,6 @@ // #import "OWSMessageHandler.h" -#import "OWSSignalServiceProtos.pb.h" #import NS_ASSUME_NONNULL_BEGIN @@ -57,7 +56,7 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope) * We don't want to just log `content.description` because we'd potentially log message bodies for dataMesssages and * sync transcripts */ -- (NSString *)descriptionForContent:(OWSSignalServiceProtosContent *)content +- (NSString *)descriptionForContent:(SSKProtoContent *)content { if (content.hasSyncMessage) { return [NSString stringWithFormat:@"", [self descriptionForSyncMessage:content.syncMessage]]; @@ -78,7 +77,7 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope) } } -- (NSString *)descriptionForCallMessage:(OWSSignalServiceProtosCallMessage *)callMessage +- (NSString *)descriptionForCallMessage:(SSKProtoCallMessage *)callMessage { NSString *messageType; UInt64 callId; @@ -110,7 +109,7 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope) /** * We don't want to just log `dataMessage.description` because we'd potentially log message contents */ -- (NSString *)descriptionForDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage +- (NSString *)descriptionForDataMessage:(SSKProtoDataMessage *)dataMessage { NSMutableString *description = [NSMutableString new]; @@ -118,11 +117,11 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope) [description appendString:@"(Group:YES) "]; } - if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsEndSession) != 0) { + if ((dataMessage.flags & SSKProtoDataMessageFlagsEndSession) != 0) { [description appendString:@"EndSession"]; - } else if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate) != 0) { + } else if ((dataMessage.flags & SSKProtoDataMessageFlagsExpirationTimerUpdate) != 0) { [description appendString:@"ExpirationTimerUpdate"]; - } else if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate) != 0) { + } else if ((dataMessage.flags & SSKProtoDataMessageFlagsProfileKeyUpdate) != 0) { [description appendString:@"ProfileKey"]; } else if (dataMessage.attachments.count > 0) { [description appendString:@"MessageWithAttachment"]; @@ -136,19 +135,19 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope) /** * We don't want to just log `syncMessage.description` because we'd potentially log message contents in sent transcripts */ -- (NSString *)descriptionForSyncMessage:(OWSSignalServiceProtosSyncMessage *)syncMessage +- (NSString *)descriptionForSyncMessage:(SSKProtoSyncMessage *)syncMessage { NSMutableString *description = [NSMutableString new]; if (syncMessage.hasSent) { [description appendString:@"SentTranscript"]; } else if (syncMessage.hasRequest) { - if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeContacts) { + if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) { [description appendString:@"ContactRequest"]; - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeGroups) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeGroups) { [description appendString:@"GroupRequest"]; - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeBlocked) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeBlocked) { [description appendString:@"BlockedRequest"]; - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeConfiguration) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeConfiguration) { [description appendString:@"ConfigurationRequest"]; } else { // Shouldn't happen diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 59eac5588..88ac47fda 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -295,7 +295,7 @@ NS_ASSUME_NONNULL_BEGIN } if (envelope.content != nil) { - OWSSignalServiceProtosContent *content = [OWSSignalServiceProtosContent parseFromData:plaintextData]; + SSKProtoContent *content = [SSKProtoContent parseFromData:plaintextData]; DDLogInfo(@"%@ handling content: ", self.logTag, [self descriptionForContent:content]); if (content.hasSyncMessage) { @@ -314,8 +314,8 @@ NS_ASSUME_NONNULL_BEGIN DDLogWarn(@"%@ Ignoring envelope. Content with no known payload", self.logTag); } } else if (envelope.legacyMessage != nil) { // DEPRECATED - Remove after all clients have been upgraded. - OWSSignalServiceProtosDataMessage *dataMessage = - [OWSSignalServiceProtosDataMessage parseFromData:plaintextData]; + SSKProtoDataMessage *dataMessage = + [SSKProtoDataMessage parseFromData:plaintextData]; DDLogInfo( @"%@ handling message: ", self.logTag, [self descriptionForDataMessage:dataMessage]); @@ -326,7 +326,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleIncomingEnvelope:(SSKProtoEnvelope *)envelope - withDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + withDataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -363,9 +363,9 @@ NS_ASSUME_NONNULL_BEGIN if (!groupThread) { // Unknown group. - if (dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeUpdate) { + if (dataMessage.group.type == SSKProtoGroupContextTypeUpdate) { // Accept group updates for unknown groups. - } else if (dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeDeliver) { + } else if (dataMessage.group.type == SSKProtoGroupContextTypeDeliver) { [self sendGroupInfoRequest:dataMessage.group.id envelope:envelope transaction:transaction]; return; } else { @@ -375,11 +375,11 @@ NS_ASSUME_NONNULL_BEGIN } } - if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsEndSession) != 0) { + if ((dataMessage.flags & SSKProtoDataMessageFlagsEndSession) != 0) { [self handleEndSessionMessageWithEnvelope:envelope dataMessage:dataMessage transaction:transaction]; - } else if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate) != 0) { + } else if ((dataMessage.flags & SSKProtoDataMessageFlagsExpirationTimerUpdate) != 0) { [self handleExpirationTimerUpdateMessageWithEnvelope:envelope dataMessage:dataMessage transaction:transaction]; - } else if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate) != 0) { + } else if ((dataMessage.flags & SSKProtoDataMessageFlagsProfileKeyUpdate) != 0) { [self handleProfileKeyMessageWithEnvelope:envelope dataMessage:dataMessage]; } else if (dataMessage.attachments.count > 0) { [self handleReceivedMediaWithEnvelope:envelope dataMessage:dataMessage transaction:transaction]; @@ -429,7 +429,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleIncomingEnvelope:(SSKProtoEnvelope *)envelope - withReceiptMessage:(OWSSignalServiceProtosReceiptMessage *)receiptMessage + withReceiptMessage:(SSKProtoReceiptMessage *)receiptMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -444,14 +444,14 @@ NS_ASSUME_NONNULL_BEGIN } switch (receiptMessage.type) { - case OWSSignalServiceProtosReceiptMessageTypeDelivery: + case SSKProtoReceiptMessageTypeDelivery: DDLogVerbose(@"%@ Processing receipt message with delivery receipts.", self.logTag); [self processDeliveryReceiptsFromRecipientId:envelope.source sentTimestamps:sentTimestamps deliveryTimestamp:@(envelope.timestamp) transaction:transaction]; return; - case OWSSignalServiceProtosReceiptMessageTypeRead: + case SSKProtoReceiptMessageTypeRead: DDLogVerbose(@"%@ Processing receipt message with read receipts.", self.logTag); [OWSReadReceiptManager.sharedManager processReadReceiptsFromRecipientId:envelope.source sentTimestamps:sentTimestamps @@ -464,7 +464,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleIncomingEnvelope:(SSKProtoEnvelope *)envelope - withCallMessage:(OWSSignalServiceProtosCallMessage *)callMessage + withCallMessage:(SSKProtoCallMessage *)callMessage { OWSAssert(envelope); OWSAssert(callMessage); @@ -484,7 +484,7 @@ NS_ASSUME_NONNULL_BEGIN } else if (callMessage.hasAnswer) { [self.callMessageHandler receivedAnswer:callMessage.answer fromCallerId:envelope.source]; } else if (callMessage.iceUpdate.count > 0) { - for (OWSSignalServiceProtosCallMessageIceUpdate *iceUpdate in callMessage.iceUpdate) { + for (SSKProtoCallMessageIceUpdate *iceUpdate in callMessage.iceUpdate) { [self.callMessageHandler receivedIceUpdate:iceUpdate fromCallerId:envelope.source]; } } else if (callMessage.hasHangup) { @@ -499,7 +499,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleReceivedGroupAvatarUpdateWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -537,7 +537,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleReceivedMediaWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -585,7 +585,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleIncomingEnvelope:(SSKProtoEnvelope *)envelope - withSyncMessage:(OWSSignalServiceProtosSyncMessage *)syncMessage + withSyncMessage:(SSKProtoSyncMessage *)syncMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -608,7 +608,7 @@ NS_ASSUME_NONNULL_BEGIN OWSRecordTranscriptJob *recordJob = [[OWSRecordTranscriptJob alloc] initWithIncomingSentMessageTranscript:transcript]; - OWSSignalServiceProtosDataMessage *dataMessage = syncMessage.sent.message; + SSKProtoDataMessage *dataMessage = syncMessage.sent.message; OWSAssert(dataMessage); NSString *destination = syncMessage.sent.destination; if (dataMessage && destination.length > 0 && dataMessage.hasProfileKey) { @@ -642,7 +642,7 @@ NS_ASSUME_NONNULL_BEGIN transaction:transaction]; } } else if (syncMessage.hasRequest) { - if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeContacts) { + if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) { // We respond asynchronously because populating the sync message will // create transactions and it's not practical (due to locking in the OWSIdentityManager) // to plumb our transaction through. @@ -668,7 +668,7 @@ NS_ASSUME_NONNULL_BEGIN @"%@ Failed to send Contacts response syncMessage with error: %@", self.logTag, error); }]; }); - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeGroups) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeGroups) { OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init]; DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessageData:[syncGroupsMessage @@ -682,10 +682,10 @@ NS_ASSUME_NONNULL_BEGIN failure:^(NSError *error) { DDLogError(@"%@ Failed to send Groups response syncMessage with error: %@", self.logTag, error); }]; - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeBlocked) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeBlocked) { DDLogInfo(@"%@ Received request for block list", self.logTag); [_blockingManager syncBlockedPhoneNumbers]; - } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeConfiguration) { + } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeConfiguration) { BOOL areReadReceiptsEnabled = [[OWSReadReceiptManager sharedManager] areReadReceiptsEnabledWithTransaction:transaction]; OWSSyncConfigurationMessage *syncConfigurationMessage = @@ -720,7 +720,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleEndSessionMessageWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -737,7 +737,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleExpirationTimerUpdateMessageWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -780,7 +780,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleProfileKeyMessageWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage { OWSAssert(envelope); OWSAssert(dataMessage); @@ -805,7 +805,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleReceivedTextMessageWithEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); @@ -845,13 +845,13 @@ NS_ASSUME_NONNULL_BEGIN } - (void)handleGroupInfoRequest:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); OWSAssert(dataMessage); OWSAssert(transaction); - OWSAssert(dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeRequestInfo); + OWSAssert(dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo); NSData *groupId = dataMessage.hasGroup ? dataMessage.group.id : nil; if (!groupId) { @@ -901,7 +901,7 @@ NS_ASSUME_NONNULL_BEGIN } - (TSIncomingMessage *_Nullable)handleReceivedEnvelope:(SSKProtoEnvelope *)envelope - withDataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + withDataMessage:(SSKProtoDataMessage *)dataMessage attachmentIds:(NSArray *)attachmentIds transaction:(YapDatabaseReadWriteTransaction *)transaction { @@ -914,7 +914,7 @@ NS_ASSUME_NONNULL_BEGIN NSData *groupId = dataMessage.hasGroup ? dataMessage.group.id : nil; OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction]; - if (dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeRequestInfo) { + if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) { [self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction]; return nil; } @@ -943,7 +943,7 @@ NS_ASSUME_NONNULL_BEGIN } switch (dataMessage.group.type) { - case OWSSignalServiceProtosGroupContextTypeUpdate: { + case SSKProtoGroupContextTypeUpdate: { // Ensures that the thread exists but doesn't update it. TSGroupThread *newGroupThread = [TSGroupThread getOrCreateThreadWithGroupId:groupId transaction:transaction]; @@ -976,7 +976,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - case OWSSignalServiceProtosGroupContextTypeQuit: { + case SSKProtoGroupContextTypeQuit: { if (!oldGroupThread) { DDLogInfo(@"%@ ignoring quit group message from unknown group.", self.logTag); return nil; @@ -994,7 +994,7 @@ NS_ASSUME_NONNULL_BEGIN customMessage:updateGroupInfo] saveWithTransaction:transaction]; return nil; } - case OWSSignalServiceProtosGroupContextTypeDeliver: { + case SSKProtoGroupContextTypeDeliver: { if (!oldGroupThread) { OWSFail(@"%@ ignoring deliver group message from unknown group.", self.logTag); return nil; @@ -1191,9 +1191,9 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - helpers -- (BOOL)isDataMessageGroupAvatarUpdate:(OWSSignalServiceProtosDataMessage *)dataMessage +- (BOOL)isDataMessageGroupAvatarUpdate:(SSKProtoDataMessage *)dataMessage { - return dataMessage.hasGroup && dataMessage.group.type == OWSSignalServiceProtosGroupContextTypeUpdate + return dataMessage.hasGroup && dataMessage.group.type == SSKProtoGroupContextTypeUpdate && dataMessage.group.hasAvatar; } @@ -1203,7 +1203,7 @@ NS_ASSUME_NONNULL_BEGIN * but never creating a new group thread. */ - (nullable TSThread *)threadForEnvelope:(SSKProtoEnvelope *)envelope - dataMessage:(OWSSignalServiceProtosDataMessage *)dataMessage + dataMessage:(SSKProtoDataMessage *)dataMessage transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(envelope); diff --git a/SignalServiceKit/src/Messages/OWSMessageReceiver.m b/SignalServiceKit/src/Messages/OWSMessageReceiver.m index cbf7c75db..427925ac2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageReceiver.m +++ b/SignalServiceKit/src/Messages/OWSMessageReceiver.m @@ -12,7 +12,6 @@ #import "OWSMessageDecrypter.h" #import "OWSPrimaryStorage.h" #import "OWSQueues.h" -#import "OWSSignalServiceProtos.pb.h" #import "OWSStorage.h" #import "TSDatabaseView.h" #import "TSErrorMessage.h" diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 3e10fd95a..ff11f19d8 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1242,7 +1242,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; NSMutableArray *messagesArray = [NSMutableArray arrayWithCapacity:recipient.devices.count]; - NSData *plainText = [message buildPlainTextData:recipient]; + NSData *_Nullable plainText = [message buildPlainTextData:recipient]; + if (!plainText) { + OWSRaiseException(InvalidMessageException, @"Failed to build message proto"); + } DDLogDebug(@"%@ built message: %@ plainTextData.length: %lu", self.logTag, [message class], diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m index 9867be0df..b51e7beb7 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m @@ -9,10 +9,10 @@ #import "OWSCallHangupMessage.h" #import "OWSCallIceUpdateMessage.h" #import "OWSCallOfferMessage.h" -#import "OWSSignalServiceProtos.pb.h" #import "ProtoBuf+OWS.h" #import "SignalRecipient.h" #import "TSContactThread.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -126,28 +126,30 @@ NS_ASSUME_NONNULL_BEGIN return YES; } -// -///** -// * override thread accessor in superclass, since this model is never saved. -// * TODO review -// */ -//- (TSThread *)thread -//{ -// return _thread; -//} - -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { OWSAssert(recipient); - OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new]; - [contentBuilder setCallMessage:[self buildCallMessage:recipient.recipientId]]; - return [[contentBuilder build] data]; + SSKProtoContentBuilder *builder = [SSKProtoContentBuilder new]; + [builder setCallMessage:[self buildCallMessage:recipient.recipientId]]; + + NSError *error; + SSKProtoCallMessage *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + NSData *_Nullable data = [result serializedDataAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return data; } -- (OWSSignalServiceProtosCallMessage *)buildCallMessage:(NSString *)recipientId +- (nullable SSKProtoCallMessage *)buildCallMessage:(NSString *)recipientId { - OWSSignalServiceProtosCallMessageBuilder *builder = [OWSSignalServiceProtosCallMessageBuilder new]; + SSKProtoCallMessageBuilder *builder = [SSKProtoCallMessageBuilder new]; if (self.offerMessage) { [builder setOffer:[self.offerMessage asProtobuf]]; @@ -172,8 +174,14 @@ NS_ASSUME_NONNULL_BEGIN } [builder addLocalProfileKeyIfNecessary:self.thread recipientId:recipientId]; - - return [builder build]; + + NSError *error; + SSKProtoCallMessage *_Nullable result = [builder buildAndReturnError:&error]; + if (error || !result) { + OWSFail(@"%@ could not build protobuf: %@", self.logTag, error); + return nil; + } + return result; } #pragma mark - TSYapDatabaseObject overrides diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m index 05807fb69..644aeade7 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m @@ -5,9 +5,9 @@ #import "OWSOutgoingNullMessage.h" #import "Cryptography.h" #import "NSDate+OWS.h" -#import "OWSSignalServiceProtos.pb.h" #import "OWSVerificationStateSyncMessage.h" #import "TSContactThread.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -45,10 +45,10 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - override TSOutgoingMessage -- (NSData *)buildPlainTextData:(SignalRecipient *)recipient +- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient { - OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new]; - OWSSignalServiceProtosNullMessageBuilder *nullMessageBuilder = [OWSSignalServiceProtosNullMessageBuilder new]; + SSKProtoContentBuilder *contentBuilder = [SSKProtoContentBuilder new]; + SSKProtoNullMessageBuilder *nullMessageBuilder = [SSKProtoNullMessageBuilder new]; NSUInteger contentLength = self.verificationStateSyncMessage.unpaddedVerifiedLength; diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m index e2e60649f..3df5ca636 100644 --- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m +++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m @@ -3,10 +3,10 @@ // #import "OWSProfileKeyMessage.h" -#import "OWSSignalServiceProtos.pb.h" #import "ProfileManagerProtocol.h" #import "ProtoBuf+OWS.h" #import "TextSecureKitEnv.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -41,14 +41,14 @@ NS_ASSUME_NONNULL_BEGIN return NO; } -- (OWSSignalServiceProtosDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId +- (SSKProtoDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId { OWSAssert(self.thread); - OWSSignalServiceProtosDataMessageBuilder *builder = [self dataMessageBuilder]; + SSKProtoDataMessageBuilder *builder = [self dataMessageBuilder]; [builder setTimestamp:self.timestamp]; [builder addLocalProfileKey]; - [builder setFlags:OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate]; + [builder setFlags:SSKProtoDataMessageFlagsProfileKeyUpdate]; if (recipientId.length > 0) { // Once we've shared our profile key with a user (perhaps due to being diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.h b/SignalServiceKit/src/Messages/OWSReadReceiptManager.h index 36a2a14ad..f97e32ab7 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.h +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.h @@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosSyncMessageRead; +@class SSKProtoSyncMessageRead; @class TSIncomingMessage; @class TSOutgoingMessage; @class TSThread; @@ -49,7 +49,7 @@ extern NSString *const kIncomingMessageMarkedAsReadNotification; #pragma mark - Linked Device Read Receipts -- (void)processReadReceiptsFromLinkedDevice:(NSArray *)readReceiptProtos +- (void)processReadReceiptsFromLinkedDevice:(NSArray *)readReceiptProtos readTimestamp:(uint64_t)readTimestamp transaction:(YapDatabaseReadWriteTransaction *)transaction; diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m index 551e069b5..7f1880824 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m @@ -11,7 +11,6 @@ #import "OWSPrimaryStorage.h" #import "OWSReadReceiptsForLinkedDevicesMessage.h" #import "OWSReadReceiptsForSenderMessage.h" -#import "OWSSignalServiceProtos.pb.h" #import "OWSStorage.h" #import "OWSSyncConfigurationMessage.h" #import "TSAccountManager.h" @@ -21,6 +20,7 @@ #import "TextSecureKitEnv.h" #import "Threading.h" #import "YapDatabaseConnection+OWS.h" +#import #import NS_ASSUME_NONNULL_BEGIN @@ -440,14 +440,14 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE [readReceipt removeWithTransaction:transaction]; } -- (void)processReadReceiptsFromLinkedDevice:(NSArray *)readReceiptProtos +- (void)processReadReceiptsFromLinkedDevice:(NSArray *)readReceiptProtos readTimestamp:(uint64_t)readTimestamp transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssert(readReceiptProtos); OWSAssert(transaction); - for (OWSSignalServiceProtosSyncMessageRead *readReceiptProto in readReceiptProtos) { + for (SSKProtoSyncMessageRead *readReceiptProto in readReceiptProtos) { NSString *_Nullable senderId = readReceiptProto.sender; uint64_t messageIdTimestamp = readReceiptProto.timestamp; diff --git a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h index bca3f4892..ce2a2ec8a 100644 --- a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h +++ b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.h @@ -1,77 +1,11 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import // @@protoc_insertion_point(imports) -@class OWSSignalServiceProtosAttachmentPointer; -@class OWSSignalServiceProtosAttachmentPointerBuilder; -@class OWSSignalServiceProtosCallMessage; -@class OWSSignalServiceProtosCallMessageAnswer; -@class OWSSignalServiceProtosCallMessageAnswerBuilder; -@class OWSSignalServiceProtosCallMessageBuilder; -@class OWSSignalServiceProtosCallMessageBusy; -@class OWSSignalServiceProtosCallMessageBusyBuilder; -@class OWSSignalServiceProtosCallMessageHangup; -@class OWSSignalServiceProtosCallMessageHangupBuilder; -@class OWSSignalServiceProtosCallMessageIceUpdate; -@class OWSSignalServiceProtosCallMessageIceUpdateBuilder; -@class OWSSignalServiceProtosCallMessageOffer; -@class OWSSignalServiceProtosCallMessageOfferBuilder; -@class OWSSignalServiceProtosContactDetails; -@class OWSSignalServiceProtosContactDetailsAvatar; -@class OWSSignalServiceProtosContactDetailsAvatarBuilder; -@class OWSSignalServiceProtosContactDetailsBuilder; -@class OWSSignalServiceProtosContent; -@class OWSSignalServiceProtosContentBuilder; -@class OWSSignalServiceProtosDataMessage; -@class OWSSignalServiceProtosDataMessageBuilder; -@class OWSSignalServiceProtosDataMessageContact; -@class OWSSignalServiceProtosDataMessageContactAvatar; -@class OWSSignalServiceProtosDataMessageContactAvatarBuilder; -@class OWSSignalServiceProtosDataMessageContactBuilder; -@class OWSSignalServiceProtosDataMessageContactEmail; -@class OWSSignalServiceProtosDataMessageContactEmailBuilder; -@class OWSSignalServiceProtosDataMessageContactName; -@class OWSSignalServiceProtosDataMessageContactNameBuilder; -@class OWSSignalServiceProtosDataMessageContactPhone; -@class OWSSignalServiceProtosDataMessageContactPhoneBuilder; -@class OWSSignalServiceProtosDataMessageContactPostalAddress; -@class OWSSignalServiceProtosDataMessageContactPostalAddressBuilder; -@class OWSSignalServiceProtosDataMessageQuote; -@class OWSSignalServiceProtosDataMessageQuoteBuilder; -@class OWSSignalServiceProtosDataMessageQuoteQuotedAttachment; -@class OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder; -@class OWSSignalServiceProtosEnvelope; -@class OWSSignalServiceProtosEnvelopeBuilder; -@class OWSSignalServiceProtosGroupContext; -@class OWSSignalServiceProtosGroupContextBuilder; -@class OWSSignalServiceProtosGroupDetails; -@class OWSSignalServiceProtosGroupDetailsAvatar; -@class OWSSignalServiceProtosGroupDetailsAvatarBuilder; -@class OWSSignalServiceProtosGroupDetailsBuilder; -@class OWSSignalServiceProtosNullMessage; -@class OWSSignalServiceProtosNullMessageBuilder; -@class OWSSignalServiceProtosReceiptMessage; -@class OWSSignalServiceProtosReceiptMessageBuilder; -@class OWSSignalServiceProtosSyncMessage; -@class OWSSignalServiceProtosSyncMessageBlocked; -@class OWSSignalServiceProtosSyncMessageBlockedBuilder; -@class OWSSignalServiceProtosSyncMessageBuilder; -@class OWSSignalServiceProtosSyncMessageConfiguration; -@class OWSSignalServiceProtosSyncMessageConfigurationBuilder; -@class OWSSignalServiceProtosSyncMessageContacts; -@class OWSSignalServiceProtosSyncMessageContactsBuilder; -@class OWSSignalServiceProtosSyncMessageGroups; -@class OWSSignalServiceProtosSyncMessageGroupsBuilder; -@class OWSSignalServiceProtosSyncMessageRead; -@class OWSSignalServiceProtosSyncMessageReadBuilder; -@class OWSSignalServiceProtosSyncMessageRequest; -@class OWSSignalServiceProtosSyncMessageRequestBuilder; -@class OWSSignalServiceProtosSyncMessageSent; -@class OWSSignalServiceProtosSyncMessageSentBuilder; -@class OWSSignalServiceProtosVerified; -@class OWSSignalServiceProtosVerifiedBuilder; @class ObjectiveCFileOptions; @class ObjectiveCFileOptionsBuilder; @class PBDescriptorProto; @@ -116,112 +50,179 @@ @class PBUninterpretedOptionBuilder; @class PBUninterpretedOptionNamePart; @class PBUninterpretedOptionNamePartBuilder; - - -typedef NS_ENUM(SInt32, OWSSignalServiceProtosEnvelopeType) { - OWSSignalServiceProtosEnvelopeTypeUnknown = 0, - OWSSignalServiceProtosEnvelopeTypeCiphertext = 1, - OWSSignalServiceProtosEnvelopeTypeKeyExchange = 2, - OWSSignalServiceProtosEnvelopeTypePrekeyBundle = 3, - OWSSignalServiceProtosEnvelopeTypeReceipt = 5, +@class SSKProtoAttachmentPointer; +@class SSKProtoAttachmentPointerBuilder; +@class SSKProtoCallMessage; +@class SSKProtoCallMessageAnswer; +@class SSKProtoCallMessageAnswerBuilder; +@class SSKProtoCallMessageBuilder; +@class SSKProtoCallMessageBusy; +@class SSKProtoCallMessageBusyBuilder; +@class SSKProtoCallMessageHangup; +@class SSKProtoCallMessageHangupBuilder; +@class SSKProtoCallMessageIceUpdate; +@class SSKProtoCallMessageIceUpdateBuilder; +@class SSKProtoCallMessageOffer; +@class SSKProtoCallMessageOfferBuilder; +@class SSKProtoContactDetails; +@class SSKProtoContactDetailsAvatar; +@class SSKProtoContactDetailsAvatarBuilder; +@class SSKProtoContactDetailsBuilder; +@class SSKProtoContent; +@class SSKProtoContentBuilder; +@class SSKProtoDataMessage; +@class SSKProtoDataMessageBuilder; +@class SSKProtoDataMessageContact; +@class SSKProtoDataMessageContactAvatar; +@class SSKProtoDataMessageContactAvatarBuilder; +@class SSKProtoDataMessageContactBuilder; +@class SSKProtoDataMessageContactEmail; +@class SSKProtoDataMessageContactEmailBuilder; +@class SSKProtoDataMessageContactName; +@class SSKProtoDataMessageContactNameBuilder; +@class SSKProtoDataMessageContactPhone; +@class SSKProtoDataMessageContactPhoneBuilder; +@class SSKProtoDataMessageContactPostalAddress; +@class SSKProtoDataMessageContactPostalAddressBuilder; +@class SSKProtoDataMessageQuote; +@class SSKProtoDataMessageQuoteBuilder; +@class SSKProtoDataMessageQuoteQuotedAttachment; +@class SSKProtoDataMessageQuoteQuotedAttachmentBuilder; +@class SSKProtoEnvelope; +@class SSKProtoEnvelopeBuilder; +@class SSKProtoGroupContext; +@class SSKProtoGroupContextBuilder; +@class SSKProtoGroupDetails; +@class SSKProtoGroupDetailsAvatar; +@class SSKProtoGroupDetailsAvatarBuilder; +@class SSKProtoGroupDetailsBuilder; +@class SSKProtoNullMessage; +@class SSKProtoNullMessageBuilder; +@class SSKProtoReceiptMessage; +@class SSKProtoReceiptMessageBuilder; +@class SSKProtoSyncMessage; +@class SSKProtoSyncMessageBlocked; +@class SSKProtoSyncMessageBlockedBuilder; +@class SSKProtoSyncMessageBuilder; +@class SSKProtoSyncMessageConfiguration; +@class SSKProtoSyncMessageConfigurationBuilder; +@class SSKProtoSyncMessageContacts; +@class SSKProtoSyncMessageContactsBuilder; +@class SSKProtoSyncMessageGroups; +@class SSKProtoSyncMessageGroupsBuilder; +@class SSKProtoSyncMessageRead; +@class SSKProtoSyncMessageReadBuilder; +@class SSKProtoSyncMessageRequest; +@class SSKProtoSyncMessageRequestBuilder; +@class SSKProtoSyncMessageSent; +@class SSKProtoSyncMessageSentBuilder; +@class SSKProtoVerified; +@class SSKProtoVerifiedBuilder; + +typedef NS_ENUM(SInt32, SSKProtoEnvelopeType) { + SSKProtoEnvelopeTypeUnknown = 0, + SSKProtoEnvelopeTypeCiphertext = 1, + SSKProtoEnvelopeTypeKeyExchange = 2, + SSKProtoEnvelopeTypePrekeyBundle = 3, + SSKProtoEnvelopeTypeReceipt = 5, }; -BOOL OWSSignalServiceProtosEnvelopeTypeIsValidValue(OWSSignalServiceProtosEnvelopeType value); -NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosEnvelopeType value); +BOOL SSKProtoEnvelopeTypeIsValidValue(SSKProtoEnvelopeType value); +NSString *NSStringFromSSKProtoEnvelopeType(SSKProtoEnvelopeType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageFlags) { - OWSSignalServiceProtosDataMessageFlagsEndSession = 1, - OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate = 2, - OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate = 4, +typedef NS_ENUM(SInt32, SSKProtoDataMessageFlags) { + SSKProtoDataMessageFlagsEndSession = 1, + SSKProtoDataMessageFlagsExpirationTimerUpdate = 2, + SSKProtoDataMessageFlagsProfileKeyUpdate = 4, }; -BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value); +BOOL SSKProtoDataMessageFlagsIsValidValue(SSKProtoDataMessageFlags value); +NSString *NSStringFromSSKProtoDataMessageFlags(SSKProtoDataMessageFlags value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags) { - OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsVoiceMessage = 1, +typedef NS_ENUM(SInt32, SSKProtoDataMessageQuoteQuotedAttachmentFlags) { + SSKProtoDataMessageQuoteQuotedAttachmentFlagsVoiceMessage = 1, }; -BOOL OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsIsValidValue(OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags(OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags value); +BOOL SSKProtoDataMessageQuoteQuotedAttachmentFlagsIsValidValue(SSKProtoDataMessageQuoteQuotedAttachmentFlags value); +NSString *NSStringFromSSKProtoDataMessageQuoteQuotedAttachmentFlags(SSKProtoDataMessageQuoteQuotedAttachmentFlags value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageContactPhoneType) { - OWSSignalServiceProtosDataMessageContactPhoneTypeHome = 1, - OWSSignalServiceProtosDataMessageContactPhoneTypeMobile = 2, - OWSSignalServiceProtosDataMessageContactPhoneTypeWork = 3, - OWSSignalServiceProtosDataMessageContactPhoneTypeCustom = 4, +typedef NS_ENUM(SInt32, SSKProtoDataMessageContactPhoneType) { + SSKProtoDataMessageContactPhoneTypeHome = 1, + SSKProtoDataMessageContactPhoneTypeMobile = 2, + SSKProtoDataMessageContactPhoneTypeWork = 3, + SSKProtoDataMessageContactPhoneTypeCustom = 4, }; -BOOL OWSSignalServiceProtosDataMessageContactPhoneTypeIsValidValue(OWSSignalServiceProtosDataMessageContactPhoneType value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSignalServiceProtosDataMessageContactPhoneType value); +BOOL SSKProtoDataMessageContactPhoneTypeIsValidValue(SSKProtoDataMessageContactPhoneType value); +NSString *NSStringFromSSKProtoDataMessageContactPhoneType(SSKProtoDataMessageContactPhoneType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageContactEmailType) { - OWSSignalServiceProtosDataMessageContactEmailTypeHome = 1, - OWSSignalServiceProtosDataMessageContactEmailTypeMobile = 2, - OWSSignalServiceProtosDataMessageContactEmailTypeWork = 3, - OWSSignalServiceProtosDataMessageContactEmailTypeCustom = 4, +typedef NS_ENUM(SInt32, SSKProtoDataMessageContactEmailType) { + SSKProtoDataMessageContactEmailTypeHome = 1, + SSKProtoDataMessageContactEmailTypeMobile = 2, + SSKProtoDataMessageContactEmailTypeWork = 3, + SSKProtoDataMessageContactEmailTypeCustom = 4, }; -BOOL OWSSignalServiceProtosDataMessageContactEmailTypeIsValidValue(OWSSignalServiceProtosDataMessageContactEmailType value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSignalServiceProtosDataMessageContactEmailType value); +BOOL SSKProtoDataMessageContactEmailTypeIsValidValue(SSKProtoDataMessageContactEmailType value); +NSString *NSStringFromSSKProtoDataMessageContactEmailType(SSKProtoDataMessageContactEmailType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosDataMessageContactPostalAddressType) { - OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome = 1, - OWSSignalServiceProtosDataMessageContactPostalAddressTypeWork = 2, - OWSSignalServiceProtosDataMessageContactPostalAddressTypeCustom = 3, +typedef NS_ENUM(SInt32, SSKProtoDataMessageContactPostalAddressType) { + SSKProtoDataMessageContactPostalAddressTypeHome = 1, + SSKProtoDataMessageContactPostalAddressTypeWork = 2, + SSKProtoDataMessageContactPostalAddressTypeCustom = 3, }; -BOOL OWSSignalServiceProtosDataMessageContactPostalAddressTypeIsValidValue(OWSSignalServiceProtosDataMessageContactPostalAddressType value); -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType(OWSSignalServiceProtosDataMessageContactPostalAddressType value); +BOOL SSKProtoDataMessageContactPostalAddressTypeIsValidValue(SSKProtoDataMessageContactPostalAddressType value); +NSString *NSStringFromSSKProtoDataMessageContactPostalAddressType(SSKProtoDataMessageContactPostalAddressType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosReceiptMessageType) { - OWSSignalServiceProtosReceiptMessageTypeDelivery = 0, - OWSSignalServiceProtosReceiptMessageTypeRead = 1, +typedef NS_ENUM(SInt32, SSKProtoReceiptMessageType) { + SSKProtoReceiptMessageTypeDelivery = 0, + SSKProtoReceiptMessageTypeRead = 1, }; -BOOL OWSSignalServiceProtosReceiptMessageTypeIsValidValue(OWSSignalServiceProtosReceiptMessageType value); -NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceProtosReceiptMessageType value); +BOOL SSKProtoReceiptMessageTypeIsValidValue(SSKProtoReceiptMessageType value); +NSString *NSStringFromSSKProtoReceiptMessageType(SSKProtoReceiptMessageType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosVerifiedState) { - OWSSignalServiceProtosVerifiedStateDefault = 0, - OWSSignalServiceProtosVerifiedStateVerified = 1, - OWSSignalServiceProtosVerifiedStateUnverified = 2, +typedef NS_ENUM(SInt32, SSKProtoVerifiedState) { + SSKProtoVerifiedStateDefault = 0, + SSKProtoVerifiedStateVerified = 1, + SSKProtoVerifiedStateUnverified = 2, }; -BOOL OWSSignalServiceProtosVerifiedStateIsValidValue(OWSSignalServiceProtosVerifiedState value); -NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtosVerifiedState value); +BOOL SSKProtoVerifiedStateIsValidValue(SSKProtoVerifiedState value); +NSString *NSStringFromSSKProtoVerifiedState(SSKProtoVerifiedState value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosSyncMessageRequestType) { - OWSSignalServiceProtosSyncMessageRequestTypeUnknown = 0, - OWSSignalServiceProtosSyncMessageRequestTypeContacts = 1, - OWSSignalServiceProtosSyncMessageRequestTypeGroups = 2, - OWSSignalServiceProtosSyncMessageRequestTypeBlocked = 3, - OWSSignalServiceProtosSyncMessageRequestTypeConfiguration = 4, +typedef NS_ENUM(SInt32, SSKProtoSyncMessageRequestType) { + SSKProtoSyncMessageRequestTypeUnknown = 0, + SSKProtoSyncMessageRequestTypeContacts = 1, + SSKProtoSyncMessageRequestTypeGroups = 2, + SSKProtoSyncMessageRequestTypeBlocked = 3, + SSKProtoSyncMessageRequestTypeConfiguration = 4, }; -BOOL OWSSignalServiceProtosSyncMessageRequestTypeIsValidValue(OWSSignalServiceProtosSyncMessageRequestType value); -NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServiceProtosSyncMessageRequestType value); +BOOL SSKProtoSyncMessageRequestTypeIsValidValue(SSKProtoSyncMessageRequestType value); +NSString *NSStringFromSSKProtoSyncMessageRequestType(SSKProtoSyncMessageRequestType value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosAttachmentPointerFlags) { - OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage = 1, +typedef NS_ENUM(SInt32, SSKProtoAttachmentPointerFlags) { + SSKProtoAttachmentPointerFlagsVoiceMessage = 1, }; -BOOL OWSSignalServiceProtosAttachmentPointerFlagsIsValidValue(OWSSignalServiceProtosAttachmentPointerFlags value); -NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServiceProtosAttachmentPointerFlags value); +BOOL SSKProtoAttachmentPointerFlagsIsValidValue(SSKProtoAttachmentPointerFlags value); +NSString *NSStringFromSSKProtoAttachmentPointerFlags(SSKProtoAttachmentPointerFlags value); -typedef NS_ENUM(SInt32, OWSSignalServiceProtosGroupContextType) { - OWSSignalServiceProtosGroupContextTypeUnknown = 0, - OWSSignalServiceProtosGroupContextTypeUpdate = 1, - OWSSignalServiceProtosGroupContextTypeDeliver = 2, - OWSSignalServiceProtosGroupContextTypeQuit = 3, - OWSSignalServiceProtosGroupContextTypeRequestInfo = 4, +typedef NS_ENUM(SInt32, SSKProtoGroupContextType) { + SSKProtoGroupContextTypeUnknown = 0, + SSKProtoGroupContextTypeUpdate = 1, + SSKProtoGroupContextTypeDeliver = 2, + SSKProtoGroupContextTypeQuit = 3, + SSKProtoGroupContextTypeRequestInfo = 4, }; -BOOL OWSSignalServiceProtosGroupContextTypeIsValidValue(OWSSignalServiceProtosGroupContextType value); -NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServiceProtosGroupContextType value); +BOOL SSKProtoGroupContextTypeIsValidValue(SSKProtoGroupContextType value); +NSString *NSStringFromSSKProtoGroupContextType(SSKProtoGroupContextType value); -@interface OWSSignalServiceProtosOwssignalServiceProtosRoot : NSObject { +@interface OWSSignalServiceProtosSSKProtoRoot : NSObject { } + (PBExtensionRegistry*) extensionRegistry; + (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry; @@ -234,7 +235,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define Envelope_timestamp @"timestamp" #define Envelope_legacyMessage @"legacyMessage" #define Envelope_content @"content" -@interface OWSSignalServiceProtosEnvelope : PBGeneratedMessage { +@interface SSKProtoEnvelope : PBGeneratedMessage { @private BOOL hasTimestamp_:1; BOOL hasSource_:1; @@ -249,7 +250,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro NSData* legacyMessage; NSData* content; UInt32 sourceDevice; - OWSSignalServiceProtosEnvelopeType type; + SSKProtoEnvelopeType type; } - (BOOL) hasType; - (BOOL) hasSource; @@ -258,7 +259,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasTimestamp; - (BOOL) hasLegacyMessage; - (BOOL) hasContent; -@property (readonly) OWSSignalServiceProtosEnvelopeType type; +@property (readonly) SSKProtoEnvelopeType type; @property (readonly, strong) NSString* source; @property (readonly) UInt32 sourceDevice; @property (readonly, strong) NSString* relay; @@ -271,70 +272,70 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosEnvelopeBuilder*) builder; -+ (OWSSignalServiceProtosEnvelopeBuilder*) builder; -+ (OWSSignalServiceProtosEnvelopeBuilder*) builderWithPrototype:(OWSSignalServiceProtosEnvelope*) prototype; -- (OWSSignalServiceProtosEnvelopeBuilder*) toBuilder; +- (SSKProtoEnvelopeBuilder*) builder; ++ (SSKProtoEnvelopeBuilder*) builder; ++ (SSKProtoEnvelopeBuilder*) builderWithPrototype:(SSKProtoEnvelope*) prototype; +- (SSKProtoEnvelopeBuilder*) toBuilder; -+ (OWSSignalServiceProtosEnvelope*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosEnvelope*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoEnvelope*) parseFromData:(NSData*) data; ++ (SSKProtoEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoEnvelope*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosEnvelopeBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoEnvelopeBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosEnvelope* resultEnvelope; + SSKProtoEnvelope* resultEnvelope; } -- (OWSSignalServiceProtosEnvelope*) defaultInstance; +- (SSKProtoEnvelope*) defaultInstance; -- (OWSSignalServiceProtosEnvelopeBuilder*) clear; -- (OWSSignalServiceProtosEnvelopeBuilder*) clone; +- (SSKProtoEnvelopeBuilder*) clear; +- (SSKProtoEnvelopeBuilder*) clone; -- (OWSSignalServiceProtosEnvelope*) build; -- (OWSSignalServiceProtosEnvelope*) buildPartial; +- (SSKProtoEnvelope*) build; +- (SSKProtoEnvelope*) buildPartial; -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFrom:(OWSSignalServiceProtosEnvelope*) other; -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoEnvelopeBuilder*) mergeFrom:(SSKProtoEnvelope*) other; +- (SSKProtoEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasType; -- (OWSSignalServiceProtosEnvelopeType) type; -- (OWSSignalServiceProtosEnvelopeBuilder*) setType:(OWSSignalServiceProtosEnvelopeType) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearType; +- (SSKProtoEnvelopeType) type; +- (SSKProtoEnvelopeBuilder*) setType:(SSKProtoEnvelopeType) value; +- (SSKProtoEnvelopeBuilder*) clearType; - (BOOL) hasSource; - (NSString*) source; -- (OWSSignalServiceProtosEnvelopeBuilder*) setSource:(NSString*) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearSource; +- (SSKProtoEnvelopeBuilder*) setSource:(NSString*) value; +- (SSKProtoEnvelopeBuilder*) clearSource; - (BOOL) hasSourceDevice; - (UInt32) sourceDevice; -- (OWSSignalServiceProtosEnvelopeBuilder*) setSourceDevice:(UInt32) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearSourceDevice; +- (SSKProtoEnvelopeBuilder*) setSourceDevice:(UInt32) value; +- (SSKProtoEnvelopeBuilder*) clearSourceDevice; - (BOOL) hasRelay; - (NSString*) relay; -- (OWSSignalServiceProtosEnvelopeBuilder*) setRelay:(NSString*) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearRelay; +- (SSKProtoEnvelopeBuilder*) setRelay:(NSString*) value; +- (SSKProtoEnvelopeBuilder*) clearRelay; - (BOOL) hasTimestamp; - (UInt64) timestamp; -- (OWSSignalServiceProtosEnvelopeBuilder*) setTimestamp:(UInt64) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearTimestamp; +- (SSKProtoEnvelopeBuilder*) setTimestamp:(UInt64) value; +- (SSKProtoEnvelopeBuilder*) clearTimestamp; - (BOOL) hasLegacyMessage; - (NSData*) legacyMessage; -- (OWSSignalServiceProtosEnvelopeBuilder*) setLegacyMessage:(NSData*) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearLegacyMessage; +- (SSKProtoEnvelopeBuilder*) setLegacyMessage:(NSData*) value; +- (SSKProtoEnvelopeBuilder*) clearLegacyMessage; - (BOOL) hasContent; - (NSData*) content; -- (OWSSignalServiceProtosEnvelopeBuilder*) setContent:(NSData*) value; -- (OWSSignalServiceProtosEnvelopeBuilder*) clearContent; +- (SSKProtoEnvelopeBuilder*) setContent:(NSData*) value; +- (SSKProtoEnvelopeBuilder*) clearContent; @end #define Content_dataMessage @"dataMessage" @@ -342,99 +343,99 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define Content_callMessage @"callMessage" #define Content_nullMessage @"nullMessage" #define Content_receiptMessage @"receiptMessage" -@interface OWSSignalServiceProtosContent : PBGeneratedMessage { +@interface SSKProtoContent : PBGeneratedMessage { @private BOOL hasDataMessage_:1; BOOL hasSyncMessage_:1; BOOL hasCallMessage_:1; BOOL hasNullMessage_:1; BOOL hasReceiptMessage_:1; - OWSSignalServiceProtosDataMessage* dataMessage; - OWSSignalServiceProtosSyncMessage* syncMessage; - OWSSignalServiceProtosCallMessage* callMessage; - OWSSignalServiceProtosNullMessage* nullMessage; - OWSSignalServiceProtosReceiptMessage* receiptMessage; + SSKProtoDataMessage* dataMessage; + SSKProtoSyncMessage* syncMessage; + SSKProtoCallMessage* callMessage; + SSKProtoNullMessage* nullMessage; + SSKProtoReceiptMessage* receiptMessage; } - (BOOL) hasDataMessage; - (BOOL) hasSyncMessage; - (BOOL) hasCallMessage; - (BOOL) hasNullMessage; - (BOOL) hasReceiptMessage; -@property (readonly, strong) OWSSignalServiceProtosDataMessage* dataMessage; -@property (readonly, strong) OWSSignalServiceProtosSyncMessage* syncMessage; -@property (readonly, strong) OWSSignalServiceProtosCallMessage* callMessage; -@property (readonly, strong) OWSSignalServiceProtosNullMessage* nullMessage; -@property (readonly, strong) OWSSignalServiceProtosReceiptMessage* receiptMessage; +@property (readonly, strong) SSKProtoDataMessage* dataMessage; +@property (readonly, strong) SSKProtoSyncMessage* syncMessage; +@property (readonly, strong) SSKProtoCallMessage* callMessage; +@property (readonly, strong) SSKProtoNullMessage* nullMessage; +@property (readonly, strong) SSKProtoReceiptMessage* receiptMessage; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosContentBuilder*) builder; -+ (OWSSignalServiceProtosContentBuilder*) builder; -+ (OWSSignalServiceProtosContentBuilder*) builderWithPrototype:(OWSSignalServiceProtosContent*) prototype; -- (OWSSignalServiceProtosContentBuilder*) toBuilder; +- (SSKProtoContentBuilder*) builder; ++ (SSKProtoContentBuilder*) builder; ++ (SSKProtoContentBuilder*) builderWithPrototype:(SSKProtoContent*) prototype; +- (SSKProtoContentBuilder*) toBuilder; -+ (OWSSignalServiceProtosContent*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosContent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContent*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosContent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContent*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosContent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContent*) parseFromData:(NSData*) data; ++ (SSKProtoContent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContent*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoContent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContent*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoContent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosContentBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoContentBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosContent* resultContent; + SSKProtoContent* resultContent; } -- (OWSSignalServiceProtosContent*) defaultInstance; +- (SSKProtoContent*) defaultInstance; -- (OWSSignalServiceProtosContentBuilder*) clear; -- (OWSSignalServiceProtosContentBuilder*) clone; +- (SSKProtoContentBuilder*) clear; +- (SSKProtoContentBuilder*) clone; -- (OWSSignalServiceProtosContent*) build; -- (OWSSignalServiceProtosContent*) buildPartial; +- (SSKProtoContent*) build; +- (SSKProtoContent*) buildPartial; -- (OWSSignalServiceProtosContentBuilder*) mergeFrom:(OWSSignalServiceProtosContent*) other; -- (OWSSignalServiceProtosContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoContentBuilder*) mergeFrom:(SSKProtoContent*) other; +- (SSKProtoContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDataMessage; -- (OWSSignalServiceProtosDataMessage*) dataMessage; -- (OWSSignalServiceProtosContentBuilder*) setDataMessage:(OWSSignalServiceProtosDataMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) setDataMessageBuilder:(OWSSignalServiceProtosDataMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosContentBuilder*) mergeDataMessage:(OWSSignalServiceProtosDataMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) clearDataMessage; +- (SSKProtoDataMessage*) dataMessage; +- (SSKProtoContentBuilder*) setDataMessage:(SSKProtoDataMessage*) value; +- (SSKProtoContentBuilder*) setDataMessageBuilder:(SSKProtoDataMessageBuilder*) builderForValue; +- (SSKProtoContentBuilder*) mergeDataMessage:(SSKProtoDataMessage*) value; +- (SSKProtoContentBuilder*) clearDataMessage; - (BOOL) hasSyncMessage; -- (OWSSignalServiceProtosSyncMessage*) syncMessage; -- (OWSSignalServiceProtosContentBuilder*) setSyncMessage:(OWSSignalServiceProtosSyncMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) setSyncMessageBuilder:(OWSSignalServiceProtosSyncMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosContentBuilder*) mergeSyncMessage:(OWSSignalServiceProtosSyncMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) clearSyncMessage; +- (SSKProtoSyncMessage*) syncMessage; +- (SSKProtoContentBuilder*) setSyncMessage:(SSKProtoSyncMessage*) value; +- (SSKProtoContentBuilder*) setSyncMessageBuilder:(SSKProtoSyncMessageBuilder*) builderForValue; +- (SSKProtoContentBuilder*) mergeSyncMessage:(SSKProtoSyncMessage*) value; +- (SSKProtoContentBuilder*) clearSyncMessage; - (BOOL) hasCallMessage; -- (OWSSignalServiceProtosCallMessage*) callMessage; -- (OWSSignalServiceProtosContentBuilder*) setCallMessage:(OWSSignalServiceProtosCallMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) setCallMessageBuilder:(OWSSignalServiceProtosCallMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosContentBuilder*) mergeCallMessage:(OWSSignalServiceProtosCallMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) clearCallMessage; +- (SSKProtoCallMessage*) callMessage; +- (SSKProtoContentBuilder*) setCallMessage:(SSKProtoCallMessage*) value; +- (SSKProtoContentBuilder*) setCallMessageBuilder:(SSKProtoCallMessageBuilder*) builderForValue; +- (SSKProtoContentBuilder*) mergeCallMessage:(SSKProtoCallMessage*) value; +- (SSKProtoContentBuilder*) clearCallMessage; - (BOOL) hasNullMessage; -- (OWSSignalServiceProtosNullMessage*) nullMessage; -- (OWSSignalServiceProtosContentBuilder*) setNullMessage:(OWSSignalServiceProtosNullMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) setNullMessageBuilder:(OWSSignalServiceProtosNullMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosContentBuilder*) mergeNullMessage:(OWSSignalServiceProtosNullMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) clearNullMessage; +- (SSKProtoNullMessage*) nullMessage; +- (SSKProtoContentBuilder*) setNullMessage:(SSKProtoNullMessage*) value; +- (SSKProtoContentBuilder*) setNullMessageBuilder:(SSKProtoNullMessageBuilder*) builderForValue; +- (SSKProtoContentBuilder*) mergeNullMessage:(SSKProtoNullMessage*) value; +- (SSKProtoContentBuilder*) clearNullMessage; - (BOOL) hasReceiptMessage; -- (OWSSignalServiceProtosReceiptMessage*) receiptMessage; -- (OWSSignalServiceProtosContentBuilder*) setReceiptMessage:(OWSSignalServiceProtosReceiptMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) setReceiptMessageBuilder:(OWSSignalServiceProtosReceiptMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosContentBuilder*) mergeReceiptMessage:(OWSSignalServiceProtosReceiptMessage*) value; -- (OWSSignalServiceProtosContentBuilder*) clearReceiptMessage; +- (SSKProtoReceiptMessage*) receiptMessage; +- (SSKProtoContentBuilder*) setReceiptMessage:(SSKProtoReceiptMessage*) value; +- (SSKProtoContentBuilder*) setReceiptMessageBuilder:(SSKProtoReceiptMessageBuilder*) builderForValue; +- (SSKProtoContentBuilder*) mergeReceiptMessage:(SSKProtoReceiptMessage*) value; +- (SSKProtoContentBuilder*) clearReceiptMessage; @end #define CallMessage_offer @"offer" @@ -443,17 +444,17 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define CallMessage_hangup @"hangup" #define CallMessage_busy @"busy" #define CallMessage_profileKey @"profileKey" -@interface OWSSignalServiceProtosCallMessage : PBGeneratedMessage { +@interface SSKProtoCallMessage : PBGeneratedMessage { @private BOOL hasOffer_:1; BOOL hasAnswer_:1; BOOL hasHangup_:1; BOOL hasBusy_:1; BOOL hasProfileKey_:1; - OWSSignalServiceProtosCallMessageOffer* offer; - OWSSignalServiceProtosCallMessageAnswer* answer; - OWSSignalServiceProtosCallMessageHangup* hangup; - OWSSignalServiceProtosCallMessageBusy* busy; + SSKProtoCallMessageOffer* offer; + SSKProtoCallMessageAnswer* answer; + SSKProtoCallMessageHangup* hangup; + SSKProtoCallMessageBusy* busy; NSData* profileKey; NSMutableArray * iceUpdateArray; } @@ -462,35 +463,35 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasHangup; - (BOOL) hasBusy; - (BOOL) hasProfileKey; -@property (readonly, strong) OWSSignalServiceProtosCallMessageOffer* offer; -@property (readonly, strong) OWSSignalServiceProtosCallMessageAnswer* answer; -@property (readonly, strong) NSArray * iceUpdate; -@property (readonly, strong) OWSSignalServiceProtosCallMessageHangup* hangup; -@property (readonly, strong) OWSSignalServiceProtosCallMessageBusy* busy; +@property (readonly, strong) SSKProtoCallMessageOffer* offer; +@property (readonly, strong) SSKProtoCallMessageAnswer* answer; +@property (readonly, strong) NSArray * iceUpdate; +@property (readonly, strong) SSKProtoCallMessageHangup* hangup; +@property (readonly, strong) SSKProtoCallMessageBusy* busy; @property (readonly, strong) NSData* profileKey; -- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index; +- (SSKProtoCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessage*) prototype; -- (OWSSignalServiceProtosCallMessageBuilder*) toBuilder; +- (SSKProtoCallMessageBuilder*) builder; ++ (SSKProtoCallMessageBuilder*) builder; ++ (SSKProtoCallMessageBuilder*) builderWithPrototype:(SSKProtoCallMessage*) prototype; +- (SSKProtoCallMessageBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessage*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessage*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Offer_id @"id" #define Offer_sessionDescription @"sessionDescription" -@interface OWSSignalServiceProtosCallMessageOffer : PBGeneratedMessage { +@interface SSKProtoCallMessageOffer : PBGeneratedMessage { @private BOOL hasId_:1; BOOL hasSessionDescription_:1; @@ -507,50 +508,50 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageOffer*) prototype; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) toBuilder; +- (SSKProtoCallMessageOfferBuilder*) builder; ++ (SSKProtoCallMessageOfferBuilder*) builder; ++ (SSKProtoCallMessageOfferBuilder*) builderWithPrototype:(SSKProtoCallMessageOffer*) prototype; +- (SSKProtoCallMessageOfferBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageOffer*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageOffer*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosCallMessageOfferBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageOfferBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessageOffer* resultOffer; + SSKProtoCallMessageOffer* resultOffer; } -- (OWSSignalServiceProtosCallMessageOffer*) defaultInstance; +- (SSKProtoCallMessageOffer*) defaultInstance; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clear; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clone; +- (SSKProtoCallMessageOfferBuilder*) clear; +- (SSKProtoCallMessageOfferBuilder*) clone; -- (OWSSignalServiceProtosCallMessageOffer*) build; -- (OWSSignalServiceProtosCallMessageOffer*) buildPartial; +- (SSKProtoCallMessageOffer*) build; +- (SSKProtoCallMessageOffer*) buildPartial; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageOffer*) other; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageOfferBuilder*) mergeFrom:(SSKProtoCallMessageOffer*) other; +- (SSKProtoCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearId; +- (SSKProtoCallMessageOfferBuilder*) setId:(UInt64) value; +- (SSKProtoCallMessageOfferBuilder*) clearId; - (BOOL) hasSessionDescription; - (NSString*) sessionDescription; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setSessionDescription:(NSString*) value; -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearSessionDescription; +- (SSKProtoCallMessageOfferBuilder*) setSessionDescription:(NSString*) value; +- (SSKProtoCallMessageOfferBuilder*) clearSessionDescription; @end #define Answer_id @"id" #define Answer_sessionDescription @"sessionDescription" -@interface OWSSignalServiceProtosCallMessageAnswer : PBGeneratedMessage { +@interface SSKProtoCallMessageAnswer : PBGeneratedMessage { @private BOOL hasId_:1; BOOL hasSessionDescription_:1; @@ -567,52 +568,52 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageAnswer*) prototype; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) toBuilder; +- (SSKProtoCallMessageAnswerBuilder*) builder; ++ (SSKProtoCallMessageAnswerBuilder*) builder; ++ (SSKProtoCallMessageAnswerBuilder*) builderWithPrototype:(SSKProtoCallMessageAnswer*) prototype; +- (SSKProtoCallMessageAnswerBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageAnswer*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosCallMessageAnswerBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageAnswerBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessageAnswer* resultAnswer; + SSKProtoCallMessageAnswer* resultAnswer; } -- (OWSSignalServiceProtosCallMessageAnswer*) defaultInstance; +- (SSKProtoCallMessageAnswer*) defaultInstance; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clear; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clone; +- (SSKProtoCallMessageAnswerBuilder*) clear; +- (SSKProtoCallMessageAnswerBuilder*) clone; -- (OWSSignalServiceProtosCallMessageAnswer*) build; -- (OWSSignalServiceProtosCallMessageAnswer*) buildPartial; +- (SSKProtoCallMessageAnswer*) build; +- (SSKProtoCallMessageAnswer*) buildPartial; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageAnswer*) other; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageAnswerBuilder*) mergeFrom:(SSKProtoCallMessageAnswer*) other; +- (SSKProtoCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearId; +- (SSKProtoCallMessageAnswerBuilder*) setId:(UInt64) value; +- (SSKProtoCallMessageAnswerBuilder*) clearId; - (BOOL) hasSessionDescription; - (NSString*) sessionDescription; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value; -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearSessionDescription; +- (SSKProtoCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value; +- (SSKProtoCallMessageAnswerBuilder*) clearSessionDescription; @end #define IceUpdate_id @"id" #define IceUpdate_sdpMid @"sdpMid" #define IceUpdate_sdpMLineIndex @"sdpMlineIndex" #define IceUpdate_sdp @"sdp" -@interface OWSSignalServiceProtosCallMessageIceUpdate : PBGeneratedMessage { +@interface SSKProtoCallMessageIceUpdate : PBGeneratedMessage { @private BOOL hasId_:1; BOOL hasSdpMid_:1; @@ -637,59 +638,59 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageIceUpdate*) prototype; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) toBuilder; +- (SSKProtoCallMessageIceUpdateBuilder*) builder; ++ (SSKProtoCallMessageIceUpdateBuilder*) builder; ++ (SSKProtoCallMessageIceUpdateBuilder*) builderWithPrototype:(SSKProtoCallMessageIceUpdate*) prototype; +- (SSKProtoCallMessageIceUpdateBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageIceUpdate*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosCallMessageIceUpdateBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageIceUpdateBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessageIceUpdate* resultIceUpdate; + SSKProtoCallMessageIceUpdate* resultIceUpdate; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) defaultInstance; +- (SSKProtoCallMessageIceUpdate*) defaultInstance; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clear; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clone; +- (SSKProtoCallMessageIceUpdateBuilder*) clear; +- (SSKProtoCallMessageIceUpdateBuilder*) clone; -- (OWSSignalServiceProtosCallMessageIceUpdate*) build; -- (OWSSignalServiceProtosCallMessageIceUpdate*) buildPartial; +- (SSKProtoCallMessageIceUpdate*) build; +- (SSKProtoCallMessageIceUpdate*) buildPartial; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageIceUpdate*) other; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFrom:(SSKProtoCallMessageIceUpdate*) other; +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearId; +- (SSKProtoCallMessageIceUpdateBuilder*) setId:(UInt64) value; +- (SSKProtoCallMessageIceUpdateBuilder*) clearId; - (BOOL) hasSdpMid; - (NSString*) sdpMid; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMid; +- (SSKProtoCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value; +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdpMid; - (BOOL) hasSdpMlineIndex; - (UInt32) sdpMlineIndex; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMlineIndex; +- (SSKProtoCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value; +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdpMlineIndex; - (BOOL) hasSdp; - (NSString*) sdp; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdp:(NSString*) value; -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdp; +- (SSKProtoCallMessageIceUpdateBuilder*) setSdp:(NSString*) value; +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdp; @end #define Busy_id @"id" -@interface OWSSignalServiceProtosCallMessageBusy : PBGeneratedMessage { +@interface SSKProtoCallMessageBusy : PBGeneratedMessage { @private BOOL hasId_:1; UInt64 id; @@ -702,44 +703,44 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageBusy*) prototype; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) toBuilder; +- (SSKProtoCallMessageBusyBuilder*) builder; ++ (SSKProtoCallMessageBusyBuilder*) builder; ++ (SSKProtoCallMessageBusyBuilder*) builderWithPrototype:(SSKProtoCallMessageBusy*) prototype; +- (SSKProtoCallMessageBusyBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageBusy*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageBusy*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosCallMessageBusyBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageBusyBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessageBusy* resultBusy; + SSKProtoCallMessageBusy* resultBusy; } -- (OWSSignalServiceProtosCallMessageBusy*) defaultInstance; +- (SSKProtoCallMessageBusy*) defaultInstance; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clear; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clone; +- (SSKProtoCallMessageBusyBuilder*) clear; +- (SSKProtoCallMessageBusyBuilder*) clone; -- (OWSSignalServiceProtosCallMessageBusy*) build; -- (OWSSignalServiceProtosCallMessageBusy*) buildPartial; +- (SSKProtoCallMessageBusy*) build; +- (SSKProtoCallMessageBusy*) buildPartial; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageBusy*) other; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageBusyBuilder*) mergeFrom:(SSKProtoCallMessageBusy*) other; +- (SSKProtoCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clearId; +- (SSKProtoCallMessageBusyBuilder*) setId:(UInt64) value; +- (SSKProtoCallMessageBusyBuilder*) clearId; @end #define Hangup_id @"id" -@interface OWSSignalServiceProtosCallMessageHangup : PBGeneratedMessage { +@interface SSKProtoCallMessageHangup : PBGeneratedMessage { @private BOOL hasId_:1; UInt64 id; @@ -752,97 +753,97 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builder; -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageHangup*) prototype; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) toBuilder; +- (SSKProtoCallMessageHangupBuilder*) builder; ++ (SSKProtoCallMessageHangupBuilder*) builder; ++ (SSKProtoCallMessageHangupBuilder*) builderWithPrototype:(SSKProtoCallMessageHangup*) prototype; +- (SSKProtoCallMessageHangupBuilder*) toBuilder; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageHangup*) parseFromData:(NSData*) data; ++ (SSKProtoCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageHangup*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosCallMessageHangupBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageHangupBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessageHangup* resultHangup; + SSKProtoCallMessageHangup* resultHangup; } -- (OWSSignalServiceProtosCallMessageHangup*) defaultInstance; +- (SSKProtoCallMessageHangup*) defaultInstance; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clear; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clone; +- (SSKProtoCallMessageHangupBuilder*) clear; +- (SSKProtoCallMessageHangupBuilder*) clone; -- (OWSSignalServiceProtosCallMessageHangup*) build; -- (OWSSignalServiceProtosCallMessageHangup*) buildPartial; +- (SSKProtoCallMessageHangup*) build; +- (SSKProtoCallMessageHangup*) buildPartial; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageHangup*) other; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageHangupBuilder*) mergeFrom:(SSKProtoCallMessageHangup*) other; +- (SSKProtoCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clearId; +- (SSKProtoCallMessageHangupBuilder*) setId:(UInt64) value; +- (SSKProtoCallMessageHangupBuilder*) clearId; @end -@interface OWSSignalServiceProtosCallMessageBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoCallMessageBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosCallMessage* resultCallMessage; + SSKProtoCallMessage* resultCallMessage; } -- (OWSSignalServiceProtosCallMessage*) defaultInstance; +- (SSKProtoCallMessage*) defaultInstance; -- (OWSSignalServiceProtosCallMessageBuilder*) clear; -- (OWSSignalServiceProtosCallMessageBuilder*) clone; +- (SSKProtoCallMessageBuilder*) clear; +- (SSKProtoCallMessageBuilder*) clone; -- (OWSSignalServiceProtosCallMessage*) build; -- (OWSSignalServiceProtosCallMessage*) buildPartial; +- (SSKProtoCallMessage*) build; +- (SSKProtoCallMessage*) buildPartial; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessage*) other; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoCallMessageBuilder*) mergeFrom:(SSKProtoCallMessage*) other; +- (SSKProtoCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasOffer; -- (OWSSignalServiceProtosCallMessageOffer*) offer; -- (OWSSignalServiceProtosCallMessageBuilder*) setOffer:(OWSSignalServiceProtosCallMessageOffer*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) setOfferBuilder:(OWSSignalServiceProtosCallMessageOfferBuilder*) builderForValue; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeOffer:(OWSSignalServiceProtosCallMessageOffer*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) clearOffer; +- (SSKProtoCallMessageOffer*) offer; +- (SSKProtoCallMessageBuilder*) setOffer:(SSKProtoCallMessageOffer*) value; +- (SSKProtoCallMessageBuilder*) setOfferBuilder:(SSKProtoCallMessageOfferBuilder*) builderForValue; +- (SSKProtoCallMessageBuilder*) mergeOffer:(SSKProtoCallMessageOffer*) value; +- (SSKProtoCallMessageBuilder*) clearOffer; - (BOOL) hasAnswer; -- (OWSSignalServiceProtosCallMessageAnswer*) answer; -- (OWSSignalServiceProtosCallMessageBuilder*) setAnswer:(OWSSignalServiceProtosCallMessageAnswer*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) setAnswerBuilder:(OWSSignalServiceProtosCallMessageAnswerBuilder*) builderForValue; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeAnswer:(OWSSignalServiceProtosCallMessageAnswer*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) clearAnswer; - -- (NSMutableArray *)iceUpdate; -- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosCallMessageBuilder *)addIceUpdate:(OWSSignalServiceProtosCallMessageIceUpdate*)value; -- (OWSSignalServiceProtosCallMessageBuilder *)setIceUpdateArray:(NSArray *)array; -- (OWSSignalServiceProtosCallMessageBuilder *)clearIceUpdate; +- (SSKProtoCallMessageAnswer*) answer; +- (SSKProtoCallMessageBuilder*) setAnswer:(SSKProtoCallMessageAnswer*) value; +- (SSKProtoCallMessageBuilder*) setAnswerBuilder:(SSKProtoCallMessageAnswerBuilder*) builderForValue; +- (SSKProtoCallMessageBuilder*) mergeAnswer:(SSKProtoCallMessageAnswer*) value; +- (SSKProtoCallMessageBuilder*) clearAnswer; + +- (NSMutableArray *)iceUpdate; +- (SSKProtoCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index; +- (SSKProtoCallMessageBuilder *)addIceUpdate:(SSKProtoCallMessageIceUpdate*)value; +- (SSKProtoCallMessageBuilder *)setIceUpdateArray:(NSArray *)array; +- (SSKProtoCallMessageBuilder *)clearIceUpdate; - (BOOL) hasHangup; -- (OWSSignalServiceProtosCallMessageHangup*) hangup; -- (OWSSignalServiceProtosCallMessageBuilder*) setHangup:(OWSSignalServiceProtosCallMessageHangup*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) setHangupBuilder:(OWSSignalServiceProtosCallMessageHangupBuilder*) builderForValue; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeHangup:(OWSSignalServiceProtosCallMessageHangup*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) clearHangup; +- (SSKProtoCallMessageHangup*) hangup; +- (SSKProtoCallMessageBuilder*) setHangup:(SSKProtoCallMessageHangup*) value; +- (SSKProtoCallMessageBuilder*) setHangupBuilder:(SSKProtoCallMessageHangupBuilder*) builderForValue; +- (SSKProtoCallMessageBuilder*) mergeHangup:(SSKProtoCallMessageHangup*) value; +- (SSKProtoCallMessageBuilder*) clearHangup; - (BOOL) hasBusy; -- (OWSSignalServiceProtosCallMessageBusy*) busy; -- (OWSSignalServiceProtosCallMessageBuilder*) setBusy:(OWSSignalServiceProtosCallMessageBusy*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) setBusyBuilder:(OWSSignalServiceProtosCallMessageBusyBuilder*) builderForValue; -- (OWSSignalServiceProtosCallMessageBuilder*) mergeBusy:(OWSSignalServiceProtosCallMessageBusy*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) clearBusy; +- (SSKProtoCallMessageBusy*) busy; +- (SSKProtoCallMessageBuilder*) setBusy:(SSKProtoCallMessageBusy*) value; +- (SSKProtoCallMessageBuilder*) setBusyBuilder:(SSKProtoCallMessageBusyBuilder*) builderForValue; +- (SSKProtoCallMessageBuilder*) mergeBusy:(SSKProtoCallMessageBusy*) value; +- (SSKProtoCallMessageBuilder*) clearBusy; - (BOOL) hasProfileKey; - (NSData*) profileKey; -- (OWSSignalServiceProtosCallMessageBuilder*) setProfileKey:(NSData*) value; -- (OWSSignalServiceProtosCallMessageBuilder*) clearProfileKey; +- (SSKProtoCallMessageBuilder*) setProfileKey:(NSData*) value; +- (SSKProtoCallMessageBuilder*) clearProfileKey; @end #define DataMessage_body @"body" @@ -854,7 +855,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define DataMessage_timestamp @"timestamp" #define DataMessage_quote @"quote" #define DataMessage_contact @"contact" -@interface OWSSignalServiceProtosDataMessage : PBGeneratedMessage { +@interface SSKProtoDataMessage : PBGeneratedMessage { @private BOOL hasTimestamp_:1; BOOL hasBody_:1; @@ -865,8 +866,8 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro BOOL hasExpireTimer_:1; UInt64 timestamp; NSString* body; - OWSSignalServiceProtosGroupContext* group; - OWSSignalServiceProtosDataMessageQuote* quote; + SSKProtoGroupContext* group; + SSKProtoDataMessageQuote* quote; NSData* profileKey; UInt32 flags; UInt32 expireTimer; @@ -881,40 +882,40 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasTimestamp; - (BOOL) hasQuote; @property (readonly, strong) NSString* body; -@property (readonly, strong) NSArray * attachments; -@property (readonly, strong) OWSSignalServiceProtosGroupContext* group; +@property (readonly, strong) NSArray * attachments; +@property (readonly, strong) SSKProtoGroupContext* group; @property (readonly) UInt32 flags; @property (readonly) UInt32 expireTimer; @property (readonly, strong) NSData* profileKey; @property (readonly) UInt64 timestamp; -@property (readonly, strong) OWSSignalServiceProtosDataMessageQuote* quote; -@property (readonly, strong) NSArray * contact; -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContact*)contactAtIndex:(NSUInteger)index; +@property (readonly, strong) SSKProtoDataMessageQuote* quote; +@property (readonly, strong) NSArray * contact; +- (SSKProtoAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContact*)contactAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessage*) prototype; -- (OWSSignalServiceProtosDataMessageBuilder*) toBuilder; +- (SSKProtoDataMessageBuilder*) builder; ++ (SSKProtoDataMessageBuilder*) builder; ++ (SSKProtoDataMessageBuilder*) builderWithPrototype:(SSKProtoDataMessage*) prototype; +- (SSKProtoDataMessageBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessage*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessage*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Quote_id @"id" #define Quote_author @"author" #define Quote_text @"text" #define Quote_attachments @"attachments" -@interface OWSSignalServiceProtosDataMessageQuote : PBGeneratedMessage { +@interface SSKProtoDataMessageQuote : PBGeneratedMessage { @private BOOL hasId_:1; BOOL hasAuthor_:1; @@ -930,32 +931,32 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro @property (readonly) UInt64 id; @property (readonly, strong) NSString* author; @property (readonly, strong) NSString* text; -@property (readonly, strong) NSArray * attachments; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index; +@property (readonly, strong) NSArray * attachments; +- (SSKProtoDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageQuoteBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuote*) prototype; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) toBuilder; +- (SSKProtoDataMessageQuoteBuilder*) builder; ++ (SSKProtoDataMessageQuoteBuilder*) builder; ++ (SSKProtoDataMessageQuoteBuilder*) builderWithPrototype:(SSKProtoDataMessageQuote*) prototype; +- (SSKProtoDataMessageQuoteBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageQuote*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageQuote*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageQuote*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageQuote*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define QuotedAttachment_contentType @"contentType" #define QuotedAttachment_fileName @"fileName" #define QuotedAttachment_thumbnail @"thumbnail" #define QuotedAttachment_flags @"flags" -@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachment : PBGeneratedMessage { +@interface SSKProtoDataMessageQuoteQuotedAttachment : PBGeneratedMessage { @private BOOL hasContentType_:1; BOOL hasFileName_:1; @@ -963,7 +964,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro BOOL hasFlags_:1; NSString* contentType; NSString* fileName; - OWSSignalServiceProtosAttachmentPointer* thumbnail; + SSKProtoAttachmentPointer* thumbnail; UInt32 flags; } - (BOOL) hasContentType; @@ -972,7 +973,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasFlags; @property (readonly, strong) NSString* contentType; @property (readonly, strong) NSString* fileName; -@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* thumbnail; +@property (readonly, strong) SSKProtoAttachmentPointer* thumbnail; @property (readonly) UInt32 flags; + (instancetype) defaultInstance; @@ -980,96 +981,96 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) prototype; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) toBuilder; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builder; ++ (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builder; ++ (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builderWithPrototype:(SSKProtoDataMessageQuoteQuotedAttachment*) prototype; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) 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; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageQuoteQuotedAttachmentBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* resultQuotedAttachment; + SSKProtoDataMessageQuoteQuotedAttachment* resultQuotedAttachment; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) defaultInstance; +- (SSKProtoDataMessageQuoteQuotedAttachment*) defaultInstance; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clear; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clone; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clear; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clone; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) build; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) buildPartial; +- (SSKProtoDataMessageQuoteQuotedAttachment*) build; +- (SSKProtoDataMessageQuoteQuotedAttachment*) buildPartial; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) other; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFrom:(SSKProtoDataMessageQuoteQuotedAttachment*) other; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasContentType; - (NSString*) contentType; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setContentType:(NSString*) value; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearContentType; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setContentType:(NSString*) value; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearContentType; - (BOOL) hasFileName; - (NSString*) fileName; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setFileName:(NSString*) value; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearFileName; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setFileName:(NSString*) value; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearFileName; - (BOOL) hasThumbnail; -- (OWSSignalServiceProtosAttachmentPointer*) thumbnail; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnailBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearThumbnail; +- (SSKProtoAttachmentPointer*) thumbnail; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setThumbnail:(SSKProtoAttachmentPointer*) value; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setThumbnailBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeThumbnail:(SSKProtoAttachmentPointer*) value; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearThumbnail; - (BOOL) hasFlags; - (UInt32) flags; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setFlags:(UInt32) value; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearFlags; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setFlags:(UInt32) value; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearFlags; @end -@interface OWSSignalServiceProtosDataMessageQuoteBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageQuoteBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageQuote* resultQuote; + SSKProtoDataMessageQuote* resultQuote; } -- (OWSSignalServiceProtosDataMessageQuote*) defaultInstance; +- (SSKProtoDataMessageQuote*) defaultInstance; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clear; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clone; +- (SSKProtoDataMessageQuoteBuilder*) clear; +- (SSKProtoDataMessageQuoteBuilder*) clone; -- (OWSSignalServiceProtosDataMessageQuote*) build; -- (OWSSignalServiceProtosDataMessageQuote*) buildPartial; +- (SSKProtoDataMessageQuote*) build; +- (SSKProtoDataMessageQuote*) buildPartial; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuote*) other; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageQuoteBuilder*) mergeFrom:(SSKProtoDataMessageQuote*) other; +- (SSKProtoDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearId; +- (SSKProtoDataMessageQuoteBuilder*) setId:(UInt64) value; +- (SSKProtoDataMessageQuoteBuilder*) clearId; - (BOOL) hasAuthor; - (NSString*) author; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setAuthor:(NSString*) value; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearAuthor; +- (SSKProtoDataMessageQuoteBuilder*) setAuthor:(NSString*) value; +- (SSKProtoDataMessageQuoteBuilder*) clearAuthor; - (BOOL) hasText; - (NSString*) text; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setText:(NSString*) value; -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearText; +- (SSKProtoDataMessageQuoteBuilder*) setText:(NSString*) value; +- (SSKProtoDataMessageQuoteBuilder*) clearText; -- (NSMutableArray *)attachments; -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)addAttachments:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)value; -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setAttachmentsArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearAttachments; +- (NSMutableArray *)attachments; +- (SSKProtoDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageQuoteBuilder *)addAttachments:(SSKProtoDataMessageQuoteQuotedAttachment*)value; +- (SSKProtoDataMessageQuoteBuilder *)setAttachmentsArray:(NSArray *)array; +- (SSKProtoDataMessageQuoteBuilder *)clearAttachments; @end #define Contact_name @"name" @@ -1078,14 +1079,14 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define Contact_address @"address" #define Contact_avatar @"avatar" #define Contact_organization @"organization" -@interface OWSSignalServiceProtosDataMessageContact : PBGeneratedMessage { +@interface SSKProtoDataMessageContact : PBGeneratedMessage { @private BOOL hasOrganization_:1; BOOL hasName_:1; BOOL hasAvatar_:1; NSString* organization; - OWSSignalServiceProtosDataMessageContactName* name; - OWSSignalServiceProtosDataMessageContactAvatar* avatar; + SSKProtoDataMessageContactName* name; + SSKProtoDataMessageContactAvatar* avatar; NSMutableArray * numberArray; NSMutableArray * emailArray; NSMutableArray * addressArray; @@ -1093,32 +1094,32 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasName; - (BOOL) hasAvatar; - (BOOL) hasOrganization; -@property (readonly, strong) OWSSignalServiceProtosDataMessageContactName* name; -@property (readonly, strong) NSArray * number; -@property (readonly, strong) NSArray * email; -@property (readonly, strong) NSArray * address; -@property (readonly, strong) OWSSignalServiceProtosDataMessageContactAvatar* avatar; +@property (readonly, strong) SSKProtoDataMessageContactName* name; +@property (readonly, strong) NSArray * number; +@property (readonly, strong) NSArray * email; +@property (readonly, strong) NSArray * address; +@property (readonly, strong) SSKProtoDataMessageContactAvatar* avatar; @property (readonly, strong) NSString* organization; -- (OWSSignalServiceProtosDataMessageContactPhone*)numberAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContactEmail*)emailAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactPhone*)numberAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactEmail*)emailAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContact*) prototype; -- (OWSSignalServiceProtosDataMessageContactBuilder*) toBuilder; +- (SSKProtoDataMessageContactBuilder*) builder; ++ (SSKProtoDataMessageContactBuilder*) builder; ++ (SSKProtoDataMessageContactBuilder*) builderWithPrototype:(SSKProtoDataMessageContact*) prototype; +- (SSKProtoDataMessageContactBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContact*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContact*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContact*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContact*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Name_givenName @"givenName" @@ -1127,7 +1128,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define Name_suffix @"suffix" #define Name_middleName @"middleName" #define Name_displayName @"displayName" -@interface OWSSignalServiceProtosDataMessageContactName : PBGeneratedMessage { +@interface SSKProtoDataMessageContactName : PBGeneratedMessage { @private BOOL hasGivenName_:1; BOOL hasFamilyName_:1; @@ -1160,84 +1161,84 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactNameBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactNameBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactName*) prototype; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) toBuilder; +- (SSKProtoDataMessageContactNameBuilder*) builder; ++ (SSKProtoDataMessageContactNameBuilder*) builder; ++ (SSKProtoDataMessageContactNameBuilder*) builderWithPrototype:(SSKProtoDataMessageContactName*) prototype; +- (SSKProtoDataMessageContactNameBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactName*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContactName*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactName*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContactName*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageContactNameBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactNameBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContactName* resultName; + SSKProtoDataMessageContactName* resultName; } -- (OWSSignalServiceProtosDataMessageContactName*) defaultInstance; +- (SSKProtoDataMessageContactName*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clone; +- (SSKProtoDataMessageContactNameBuilder*) clear; +- (SSKProtoDataMessageContactNameBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContactName*) build; -- (OWSSignalServiceProtosDataMessageContactName*) buildPartial; +- (SSKProtoDataMessageContactName*) build; +- (SSKProtoDataMessageContactName*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactName*) other; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactNameBuilder*) mergeFrom:(SSKProtoDataMessageContactName*) other; +- (SSKProtoDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasGivenName; - (NSString*) givenName; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setGivenName:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearGivenName; +- (SSKProtoDataMessageContactNameBuilder*) setGivenName:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearGivenName; - (BOOL) hasFamilyName; - (NSString*) familyName; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setFamilyName:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearFamilyName; +- (SSKProtoDataMessageContactNameBuilder*) setFamilyName:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearFamilyName; - (BOOL) hasPrefix; - (NSString*) prefix; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setPrefix:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearPrefix; +- (SSKProtoDataMessageContactNameBuilder*) setPrefix:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearPrefix; - (BOOL) hasSuffix; - (NSString*) suffix; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setSuffix:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearSuffix; +- (SSKProtoDataMessageContactNameBuilder*) setSuffix:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearSuffix; - (BOOL) hasMiddleName; - (NSString*) middleName; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setMiddleName:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearMiddleName; +- (SSKProtoDataMessageContactNameBuilder*) setMiddleName:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearMiddleName; - (BOOL) hasDisplayName; - (NSString*) displayName; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setDisplayName:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearDisplayName; +- (SSKProtoDataMessageContactNameBuilder*) setDisplayName:(NSString*) value; +- (SSKProtoDataMessageContactNameBuilder*) clearDisplayName; @end #define Phone_value @"value" #define Phone_type @"type" #define Phone_label @"label" -@interface OWSSignalServiceProtosDataMessageContactPhone : PBGeneratedMessage { +@interface SSKProtoDataMessageContactPhone : PBGeneratedMessage { @private BOOL hasValue_:1; BOOL hasLabel_:1; BOOL hasType_:1; NSString* value; NSString* label; - OWSSignalServiceProtosDataMessageContactPhoneType type; + SSKProtoDataMessageContactPhoneType type; } - (BOOL) hasValue; - (BOOL) hasType; - (BOOL) hasLabel; @property (readonly, strong) NSString* value; -@property (readonly) OWSSignalServiceProtosDataMessageContactPhoneType type; +@property (readonly) SSKProtoDataMessageContactPhoneType type; @property (readonly, strong) NSString* label; + (instancetype) defaultInstance; @@ -1245,69 +1246,69 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactPhone*) prototype; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) toBuilder; +- (SSKProtoDataMessageContactPhoneBuilder*) builder; ++ (SSKProtoDataMessageContactPhoneBuilder*) builder; ++ (SSKProtoDataMessageContactPhoneBuilder*) builderWithPrototype:(SSKProtoDataMessageContactPhone*) prototype; +- (SSKProtoDataMessageContactPhoneBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPhone*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContactPhone*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageContactPhoneBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactPhoneBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContactPhone* resultPhone; + SSKProtoDataMessageContactPhone* resultPhone; } -- (OWSSignalServiceProtosDataMessageContactPhone*) defaultInstance; +- (SSKProtoDataMessageContactPhone*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clone; +- (SSKProtoDataMessageContactPhoneBuilder*) clear; +- (SSKProtoDataMessageContactPhoneBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContactPhone*) build; -- (OWSSignalServiceProtosDataMessageContactPhone*) buildPartial; +- (SSKProtoDataMessageContactPhone*) build; +- (SSKProtoDataMessageContactPhone*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactPhone*) other; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFrom:(SSKProtoDataMessageContactPhone*) other; +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasValue; - (NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setValue:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearValue; +- (SSKProtoDataMessageContactPhoneBuilder*) setValue:(NSString*) value; +- (SSKProtoDataMessageContactPhoneBuilder*) clearValue; - (BOOL) hasType; -- (OWSSignalServiceProtosDataMessageContactPhoneType) type; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setType:(OWSSignalServiceProtosDataMessageContactPhoneType) value; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearType; +- (SSKProtoDataMessageContactPhoneType) type; +- (SSKProtoDataMessageContactPhoneBuilder*) setType:(SSKProtoDataMessageContactPhoneType) value; +- (SSKProtoDataMessageContactPhoneBuilder*) clearType; - (BOOL) hasLabel; - (NSString*) label; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setLabel:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearLabel; +- (SSKProtoDataMessageContactPhoneBuilder*) setLabel:(NSString*) value; +- (SSKProtoDataMessageContactPhoneBuilder*) clearLabel; @end #define Email_value @"value" #define Email_type @"type" #define Email_label @"label" -@interface OWSSignalServiceProtosDataMessageContactEmail : PBGeneratedMessage { +@interface SSKProtoDataMessageContactEmail : PBGeneratedMessage { @private BOOL hasValue_:1; BOOL hasLabel_:1; BOOL hasType_:1; NSString* value; NSString* label; - OWSSignalServiceProtosDataMessageContactEmailType type; + SSKProtoDataMessageContactEmailType type; } - (BOOL) hasValue; - (BOOL) hasType; - (BOOL) hasLabel; @property (readonly, strong) NSString* value; -@property (readonly) OWSSignalServiceProtosDataMessageContactEmailType type; +@property (readonly) SSKProtoDataMessageContactEmailType type; @property (readonly, strong) NSString* label; + (instancetype) defaultInstance; @@ -1315,50 +1316,50 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactEmail*) prototype; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) toBuilder; +- (SSKProtoDataMessageContactEmailBuilder*) builder; ++ (SSKProtoDataMessageContactEmailBuilder*) builder; ++ (SSKProtoDataMessageContactEmailBuilder*) builderWithPrototype:(SSKProtoDataMessageContactEmail*) prototype; +- (SSKProtoDataMessageContactEmailBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactEmail*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContactEmail*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageContactEmailBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactEmailBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContactEmail* resultEmail; + SSKProtoDataMessageContactEmail* resultEmail; } -- (OWSSignalServiceProtosDataMessageContactEmail*) defaultInstance; +- (SSKProtoDataMessageContactEmail*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clone; +- (SSKProtoDataMessageContactEmailBuilder*) clear; +- (SSKProtoDataMessageContactEmailBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContactEmail*) build; -- (OWSSignalServiceProtosDataMessageContactEmail*) buildPartial; +- (SSKProtoDataMessageContactEmail*) build; +- (SSKProtoDataMessageContactEmail*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactEmail*) other; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactEmailBuilder*) mergeFrom:(SSKProtoDataMessageContactEmail*) other; +- (SSKProtoDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasValue; - (NSString*) value; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setValue:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearValue; +- (SSKProtoDataMessageContactEmailBuilder*) setValue:(NSString*) value; +- (SSKProtoDataMessageContactEmailBuilder*) clearValue; - (BOOL) hasType; -- (OWSSignalServiceProtosDataMessageContactEmailType) type; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setType:(OWSSignalServiceProtosDataMessageContactEmailType) value; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearType; +- (SSKProtoDataMessageContactEmailType) type; +- (SSKProtoDataMessageContactEmailBuilder*) setType:(SSKProtoDataMessageContactEmailType) value; +- (SSKProtoDataMessageContactEmailBuilder*) clearType; - (BOOL) hasLabel; - (NSString*) label; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setLabel:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearLabel; +- (SSKProtoDataMessageContactEmailBuilder*) setLabel:(NSString*) value; +- (SSKProtoDataMessageContactEmailBuilder*) clearLabel; @end #define PostalAddress_type @"type" @@ -1370,7 +1371,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define PostalAddress_region @"region" #define PostalAddress_postcode @"postcode" #define PostalAddress_country @"country" -@interface OWSSignalServiceProtosDataMessageContactPostalAddress : PBGeneratedMessage { +@interface SSKProtoDataMessageContactPostalAddress : PBGeneratedMessage { @private BOOL hasLabel_:1; BOOL hasStreet_:1; @@ -1389,7 +1390,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro NSString* region; NSString* postcode; NSString* country; - OWSSignalServiceProtosDataMessageContactPostalAddressType type; + SSKProtoDataMessageContactPostalAddressType type; } - (BOOL) hasType; - (BOOL) hasLabel; @@ -1400,7 +1401,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasRegion; - (BOOL) hasPostcode; - (BOOL) hasCountry; -@property (readonly) OWSSignalServiceProtosDataMessageContactPostalAddressType type; +@property (readonly) SSKProtoDataMessageContactPostalAddressType type; @property (readonly, strong) NSString* label; @property (readonly, strong) NSString* street; @property (readonly, strong) NSString* pobox; @@ -1415,94 +1416,94 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactPostalAddress*) prototype; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) toBuilder; +- (SSKProtoDataMessageContactPostalAddressBuilder*) builder; ++ (SSKProtoDataMessageContactPostalAddressBuilder*) builder; ++ (SSKProtoDataMessageContactPostalAddressBuilder*) builderWithPrototype:(SSKProtoDataMessageContactPostalAddress*) prototype; +- (SSKProtoDataMessageContactPostalAddressBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageContactPostalAddressBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactPostalAddressBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContactPostalAddress* resultPostalAddress; + SSKProtoDataMessageContactPostalAddress* resultPostalAddress; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) defaultInstance; +- (SSKProtoDataMessageContactPostalAddress*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clone; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clear; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) build; -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) buildPartial; +- (SSKProtoDataMessageContactPostalAddress*) build; +- (SSKProtoDataMessageContactPostalAddress*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactPostalAddress*) other; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFrom:(SSKProtoDataMessageContactPostalAddress*) other; +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasType; -- (OWSSignalServiceProtosDataMessageContactPostalAddressType) type; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setType:(OWSSignalServiceProtosDataMessageContactPostalAddressType) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearType; +- (SSKProtoDataMessageContactPostalAddressType) type; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setType:(SSKProtoDataMessageContactPostalAddressType) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearType; - (BOOL) hasLabel; - (NSString*) label; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setLabel:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearLabel; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setLabel:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearLabel; - (BOOL) hasStreet; - (NSString*) street; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setStreet:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearStreet; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setStreet:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearStreet; - (BOOL) hasPobox; - (NSString*) pobox; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setPobox:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearPobox; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setPobox:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearPobox; - (BOOL) hasNeighborhood; - (NSString*) neighborhood; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setNeighborhood:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearNeighborhood; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setNeighborhood:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearNeighborhood; - (BOOL) hasCity; - (NSString*) city; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setCity:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearCity; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setCity:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearCity; - (BOOL) hasRegion; - (NSString*) region; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setRegion:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearRegion; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setRegion:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearRegion; - (BOOL) hasPostcode; - (NSString*) postcode; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setPostcode:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearPostcode; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setPostcode:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearPostcode; - (BOOL) hasCountry; - (NSString*) country; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setCountry:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearCountry; +- (SSKProtoDataMessageContactPostalAddressBuilder*) setCountry:(NSString*) value; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearCountry; @end #define Avatar_avatar @"avatar" #define Avatar_isProfile @"isProfile" -@interface OWSSignalServiceProtosDataMessageContactAvatar : PBGeneratedMessage { +@interface SSKProtoDataMessageContactAvatar : PBGeneratedMessage { @private BOOL hasIsProfile_:1; BOOL hasAvatar_:1; BOOL isProfile_:1; - OWSSignalServiceProtosAttachmentPointer* avatar; + SSKProtoAttachmentPointer* avatar; } - (BOOL) hasAvatar; - (BOOL) hasIsProfile; -@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* avatar; +@property (readonly, strong) SSKProtoAttachmentPointer* avatar; - (BOOL) isProfile; + (instancetype) defaultInstance; @@ -1510,175 +1511,175 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builder; -+ (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactAvatar*) prototype; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) toBuilder; +- (SSKProtoDataMessageContactAvatarBuilder*) builder; ++ (SSKProtoDataMessageContactAvatarBuilder*) builder; ++ (SSKProtoDataMessageContactAvatarBuilder*) builderWithPrototype:(SSKProtoDataMessageContactAvatar*) prototype; +- (SSKProtoDataMessageContactAvatarBuilder*) toBuilder; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactAvatar*) parseFromData:(NSData*) data; ++ (SSKProtoDataMessageContactAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosDataMessageContactAvatarBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactAvatarBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContactAvatar* resultAvatar; + SSKProtoDataMessageContactAvatar* resultAvatar; } -- (OWSSignalServiceProtosDataMessageContactAvatar*) defaultInstance; +- (SSKProtoDataMessageContactAvatar*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clone; +- (SSKProtoDataMessageContactAvatarBuilder*) clear; +- (SSKProtoDataMessageContactAvatarBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContactAvatar*) build; -- (OWSSignalServiceProtosDataMessageContactAvatar*) buildPartial; +- (SSKProtoDataMessageContactAvatar*) build; +- (SSKProtoDataMessageContactAvatar*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactAvatar*) other; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFrom:(SSKProtoDataMessageContactAvatar*) other; +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasAvatar; -- (OWSSignalServiceProtosAttachmentPointer*) avatar; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setAvatar:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setAvatarBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeAvatar:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clearAvatar; +- (SSKProtoAttachmentPointer*) avatar; +- (SSKProtoDataMessageContactAvatarBuilder*) setAvatar:(SSKProtoAttachmentPointer*) value; +- (SSKProtoDataMessageContactAvatarBuilder*) setAvatarBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue; +- (SSKProtoDataMessageContactAvatarBuilder*) mergeAvatar:(SSKProtoAttachmentPointer*) value; +- (SSKProtoDataMessageContactAvatarBuilder*) clearAvatar; - (BOOL) hasIsProfile; - (BOOL) isProfile; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setIsProfile:(BOOL) value; -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clearIsProfile; +- (SSKProtoDataMessageContactAvatarBuilder*) setIsProfile:(BOOL) value; +- (SSKProtoDataMessageContactAvatarBuilder*) clearIsProfile; @end -@interface OWSSignalServiceProtosDataMessageContactBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageContactBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessageContact* resultContact; + SSKProtoDataMessageContact* resultContact; } -- (OWSSignalServiceProtosDataMessageContact*) defaultInstance; +- (SSKProtoDataMessageContact*) defaultInstance; -- (OWSSignalServiceProtosDataMessageContactBuilder*) clear; -- (OWSSignalServiceProtosDataMessageContactBuilder*) clone; +- (SSKProtoDataMessageContactBuilder*) clear; +- (SSKProtoDataMessageContactBuilder*) clone; -- (OWSSignalServiceProtosDataMessageContact*) build; -- (OWSSignalServiceProtosDataMessageContact*) buildPartial; +- (SSKProtoDataMessageContact*) build; +- (SSKProtoDataMessageContact*) buildPartial; -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContact*) other; -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageContactBuilder*) mergeFrom:(SSKProtoDataMessageContact*) other; +- (SSKProtoDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasName; -- (OWSSignalServiceProtosDataMessageContactName*) name; -- (OWSSignalServiceProtosDataMessageContactBuilder*) setName:(OWSSignalServiceProtosDataMessageContactName*) value; -- (OWSSignalServiceProtosDataMessageContactBuilder*) setNameBuilder:(OWSSignalServiceProtosDataMessageContactNameBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeName:(OWSSignalServiceProtosDataMessageContactName*) value; -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearName; - -- (NSMutableArray *)number; -- (OWSSignalServiceProtosDataMessageContactPhone*)numberAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContactBuilder *)addNumber:(OWSSignalServiceProtosDataMessageContactPhone*)value; -- (OWSSignalServiceProtosDataMessageContactBuilder *)setNumberArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearNumber; - -- (NSMutableArray *)email; -- (OWSSignalServiceProtosDataMessageContactEmail*)emailAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContactBuilder *)addEmail:(OWSSignalServiceProtosDataMessageContactEmail*)value; -- (OWSSignalServiceProtosDataMessageContactBuilder *)setEmailArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearEmail; - -- (NSMutableArray *)address; -- (OWSSignalServiceProtosDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageContactBuilder *)addAddress:(OWSSignalServiceProtosDataMessageContactPostalAddress*)value; -- (OWSSignalServiceProtosDataMessageContactBuilder *)setAddressArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearAddress; +- (SSKProtoDataMessageContactName*) name; +- (SSKProtoDataMessageContactBuilder*) setName:(SSKProtoDataMessageContactName*) value; +- (SSKProtoDataMessageContactBuilder*) setNameBuilder:(SSKProtoDataMessageContactNameBuilder*) builderForValue; +- (SSKProtoDataMessageContactBuilder*) mergeName:(SSKProtoDataMessageContactName*) value; +- (SSKProtoDataMessageContactBuilder*) clearName; + +- (NSMutableArray *)number; +- (SSKProtoDataMessageContactPhone*)numberAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactBuilder *)addNumber:(SSKProtoDataMessageContactPhone*)value; +- (SSKProtoDataMessageContactBuilder *)setNumberArray:(NSArray *)array; +- (SSKProtoDataMessageContactBuilder *)clearNumber; + +- (NSMutableArray *)email; +- (SSKProtoDataMessageContactEmail*)emailAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactBuilder *)addEmail:(SSKProtoDataMessageContactEmail*)value; +- (SSKProtoDataMessageContactBuilder *)setEmailArray:(NSArray *)array; +- (SSKProtoDataMessageContactBuilder *)clearEmail; + +- (NSMutableArray *)address; +- (SSKProtoDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageContactBuilder *)addAddress:(SSKProtoDataMessageContactPostalAddress*)value; +- (SSKProtoDataMessageContactBuilder *)setAddressArray:(NSArray *)array; +- (SSKProtoDataMessageContactBuilder *)clearAddress; - (BOOL) hasAvatar; -- (OWSSignalServiceProtosDataMessageContactAvatar*) avatar; -- (OWSSignalServiceProtosDataMessageContactBuilder*) setAvatar:(OWSSignalServiceProtosDataMessageContactAvatar*) value; -- (OWSSignalServiceProtosDataMessageContactBuilder*) setAvatarBuilder:(OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeAvatar:(OWSSignalServiceProtosDataMessageContactAvatar*) value; -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearAvatar; +- (SSKProtoDataMessageContactAvatar*) avatar; +- (SSKProtoDataMessageContactBuilder*) setAvatar:(SSKProtoDataMessageContactAvatar*) value; +- (SSKProtoDataMessageContactBuilder*) setAvatarBuilder:(SSKProtoDataMessageContactAvatarBuilder*) builderForValue; +- (SSKProtoDataMessageContactBuilder*) mergeAvatar:(SSKProtoDataMessageContactAvatar*) value; +- (SSKProtoDataMessageContactBuilder*) clearAvatar; - (BOOL) hasOrganization; - (NSString*) organization; -- (OWSSignalServiceProtosDataMessageContactBuilder*) setOrganization:(NSString*) value; -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearOrganization; +- (SSKProtoDataMessageContactBuilder*) setOrganization:(NSString*) value; +- (SSKProtoDataMessageContactBuilder*) clearOrganization; @end -@interface OWSSignalServiceProtosDataMessageBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoDataMessageBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosDataMessage* resultDataMessage; + SSKProtoDataMessage* resultDataMessage; } -- (OWSSignalServiceProtosDataMessage*) defaultInstance; +- (SSKProtoDataMessage*) defaultInstance; -- (OWSSignalServiceProtosDataMessageBuilder*) clear; -- (OWSSignalServiceProtosDataMessageBuilder*) clone; +- (SSKProtoDataMessageBuilder*) clear; +- (SSKProtoDataMessageBuilder*) clone; -- (OWSSignalServiceProtosDataMessage*) build; -- (OWSSignalServiceProtosDataMessage*) buildPartial; +- (SSKProtoDataMessage*) build; +- (SSKProtoDataMessage*) buildPartial; -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessage*) other; -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoDataMessageBuilder*) mergeFrom:(SSKProtoDataMessage*) other; +- (SSKProtoDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBody; - (NSString*) body; -- (OWSSignalServiceProtosDataMessageBuilder*) setBody:(NSString*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearBody; +- (SSKProtoDataMessageBuilder*) setBody:(NSString*) value; +- (SSKProtoDataMessageBuilder*) clearBody; -- (NSMutableArray *)attachments; -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageBuilder *)addAttachments:(OWSSignalServiceProtosAttachmentPointer*)value; -- (OWSSignalServiceProtosDataMessageBuilder *)setAttachmentsArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageBuilder *)clearAttachments; +- (NSMutableArray *)attachments; +- (SSKProtoAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageBuilder *)addAttachments:(SSKProtoAttachmentPointer*)value; +- (SSKProtoDataMessageBuilder *)setAttachmentsArray:(NSArray *)array; +- (SSKProtoDataMessageBuilder *)clearAttachments; - (BOOL) hasGroup; -- (OWSSignalServiceProtosGroupContext*) group; -- (OWSSignalServiceProtosDataMessageBuilder*) setGroup:(OWSSignalServiceProtosGroupContext*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) setGroupBuilder:(OWSSignalServiceProtosGroupContextBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageBuilder*) mergeGroup:(OWSSignalServiceProtosGroupContext*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearGroup; +- (SSKProtoGroupContext*) group; +- (SSKProtoDataMessageBuilder*) setGroup:(SSKProtoGroupContext*) value; +- (SSKProtoDataMessageBuilder*) setGroupBuilder:(SSKProtoGroupContextBuilder*) builderForValue; +- (SSKProtoDataMessageBuilder*) mergeGroup:(SSKProtoGroupContext*) value; +- (SSKProtoDataMessageBuilder*) clearGroup; - (BOOL) hasFlags; - (UInt32) flags; -- (OWSSignalServiceProtosDataMessageBuilder*) setFlags:(UInt32) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearFlags; +- (SSKProtoDataMessageBuilder*) setFlags:(UInt32) value; +- (SSKProtoDataMessageBuilder*) clearFlags; - (BOOL) hasExpireTimer; - (UInt32) expireTimer; -- (OWSSignalServiceProtosDataMessageBuilder*) setExpireTimer:(UInt32) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearExpireTimer; +- (SSKProtoDataMessageBuilder*) setExpireTimer:(UInt32) value; +- (SSKProtoDataMessageBuilder*) clearExpireTimer; - (BOOL) hasProfileKey; - (NSData*) profileKey; -- (OWSSignalServiceProtosDataMessageBuilder*) setProfileKey:(NSData*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearProfileKey; +- (SSKProtoDataMessageBuilder*) setProfileKey:(NSData*) value; +- (SSKProtoDataMessageBuilder*) clearProfileKey; - (BOOL) hasTimestamp; - (UInt64) timestamp; -- (OWSSignalServiceProtosDataMessageBuilder*) setTimestamp:(UInt64) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearTimestamp; +- (SSKProtoDataMessageBuilder*) setTimestamp:(UInt64) value; +- (SSKProtoDataMessageBuilder*) clearTimestamp; - (BOOL) hasQuote; -- (OWSSignalServiceProtosDataMessageQuote*) quote; -- (OWSSignalServiceProtosDataMessageBuilder*) setQuote:(OWSSignalServiceProtosDataMessageQuote*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) setQuoteBuilder:(OWSSignalServiceProtosDataMessageQuoteBuilder*) builderForValue; -- (OWSSignalServiceProtosDataMessageBuilder*) mergeQuote:(OWSSignalServiceProtosDataMessageQuote*) value; -- (OWSSignalServiceProtosDataMessageBuilder*) clearQuote; +- (SSKProtoDataMessageQuote*) quote; +- (SSKProtoDataMessageBuilder*) setQuote:(SSKProtoDataMessageQuote*) value; +- (SSKProtoDataMessageBuilder*) setQuoteBuilder:(SSKProtoDataMessageQuoteBuilder*) builderForValue; +- (SSKProtoDataMessageBuilder*) mergeQuote:(SSKProtoDataMessageQuote*) value; +- (SSKProtoDataMessageBuilder*) clearQuote; -- (NSMutableArray *)contact; -- (OWSSignalServiceProtosDataMessageContact*)contactAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosDataMessageBuilder *)addContact:(OWSSignalServiceProtosDataMessageContact*)value; -- (OWSSignalServiceProtosDataMessageBuilder *)setContactArray:(NSArray *)array; -- (OWSSignalServiceProtosDataMessageBuilder *)clearContact; +- (NSMutableArray *)contact; +- (SSKProtoDataMessageContact*)contactAtIndex:(NSUInteger)index; +- (SSKProtoDataMessageBuilder *)addContact:(SSKProtoDataMessageContact*)value; +- (SSKProtoDataMessageBuilder *)setContactArray:(NSArray *)array; +- (SSKProtoDataMessageBuilder *)clearContact; @end #define NullMessage_padding @"padding" -@interface OWSSignalServiceProtosNullMessage : PBGeneratedMessage { +@interface SSKProtoNullMessage : PBGeneratedMessage { @private BOOL hasPadding_:1; NSData* padding; @@ -1691,52 +1692,52 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosNullMessageBuilder*) builder; -+ (OWSSignalServiceProtosNullMessageBuilder*) builder; -+ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype; -- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder; +- (SSKProtoNullMessageBuilder*) builder; ++ (SSKProtoNullMessageBuilder*) builder; ++ (SSKProtoNullMessageBuilder*) builderWithPrototype:(SSKProtoNullMessage*) prototype; +- (SSKProtoNullMessageBuilder*) 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; ++ (SSKProtoNullMessage*) parseFromData:(NSData*) data; ++ (SSKProtoNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoNullMessage*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosNullMessageBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoNullMessageBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosNullMessage* resultNullMessage; + SSKProtoNullMessage* resultNullMessage; } -- (OWSSignalServiceProtosNullMessage*) defaultInstance; +- (SSKProtoNullMessage*) defaultInstance; -- (OWSSignalServiceProtosNullMessageBuilder*) clear; -- (OWSSignalServiceProtosNullMessageBuilder*) clone; +- (SSKProtoNullMessageBuilder*) clear; +- (SSKProtoNullMessageBuilder*) clone; -- (OWSSignalServiceProtosNullMessage*) build; -- (OWSSignalServiceProtosNullMessage*) buildPartial; +- (SSKProtoNullMessage*) build; +- (SSKProtoNullMessage*) buildPartial; -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other; -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoNullMessageBuilder*) mergeFrom:(SSKProtoNullMessage*) other; +- (SSKProtoNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasPadding; - (NSData*) padding; -- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value; -- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding; +- (SSKProtoNullMessageBuilder*) setPadding:(NSData*) value; +- (SSKProtoNullMessageBuilder*) clearPadding; @end #define ReceiptMessage_type @"type" #define ReceiptMessage_timestamp @"timestamp" -@interface OWSSignalServiceProtosReceiptMessage : PBGeneratedMessage { +@interface SSKProtoReceiptMessage : PBGeneratedMessage { @private BOOL hasType_:1; - OWSSignalServiceProtosReceiptMessageType type; + SSKProtoReceiptMessageType type; PBAppendableArray * timestampArray; } - (BOOL) hasType; -@property (readonly) OWSSignalServiceProtosReceiptMessageType type; +@property (readonly) SSKProtoReceiptMessageType type; @property (readonly, strong) PBArray * timestamp; - (UInt64)timestampAtIndex:(NSUInteger)index; @@ -1745,54 +1746,54 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosReceiptMessageBuilder*) builder; -+ (OWSSignalServiceProtosReceiptMessageBuilder*) builder; -+ (OWSSignalServiceProtosReceiptMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosReceiptMessage*) prototype; -- (OWSSignalServiceProtosReceiptMessageBuilder*) toBuilder; +- (SSKProtoReceiptMessageBuilder*) builder; ++ (SSKProtoReceiptMessageBuilder*) builder; ++ (SSKProtoReceiptMessageBuilder*) builderWithPrototype:(SSKProtoReceiptMessage*) prototype; +- (SSKProtoReceiptMessageBuilder*) toBuilder; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoReceiptMessage*) parseFromData:(NSData*) data; ++ (SSKProtoReceiptMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoReceiptMessage*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoReceiptMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosReceiptMessageBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoReceiptMessageBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosReceiptMessage* resultReceiptMessage; + SSKProtoReceiptMessage* resultReceiptMessage; } -- (OWSSignalServiceProtosReceiptMessage*) defaultInstance; +- (SSKProtoReceiptMessage*) defaultInstance; -- (OWSSignalServiceProtosReceiptMessageBuilder*) clear; -- (OWSSignalServiceProtosReceiptMessageBuilder*) clone; +- (SSKProtoReceiptMessageBuilder*) clear; +- (SSKProtoReceiptMessageBuilder*) clone; -- (OWSSignalServiceProtosReceiptMessage*) build; -- (OWSSignalServiceProtosReceiptMessage*) buildPartial; +- (SSKProtoReceiptMessage*) build; +- (SSKProtoReceiptMessage*) buildPartial; -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFrom:(OWSSignalServiceProtosReceiptMessage*) other; -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoReceiptMessageBuilder*) mergeFrom:(SSKProtoReceiptMessage*) other; +- (SSKProtoReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasType; -- (OWSSignalServiceProtosReceiptMessageType) type; -- (OWSSignalServiceProtosReceiptMessageBuilder*) setType:(OWSSignalServiceProtosReceiptMessageType) value; -- (OWSSignalServiceProtosReceiptMessageBuilder*) clearType; +- (SSKProtoReceiptMessageType) type; +- (SSKProtoReceiptMessageBuilder*) setType:(SSKProtoReceiptMessageType) value; +- (SSKProtoReceiptMessageBuilder*) clearType; - (PBAppendableArray *)timestamp; - (UInt64)timestampAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosReceiptMessageBuilder *)addTimestamp:(UInt64)value; -- (OWSSignalServiceProtosReceiptMessageBuilder *)setTimestampArray:(NSArray *)array; -- (OWSSignalServiceProtosReceiptMessageBuilder *)setTimestampValues:(const UInt64 *)values count:(NSUInteger)count; -- (OWSSignalServiceProtosReceiptMessageBuilder *)clearTimestamp; +- (SSKProtoReceiptMessageBuilder *)addTimestamp:(UInt64)value; +- (SSKProtoReceiptMessageBuilder *)setTimestampArray:(NSArray *)array; +- (SSKProtoReceiptMessageBuilder *)setTimestampValues:(const UInt64 *)values count:(NSUInteger)count; +- (SSKProtoReceiptMessageBuilder *)clearTimestamp; @end #define Verified_destination @"destination" #define Verified_identityKey @"identityKey" #define Verified_state @"state" #define Verified_nullMessage @"nullMessage" -@interface OWSSignalServiceProtosVerified : PBGeneratedMessage { +@interface SSKProtoVerified : PBGeneratedMessage { @private BOOL hasDestination_:1; BOOL hasIdentityKey_:1; @@ -1801,7 +1802,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro NSString* destination; NSData* identityKey; NSData* nullMessage; - OWSSignalServiceProtosVerifiedState state; + SSKProtoVerifiedState state; } - (BOOL) hasDestination; - (BOOL) hasIdentityKey; @@ -1809,7 +1810,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasNullMessage; @property (readonly, strong) NSString* destination; @property (readonly, strong) NSData* identityKey; -@property (readonly) OWSSignalServiceProtosVerifiedState state; +@property (readonly) SSKProtoVerifiedState state; @property (readonly, strong) NSData* nullMessage; + (instancetype) defaultInstance; @@ -1817,55 +1818,55 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosVerifiedBuilder*) builder; -+ (OWSSignalServiceProtosVerifiedBuilder*) builder; -+ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype; -- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder; +- (SSKProtoVerifiedBuilder*) builder; ++ (SSKProtoVerifiedBuilder*) builder; ++ (SSKProtoVerifiedBuilder*) builderWithPrototype:(SSKProtoVerified*) prototype; +- (SSKProtoVerifiedBuilder*) 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; ++ (SSKProtoVerified*) parseFromData:(NSData*) data; ++ (SSKProtoVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoVerified*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosVerifiedBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoVerifiedBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosVerified* resultVerified; + SSKProtoVerified* resultVerified; } -- (OWSSignalServiceProtosVerified*) defaultInstance; +- (SSKProtoVerified*) defaultInstance; -- (OWSSignalServiceProtosVerifiedBuilder*) clear; -- (OWSSignalServiceProtosVerifiedBuilder*) clone; +- (SSKProtoVerifiedBuilder*) clear; +- (SSKProtoVerifiedBuilder*) clone; -- (OWSSignalServiceProtosVerified*) build; -- (OWSSignalServiceProtosVerified*) buildPartial; +- (SSKProtoVerified*) build; +- (SSKProtoVerified*) buildPartial; -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other; -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoVerifiedBuilder*) mergeFrom:(SSKProtoVerified*) other; +- (SSKProtoVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDestination; - (NSString*) destination; -- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination; +- (SSKProtoVerifiedBuilder*) setDestination:(NSString*) value; +- (SSKProtoVerifiedBuilder*) clearDestination; - (BOOL) hasIdentityKey; - (NSData*) identityKey; -- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey; +- (SSKProtoVerifiedBuilder*) setIdentityKey:(NSData*) value; +- (SSKProtoVerifiedBuilder*) clearIdentityKey; - (BOOL) hasState; -- (OWSSignalServiceProtosVerifiedState) state; -- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearState; +- (SSKProtoVerifiedState) state; +- (SSKProtoVerifiedBuilder*) setState:(SSKProtoVerifiedState) value; +- (SSKProtoVerifiedBuilder*) clearState; - (BOOL) hasNullMessage; - (NSData*) nullMessage; -- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value; -- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage; +- (SSKProtoVerifiedBuilder*) setNullMessage:(NSData*) value; +- (SSKProtoVerifiedBuilder*) clearNullMessage; @end #define SyncMessage_sent @"sent" @@ -1877,7 +1878,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define SyncMessage_verified @"verified" #define SyncMessage_configuration @"configuration" #define SyncMessage_padding @"padding" -@interface OWSSignalServiceProtosSyncMessage : PBGeneratedMessage { +@interface SSKProtoSyncMessage : PBGeneratedMessage { @private BOOL hasSent_:1; BOOL hasContacts_:1; @@ -1887,13 +1888,13 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro BOOL hasVerified_:1; BOOL hasConfiguration_:1; BOOL hasPadding_:1; - OWSSignalServiceProtosSyncMessageSent* sent; - OWSSignalServiceProtosSyncMessageContacts* contacts; - OWSSignalServiceProtosSyncMessageGroups* groups; - OWSSignalServiceProtosSyncMessageRequest* request; - OWSSignalServiceProtosSyncMessageBlocked* blocked; - OWSSignalServiceProtosVerified* verified; - OWSSignalServiceProtosSyncMessageConfiguration* configuration; + SSKProtoSyncMessageSent* sent; + SSKProtoSyncMessageContacts* contacts; + SSKProtoSyncMessageGroups* groups; + SSKProtoSyncMessageRequest* request; + SSKProtoSyncMessageBlocked* blocked; + SSKProtoVerified* verified; + SSKProtoSyncMessageConfiguration* configuration; NSData* padding; NSMutableArray * readArray; } @@ -1905,40 +1906,40 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasVerified; - (BOOL) hasConfiguration; - (BOOL) hasPadding; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageSent* sent; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageContacts* contacts; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageGroups* groups; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageRequest* request; -@property (readonly, strong) NSArray * read; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageBlocked* blocked; -@property (readonly, strong) OWSSignalServiceProtosVerified* verified; -@property (readonly, strong) OWSSignalServiceProtosSyncMessageConfiguration* configuration; +@property (readonly, strong) SSKProtoSyncMessageSent* sent; +@property (readonly, strong) SSKProtoSyncMessageContacts* contacts; +@property (readonly, strong) SSKProtoSyncMessageGroups* groups; +@property (readonly, strong) SSKProtoSyncMessageRequest* request; +@property (readonly, strong) NSArray * read; +@property (readonly, strong) SSKProtoSyncMessageBlocked* blocked; +@property (readonly, strong) SSKProtoVerified* verified; +@property (readonly, strong) SSKProtoSyncMessageConfiguration* configuration; @property (readonly, strong) NSData* padding; -- (OWSSignalServiceProtosSyncMessageRead*)readAtIndex:(NSUInteger)index; +- (SSKProtoSyncMessageRead*)readAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessage*) prototype; -- (OWSSignalServiceProtosSyncMessageBuilder*) toBuilder; +- (SSKProtoSyncMessageBuilder*) builder; ++ (SSKProtoSyncMessageBuilder*) builder; ++ (SSKProtoSyncMessageBuilder*) builderWithPrototype:(SSKProtoSyncMessage*) prototype; +- (SSKProtoSyncMessageBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessage*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessage*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessage*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessage*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Sent_destination @"destination" #define Sent_timestamp @"timestamp" #define Sent_message @"message" #define Sent_expirationStartTimestamp @"expirationStartTimestamp" -@interface OWSSignalServiceProtosSyncMessageSent : PBGeneratedMessage { +@interface SSKProtoSyncMessageSent : PBGeneratedMessage { @private BOOL hasTimestamp_:1; BOOL hasExpirationStartTimestamp_:1; @@ -1947,7 +1948,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro UInt64 timestamp; UInt64 expirationStartTimestamp; NSString* destination; - OWSSignalServiceProtosDataMessage* message; + SSKProtoDataMessage* message; } - (BOOL) hasDestination; - (BOOL) hasTimestamp; @@ -1955,7 +1956,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasExpirationStartTimestamp; @property (readonly, strong) NSString* destination; @property (readonly) UInt64 timestamp; -@property (readonly, strong) OWSSignalServiceProtosDataMessage* message; +@property (readonly, strong) SSKProtoDataMessage* message; @property (readonly) UInt64 expirationStartTimestamp; + (instancetype) defaultInstance; @@ -1963,71 +1964,71 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageSentBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageSentBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageSent*) prototype; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) toBuilder; +- (SSKProtoSyncMessageSentBuilder*) builder; ++ (SSKProtoSyncMessageSentBuilder*) builder; ++ (SSKProtoSyncMessageSentBuilder*) builderWithPrototype:(SSKProtoSyncMessageSent*) prototype; +- (SSKProtoSyncMessageSentBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageSent*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageSent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageSent*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageSent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageSentBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageSentBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageSent* resultSent; + SSKProtoSyncMessageSent* resultSent; } -- (OWSSignalServiceProtosSyncMessageSent*) defaultInstance; +- (SSKProtoSyncMessageSent*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clone; +- (SSKProtoSyncMessageSentBuilder*) clear; +- (SSKProtoSyncMessageSentBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageSent*) build; -- (OWSSignalServiceProtosSyncMessageSent*) buildPartial; +- (SSKProtoSyncMessageSent*) build; +- (SSKProtoSyncMessageSent*) buildPartial; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageSent*) other; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageSentBuilder*) mergeFrom:(SSKProtoSyncMessageSent*) other; +- (SSKProtoSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasDestination; - (NSString*) destination; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setDestination:(NSString*) value; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearDestination; +- (SSKProtoSyncMessageSentBuilder*) setDestination:(NSString*) value; +- (SSKProtoSyncMessageSentBuilder*) clearDestination; - (BOOL) hasTimestamp; - (UInt64) timestamp; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setTimestamp:(UInt64) value; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearTimestamp; +- (SSKProtoSyncMessageSentBuilder*) setTimestamp:(UInt64) value; +- (SSKProtoSyncMessageSentBuilder*) clearTimestamp; - (BOOL) hasMessage; -- (OWSSignalServiceProtosDataMessage*) message; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setMessage:(OWSSignalServiceProtosDataMessage*) value; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setMessageBuilder:(OWSSignalServiceProtosDataMessageBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeMessage:(OWSSignalServiceProtosDataMessage*) value; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearMessage; +- (SSKProtoDataMessage*) message; +- (SSKProtoSyncMessageSentBuilder*) setMessage:(SSKProtoDataMessage*) value; +- (SSKProtoSyncMessageSentBuilder*) setMessageBuilder:(SSKProtoDataMessageBuilder*) builderForValue; +- (SSKProtoSyncMessageSentBuilder*) mergeMessage:(SSKProtoDataMessage*) value; +- (SSKProtoSyncMessageSentBuilder*) clearMessage; - (BOOL) hasExpirationStartTimestamp; - (UInt64) expirationStartTimestamp; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setExpirationStartTimestamp:(UInt64) value; -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearExpirationStartTimestamp; +- (SSKProtoSyncMessageSentBuilder*) setExpirationStartTimestamp:(UInt64) value; +- (SSKProtoSyncMessageSentBuilder*) clearExpirationStartTimestamp; @end #define Contacts_blob @"blob" #define Contacts_isComplete @"isComplete" -@interface OWSSignalServiceProtosSyncMessageContacts : PBGeneratedMessage { +@interface SSKProtoSyncMessageContacts : PBGeneratedMessage { @private BOOL hasIsComplete_:1; BOOL hasBlob_:1; BOOL isComplete_:1; - OWSSignalServiceProtosAttachmentPointer* blob; + SSKProtoAttachmentPointer* blob; } - (BOOL) hasBlob; - (BOOL) hasIsComplete; -@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* blob; +@property (readonly, strong) SSKProtoAttachmentPointer* blob; - (BOOL) isComplete; + (instancetype) defaultInstance; @@ -2035,103 +2036,103 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageContactsBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageContactsBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageContacts*) prototype; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) toBuilder; +- (SSKProtoSyncMessageContactsBuilder*) builder; ++ (SSKProtoSyncMessageContactsBuilder*) builder; ++ (SSKProtoSyncMessageContactsBuilder*) builderWithPrototype:(SSKProtoSyncMessageContacts*) prototype; +- (SSKProtoSyncMessageContactsBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageContacts*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageContacts*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageContactsBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageContactsBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageContacts* resultContacts; + SSKProtoSyncMessageContacts* resultContacts; } -- (OWSSignalServiceProtosSyncMessageContacts*) defaultInstance; +- (SSKProtoSyncMessageContacts*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clone; +- (SSKProtoSyncMessageContactsBuilder*) clear; +- (SSKProtoSyncMessageContactsBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageContacts*) build; -- (OWSSignalServiceProtosSyncMessageContacts*) buildPartial; +- (SSKProtoSyncMessageContacts*) build; +- (SSKProtoSyncMessageContacts*) buildPartial; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageContacts*) other; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageContactsBuilder*) mergeFrom:(SSKProtoSyncMessageContacts*) other; +- (SSKProtoSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBlob; -- (OWSSignalServiceProtosAttachmentPointer*) blob; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setBlob:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setBlobBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeBlob:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clearBlob; +- (SSKProtoAttachmentPointer*) blob; +- (SSKProtoSyncMessageContactsBuilder*) setBlob:(SSKProtoAttachmentPointer*) value; +- (SSKProtoSyncMessageContactsBuilder*) setBlobBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue; +- (SSKProtoSyncMessageContactsBuilder*) mergeBlob:(SSKProtoAttachmentPointer*) value; +- (SSKProtoSyncMessageContactsBuilder*) clearBlob; - (BOOL) hasIsComplete; - (BOOL) isComplete; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setIsComplete:(BOOL) value; -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clearIsComplete; +- (SSKProtoSyncMessageContactsBuilder*) setIsComplete:(BOOL) value; +- (SSKProtoSyncMessageContactsBuilder*) clearIsComplete; @end #define Groups_blob @"blob" -@interface OWSSignalServiceProtosSyncMessageGroups : PBGeneratedMessage { +@interface SSKProtoSyncMessageGroups : PBGeneratedMessage { @private BOOL hasBlob_:1; - OWSSignalServiceProtosAttachmentPointer* blob; + SSKProtoAttachmentPointer* blob; } - (BOOL) hasBlob; -@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* blob; +@property (readonly, strong) SSKProtoAttachmentPointer* blob; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageGroups*) prototype; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) toBuilder; +- (SSKProtoSyncMessageGroupsBuilder*) builder; ++ (SSKProtoSyncMessageGroupsBuilder*) builder; ++ (SSKProtoSyncMessageGroupsBuilder*) builderWithPrototype:(SSKProtoSyncMessageGroups*) prototype; +- (SSKProtoSyncMessageGroupsBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageGroups*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageGroups*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageGroupsBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageGroupsBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageGroups* resultGroups; + SSKProtoSyncMessageGroups* resultGroups; } -- (OWSSignalServiceProtosSyncMessageGroups*) defaultInstance; +- (SSKProtoSyncMessageGroups*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clone; +- (SSKProtoSyncMessageGroupsBuilder*) clear; +- (SSKProtoSyncMessageGroupsBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageGroups*) build; -- (OWSSignalServiceProtosSyncMessageGroups*) buildPartial; +- (SSKProtoSyncMessageGroups*) build; +- (SSKProtoSyncMessageGroups*) buildPartial; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageGroups*) other; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageGroupsBuilder*) mergeFrom:(SSKProtoSyncMessageGroups*) other; +- (SSKProtoSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasBlob; -- (OWSSignalServiceProtosAttachmentPointer*) blob; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) setBlob:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) setBlobBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeBlob:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clearBlob; +- (SSKProtoAttachmentPointer*) blob; +- (SSKProtoSyncMessageGroupsBuilder*) setBlob:(SSKProtoAttachmentPointer*) value; +- (SSKProtoSyncMessageGroupsBuilder*) setBlobBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue; +- (SSKProtoSyncMessageGroupsBuilder*) mergeBlob:(SSKProtoAttachmentPointer*) value; +- (SSKProtoSyncMessageGroupsBuilder*) clearBlob; @end #define Blocked_numbers @"numbers" -@interface OWSSignalServiceProtosSyncMessageBlocked : PBGeneratedMessage { +@interface SSKProtoSyncMessageBlocked : PBGeneratedMessage { @private NSMutableArray * numbersArray; } @@ -2143,96 +2144,96 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageBlocked*) prototype; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) toBuilder; +- (SSKProtoSyncMessageBlockedBuilder*) builder; ++ (SSKProtoSyncMessageBlockedBuilder*) builder; ++ (SSKProtoSyncMessageBlockedBuilder*) builderWithPrototype:(SSKProtoSyncMessageBlocked*) prototype; +- (SSKProtoSyncMessageBlockedBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageBlocked*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageBlocked*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageBlockedBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageBlockedBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageBlocked* resultBlocked; + SSKProtoSyncMessageBlocked* resultBlocked; } -- (OWSSignalServiceProtosSyncMessageBlocked*) defaultInstance; +- (SSKProtoSyncMessageBlocked*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) clone; +- (SSKProtoSyncMessageBlockedBuilder*) clear; +- (SSKProtoSyncMessageBlockedBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageBlocked*) build; -- (OWSSignalServiceProtosSyncMessageBlocked*) buildPartial; +- (SSKProtoSyncMessageBlocked*) build; +- (SSKProtoSyncMessageBlocked*) buildPartial; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageBlocked*) other; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageBlockedBuilder*) mergeFrom:(SSKProtoSyncMessageBlocked*) other; +- (SSKProtoSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (NSMutableArray *)numbers; - (NSString*)numbersAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)addNumbers:(NSString*)value; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)setNumbersArray:(NSArray *)array; -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)clearNumbers; +- (SSKProtoSyncMessageBlockedBuilder *)addNumbers:(NSString*)value; +- (SSKProtoSyncMessageBlockedBuilder *)setNumbersArray:(NSArray *)array; +- (SSKProtoSyncMessageBlockedBuilder *)clearNumbers; @end #define Request_type @"type" -@interface OWSSignalServiceProtosSyncMessageRequest : PBGeneratedMessage { +@interface SSKProtoSyncMessageRequest : PBGeneratedMessage { @private BOOL hasType_:1; - OWSSignalServiceProtosSyncMessageRequestType type; + SSKProtoSyncMessageRequestType type; } - (BOOL) hasType; -@property (readonly) OWSSignalServiceProtosSyncMessageRequestType type; +@property (readonly) SSKProtoSyncMessageRequestType type; + (instancetype) defaultInstance; - (instancetype) defaultInstance; - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageRequestBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageRequestBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageRequest*) prototype; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) toBuilder; +- (SSKProtoSyncMessageRequestBuilder*) builder; ++ (SSKProtoSyncMessageRequestBuilder*) builder; ++ (SSKProtoSyncMessageRequestBuilder*) builderWithPrototype:(SSKProtoSyncMessageRequest*) prototype; +- (SSKProtoSyncMessageRequestBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRequest*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageRequest*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageRequestBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageRequestBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageRequest* resultRequest; + SSKProtoSyncMessageRequest* resultRequest; } -- (OWSSignalServiceProtosSyncMessageRequest*) defaultInstance; +- (SSKProtoSyncMessageRequest*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clone; +- (SSKProtoSyncMessageRequestBuilder*) clear; +- (SSKProtoSyncMessageRequestBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageRequest*) build; -- (OWSSignalServiceProtosSyncMessageRequest*) buildPartial; +- (SSKProtoSyncMessageRequest*) build; +- (SSKProtoSyncMessageRequest*) buildPartial; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageRequest*) other; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageRequestBuilder*) mergeFrom:(SSKProtoSyncMessageRequest*) other; +- (SSKProtoSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasType; -- (OWSSignalServiceProtosSyncMessageRequestType) type; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) setType:(OWSSignalServiceProtosSyncMessageRequestType) value; -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clearType; +- (SSKProtoSyncMessageRequestType) type; +- (SSKProtoSyncMessageRequestBuilder*) setType:(SSKProtoSyncMessageRequestType) value; +- (SSKProtoSyncMessageRequestBuilder*) clearType; @end #define Read_sender @"sender" #define Read_timestamp @"timestamp" -@interface OWSSignalServiceProtosSyncMessageRead : PBGeneratedMessage { +@interface SSKProtoSyncMessageRead : PBGeneratedMessage { @private BOOL hasTimestamp_:1; BOOL hasSender_:1; @@ -2249,49 +2250,49 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageReadBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageReadBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageRead*) prototype; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) toBuilder; +- (SSKProtoSyncMessageReadBuilder*) builder; ++ (SSKProtoSyncMessageReadBuilder*) builder; ++ (SSKProtoSyncMessageReadBuilder*) builderWithPrototype:(SSKProtoSyncMessageRead*) prototype; +- (SSKProtoSyncMessageReadBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRead*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageRead*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRead*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageRead*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageReadBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageReadBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageRead* resultRead; + SSKProtoSyncMessageRead* resultRead; } -- (OWSSignalServiceProtosSyncMessageRead*) defaultInstance; +- (SSKProtoSyncMessageRead*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clone; +- (SSKProtoSyncMessageReadBuilder*) clear; +- (SSKProtoSyncMessageReadBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageRead*) build; -- (OWSSignalServiceProtosSyncMessageRead*) buildPartial; +- (SSKProtoSyncMessageRead*) build; +- (SSKProtoSyncMessageRead*) buildPartial; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageRead*) other; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageReadBuilder*) mergeFrom:(SSKProtoSyncMessageRead*) other; +- (SSKProtoSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasSender; - (NSString*) sender; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) setSender:(NSString*) value; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clearSender; +- (SSKProtoSyncMessageReadBuilder*) setSender:(NSString*) value; +- (SSKProtoSyncMessageReadBuilder*) clearSender; - (BOOL) hasTimestamp; - (UInt64) timestamp; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) setTimestamp:(UInt64) value; -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clearTimestamp; +- (SSKProtoSyncMessageReadBuilder*) setTimestamp:(UInt64) value; +- (SSKProtoSyncMessageReadBuilder*) clearTimestamp; @end #define Configuration_readReceipts @"readReceipts" -@interface OWSSignalServiceProtosSyncMessageConfiguration : PBGeneratedMessage { +@interface SSKProtoSyncMessageConfiguration : PBGeneratedMessage { @private BOOL hasReadReceipts_:1; BOOL readReceipts_:1; @@ -2304,118 +2305,118 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builder; -+ (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageConfiguration*) prototype; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) toBuilder; +- (SSKProtoSyncMessageConfigurationBuilder*) builder; ++ (SSKProtoSyncMessageConfigurationBuilder*) builder; ++ (SSKProtoSyncMessageConfigurationBuilder*) builderWithPrototype:(SSKProtoSyncMessageConfiguration*) prototype; +- (SSKProtoSyncMessageConfigurationBuilder*) toBuilder; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageConfiguration*) parseFromData:(NSData*) data; ++ (SSKProtoSyncMessageConfiguration*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosSyncMessageConfigurationBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageConfigurationBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessageConfiguration* resultConfiguration; + SSKProtoSyncMessageConfiguration* resultConfiguration; } -- (OWSSignalServiceProtosSyncMessageConfiguration*) defaultInstance; +- (SSKProtoSyncMessageConfiguration*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clone; +- (SSKProtoSyncMessageConfigurationBuilder*) clear; +- (SSKProtoSyncMessageConfigurationBuilder*) clone; -- (OWSSignalServiceProtosSyncMessageConfiguration*) build; -- (OWSSignalServiceProtosSyncMessageConfiguration*) buildPartial; +- (SSKProtoSyncMessageConfiguration*) build; +- (SSKProtoSyncMessageConfiguration*) buildPartial; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageConfiguration*) other; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFrom:(SSKProtoSyncMessageConfiguration*) other; +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasReadReceipts; - (BOOL) readReceipts; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) setReadReceipts:(BOOL) value; -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clearReadReceipts; +- (SSKProtoSyncMessageConfigurationBuilder*) setReadReceipts:(BOOL) value; +- (SSKProtoSyncMessageConfigurationBuilder*) clearReadReceipts; @end -@interface OWSSignalServiceProtosSyncMessageBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoSyncMessageBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosSyncMessage* resultSyncMessage; + SSKProtoSyncMessage* resultSyncMessage; } -- (OWSSignalServiceProtosSyncMessage*) defaultInstance; +- (SSKProtoSyncMessage*) defaultInstance; -- (OWSSignalServiceProtosSyncMessageBuilder*) clear; -- (OWSSignalServiceProtosSyncMessageBuilder*) clone; +- (SSKProtoSyncMessageBuilder*) clear; +- (SSKProtoSyncMessageBuilder*) clone; -- (OWSSignalServiceProtosSyncMessage*) build; -- (OWSSignalServiceProtosSyncMessage*) buildPartial; +- (SSKProtoSyncMessage*) build; +- (SSKProtoSyncMessage*) buildPartial; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessage*) other; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoSyncMessageBuilder*) mergeFrom:(SSKProtoSyncMessage*) other; +- (SSKProtoSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasSent; -- (OWSSignalServiceProtosSyncMessageSent*) sent; -- (OWSSignalServiceProtosSyncMessageBuilder*) setSent:(OWSSignalServiceProtosSyncMessageSent*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setSentBuilder:(OWSSignalServiceProtosSyncMessageSentBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeSent:(OWSSignalServiceProtosSyncMessageSent*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearSent; +- (SSKProtoSyncMessageSent*) sent; +- (SSKProtoSyncMessageBuilder*) setSent:(SSKProtoSyncMessageSent*) value; +- (SSKProtoSyncMessageBuilder*) setSentBuilder:(SSKProtoSyncMessageSentBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeSent:(SSKProtoSyncMessageSent*) value; +- (SSKProtoSyncMessageBuilder*) clearSent; - (BOOL) hasContacts; -- (OWSSignalServiceProtosSyncMessageContacts*) contacts; -- (OWSSignalServiceProtosSyncMessageBuilder*) setContacts:(OWSSignalServiceProtosSyncMessageContacts*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setContactsBuilder:(OWSSignalServiceProtosSyncMessageContactsBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeContacts:(OWSSignalServiceProtosSyncMessageContacts*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearContacts; +- (SSKProtoSyncMessageContacts*) contacts; +- (SSKProtoSyncMessageBuilder*) setContacts:(SSKProtoSyncMessageContacts*) value; +- (SSKProtoSyncMessageBuilder*) setContactsBuilder:(SSKProtoSyncMessageContactsBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeContacts:(SSKProtoSyncMessageContacts*) value; +- (SSKProtoSyncMessageBuilder*) clearContacts; - (BOOL) hasGroups; -- (OWSSignalServiceProtosSyncMessageGroups*) groups; -- (OWSSignalServiceProtosSyncMessageBuilder*) setGroups:(OWSSignalServiceProtosSyncMessageGroups*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setGroupsBuilder:(OWSSignalServiceProtosSyncMessageGroupsBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeGroups:(OWSSignalServiceProtosSyncMessageGroups*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearGroups; +- (SSKProtoSyncMessageGroups*) groups; +- (SSKProtoSyncMessageBuilder*) setGroups:(SSKProtoSyncMessageGroups*) value; +- (SSKProtoSyncMessageBuilder*) setGroupsBuilder:(SSKProtoSyncMessageGroupsBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeGroups:(SSKProtoSyncMessageGroups*) value; +- (SSKProtoSyncMessageBuilder*) clearGroups; - (BOOL) hasRequest; -- (OWSSignalServiceProtosSyncMessageRequest*) request; -- (OWSSignalServiceProtosSyncMessageBuilder*) setRequest:(OWSSignalServiceProtosSyncMessageRequest*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setRequestBuilder:(OWSSignalServiceProtosSyncMessageRequestBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeRequest:(OWSSignalServiceProtosSyncMessageRequest*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearRequest; - -- (NSMutableArray *)read; -- (OWSSignalServiceProtosSyncMessageRead*)readAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosSyncMessageBuilder *)addRead:(OWSSignalServiceProtosSyncMessageRead*)value; -- (OWSSignalServiceProtosSyncMessageBuilder *)setReadArray:(NSArray *)array; -- (OWSSignalServiceProtosSyncMessageBuilder *)clearRead; +- (SSKProtoSyncMessageRequest*) request; +- (SSKProtoSyncMessageBuilder*) setRequest:(SSKProtoSyncMessageRequest*) value; +- (SSKProtoSyncMessageBuilder*) setRequestBuilder:(SSKProtoSyncMessageRequestBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeRequest:(SSKProtoSyncMessageRequest*) value; +- (SSKProtoSyncMessageBuilder*) clearRequest; + +- (NSMutableArray *)read; +- (SSKProtoSyncMessageRead*)readAtIndex:(NSUInteger)index; +- (SSKProtoSyncMessageBuilder *)addRead:(SSKProtoSyncMessageRead*)value; +- (SSKProtoSyncMessageBuilder *)setReadArray:(NSArray *)array; +- (SSKProtoSyncMessageBuilder *)clearRead; - (BOOL) hasBlocked; -- (OWSSignalServiceProtosSyncMessageBlocked*) blocked; -- (OWSSignalServiceProtosSyncMessageBuilder*) setBlocked:(OWSSignalServiceProtosSyncMessageBlocked*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setBlockedBuilder:(OWSSignalServiceProtosSyncMessageBlockedBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeBlocked:(OWSSignalServiceProtosSyncMessageBlocked*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearBlocked; +- (SSKProtoSyncMessageBlocked*) blocked; +- (SSKProtoSyncMessageBuilder*) setBlocked:(SSKProtoSyncMessageBlocked*) value; +- (SSKProtoSyncMessageBuilder*) setBlockedBuilder:(SSKProtoSyncMessageBlockedBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeBlocked:(SSKProtoSyncMessageBlocked*) value; +- (SSKProtoSyncMessageBuilder*) clearBlocked; - (BOOL) hasVerified; -- (OWSSignalServiceProtosVerified*) verified; -- (OWSSignalServiceProtosSyncMessageBuilder*) setVerified:(OWSSignalServiceProtosVerified*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setVerifiedBuilder:(OWSSignalServiceProtosVerifiedBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeVerified:(OWSSignalServiceProtosVerified*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearVerified; +- (SSKProtoVerified*) verified; +- (SSKProtoSyncMessageBuilder*) setVerified:(SSKProtoVerified*) value; +- (SSKProtoSyncMessageBuilder*) setVerifiedBuilder:(SSKProtoVerifiedBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeVerified:(SSKProtoVerified*) value; +- (SSKProtoSyncMessageBuilder*) clearVerified; - (BOOL) hasConfiguration; -- (OWSSignalServiceProtosSyncMessageConfiguration*) configuration; -- (OWSSignalServiceProtosSyncMessageBuilder*) setConfiguration:(OWSSignalServiceProtosSyncMessageConfiguration*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) setConfigurationBuilder:(OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builderForValue; -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeConfiguration:(OWSSignalServiceProtosSyncMessageConfiguration*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearConfiguration; +- (SSKProtoSyncMessageConfiguration*) configuration; +- (SSKProtoSyncMessageBuilder*) setConfiguration:(SSKProtoSyncMessageConfiguration*) value; +- (SSKProtoSyncMessageBuilder*) setConfigurationBuilder:(SSKProtoSyncMessageConfigurationBuilder*) builderForValue; +- (SSKProtoSyncMessageBuilder*) mergeConfiguration:(SSKProtoSyncMessageConfiguration*) value; +- (SSKProtoSyncMessageBuilder*) clearConfiguration; - (BOOL) hasPadding; - (NSData*) padding; -- (OWSSignalServiceProtosSyncMessageBuilder*) setPadding:(NSData*) value; -- (OWSSignalServiceProtosSyncMessageBuilder*) clearPadding; +- (SSKProtoSyncMessageBuilder*) setPadding:(NSData*) value; +- (SSKProtoSyncMessageBuilder*) clearPadding; @end #define AttachmentPointer_id @"id" @@ -2428,7 +2429,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define AttachmentPointer_flags @"flags" #define AttachmentPointer_width @"width" #define AttachmentPointer_height @"height" -@interface OWSSignalServiceProtosAttachmentPointer : PBGeneratedMessage { +@interface SSKProtoAttachmentPointer : PBGeneratedMessage { @private BOOL hasId_:1; BOOL hasContentType_:1; @@ -2477,85 +2478,85 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) builder; -+ (OWSSignalServiceProtosAttachmentPointerBuilder*) builder; -+ (OWSSignalServiceProtosAttachmentPointerBuilder*) builderWithPrototype:(OWSSignalServiceProtosAttachmentPointer*) prototype; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) toBuilder; +- (SSKProtoAttachmentPointerBuilder*) builder; ++ (SSKProtoAttachmentPointerBuilder*) builder; ++ (SSKProtoAttachmentPointerBuilder*) builderWithPrototype:(SSKProtoAttachmentPointer*) prototype; +- (SSKProtoAttachmentPointerBuilder*) toBuilder; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoAttachmentPointer*) parseFromData:(NSData*) data; ++ (SSKProtoAttachmentPointer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoAttachmentPointer*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoAttachmentPointer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosAttachmentPointerBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoAttachmentPointerBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosAttachmentPointer* resultAttachmentPointer; + SSKProtoAttachmentPointer* resultAttachmentPointer; } -- (OWSSignalServiceProtosAttachmentPointer*) defaultInstance; +- (SSKProtoAttachmentPointer*) defaultInstance; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clear; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clone; +- (SSKProtoAttachmentPointerBuilder*) clear; +- (SSKProtoAttachmentPointerBuilder*) clone; -- (OWSSignalServiceProtosAttachmentPointer*) build; -- (OWSSignalServiceProtosAttachmentPointer*) buildPartial; +- (SSKProtoAttachmentPointer*) build; +- (SSKProtoAttachmentPointer*) buildPartial; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFrom:(OWSSignalServiceProtosAttachmentPointer*) other; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoAttachmentPointerBuilder*) mergeFrom:(SSKProtoAttachmentPointer*) other; +- (SSKProtoAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (UInt64) id; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setId:(UInt64) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearId; +- (SSKProtoAttachmentPointerBuilder*) setId:(UInt64) value; +- (SSKProtoAttachmentPointerBuilder*) clearId; - (BOOL) hasContentType; - (NSString*) contentType; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setContentType:(NSString*) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearContentType; +- (SSKProtoAttachmentPointerBuilder*) setContentType:(NSString*) value; +- (SSKProtoAttachmentPointerBuilder*) clearContentType; - (BOOL) hasKey; - (NSData*) key; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setKey:(NSData*) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearKey; +- (SSKProtoAttachmentPointerBuilder*) setKey:(NSData*) value; +- (SSKProtoAttachmentPointerBuilder*) clearKey; - (BOOL) hasSize; - (UInt32) size; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setSize:(UInt32) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearSize; +- (SSKProtoAttachmentPointerBuilder*) setSize:(UInt32) value; +- (SSKProtoAttachmentPointerBuilder*) clearSize; - (BOOL) hasThumbnail; - (NSData*) thumbnail; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setThumbnail:(NSData*) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearThumbnail; +- (SSKProtoAttachmentPointerBuilder*) setThumbnail:(NSData*) value; +- (SSKProtoAttachmentPointerBuilder*) clearThumbnail; - (BOOL) hasDigest; - (NSData*) digest; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setDigest:(NSData*) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearDigest; +- (SSKProtoAttachmentPointerBuilder*) setDigest:(NSData*) value; +- (SSKProtoAttachmentPointerBuilder*) clearDigest; - (BOOL) hasFileName; - (NSString*) fileName; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setFileName:(NSString*) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearFileName; +- (SSKProtoAttachmentPointerBuilder*) setFileName:(NSString*) value; +- (SSKProtoAttachmentPointerBuilder*) clearFileName; - (BOOL) hasFlags; - (UInt32) flags; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setFlags:(UInt32) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearFlags; +- (SSKProtoAttachmentPointerBuilder*) setFlags:(UInt32) value; +- (SSKProtoAttachmentPointerBuilder*) clearFlags; - (BOOL) hasWidth; - (UInt32) width; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setWidth:(UInt32) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearWidth; +- (SSKProtoAttachmentPointerBuilder*) setWidth:(UInt32) value; +- (SSKProtoAttachmentPointerBuilder*) clearWidth; - (BOOL) hasHeight; - (UInt32) height; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setHeight:(UInt32) value; -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearHeight; +- (SSKProtoAttachmentPointerBuilder*) setHeight:(UInt32) value; +- (SSKProtoAttachmentPointerBuilder*) clearHeight; @end #define GroupContext_id @"id" @@ -2563,16 +2564,16 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define GroupContext_name @"name" #define GroupContext_members @"members" #define GroupContext_avatar @"avatar" -@interface OWSSignalServiceProtosGroupContext : PBGeneratedMessage { +@interface SSKProtoGroupContext : PBGeneratedMessage { @private BOOL hasName_:1; BOOL hasAvatar_:1; BOOL hasId_:1; BOOL hasType_:1; NSString* name; - OWSSignalServiceProtosAttachmentPointer* avatar; + SSKProtoAttachmentPointer* avatar; NSData* id; - OWSSignalServiceProtosGroupContextType type; + SSKProtoGroupContextType type; NSMutableArray * membersArray; } - (BOOL) hasId; @@ -2580,10 +2581,10 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasName; - (BOOL) hasAvatar; @property (readonly, strong) NSData* id; -@property (readonly) OWSSignalServiceProtosGroupContextType type; +@property (readonly) SSKProtoGroupContextType type; @property (readonly, strong) NSString* name; @property (readonly, strong) NSArray * members; -@property (readonly, strong) OWSSignalServiceProtosAttachmentPointer* avatar; +@property (readonly, strong) SSKProtoAttachmentPointer* avatar; - (NSString*)membersAtIndex:(NSUInteger)index; + (instancetype) defaultInstance; @@ -2591,63 +2592,63 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosGroupContextBuilder*) builder; -+ (OWSSignalServiceProtosGroupContextBuilder*) builder; -+ (OWSSignalServiceProtosGroupContextBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupContext*) prototype; -- (OWSSignalServiceProtosGroupContextBuilder*) toBuilder; +- (SSKProtoGroupContextBuilder*) builder; ++ (SSKProtoGroupContextBuilder*) builder; ++ (SSKProtoGroupContextBuilder*) builderWithPrototype:(SSKProtoGroupContext*) prototype; +- (SSKProtoGroupContextBuilder*) toBuilder; -+ (OWSSignalServiceProtosGroupContext*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosGroupContext*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupContext*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosGroupContext*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupContext*) parseFromData:(NSData*) data; ++ (SSKProtoGroupContext*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupContext*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoGroupContext*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosGroupContextBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoGroupContextBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosGroupContext* resultGroupContext; + SSKProtoGroupContext* resultGroupContext; } -- (OWSSignalServiceProtosGroupContext*) defaultInstance; +- (SSKProtoGroupContext*) defaultInstance; -- (OWSSignalServiceProtosGroupContextBuilder*) clear; -- (OWSSignalServiceProtosGroupContextBuilder*) clone; +- (SSKProtoGroupContextBuilder*) clear; +- (SSKProtoGroupContextBuilder*) clone; -- (OWSSignalServiceProtosGroupContext*) build; -- (OWSSignalServiceProtosGroupContext*) buildPartial; +- (SSKProtoGroupContext*) build; +- (SSKProtoGroupContext*) buildPartial; -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFrom:(OWSSignalServiceProtosGroupContext*) other; -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoGroupContextBuilder*) mergeFrom:(SSKProtoGroupContext*) other; +- (SSKProtoGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (NSData*) id; -- (OWSSignalServiceProtosGroupContextBuilder*) setId:(NSData*) value; -- (OWSSignalServiceProtosGroupContextBuilder*) clearId; +- (SSKProtoGroupContextBuilder*) setId:(NSData*) value; +- (SSKProtoGroupContextBuilder*) clearId; - (BOOL) hasType; -- (OWSSignalServiceProtosGroupContextType) type; -- (OWSSignalServiceProtosGroupContextBuilder*) setType:(OWSSignalServiceProtosGroupContextType) value; -- (OWSSignalServiceProtosGroupContextBuilder*) clearType; +- (SSKProtoGroupContextType) type; +- (SSKProtoGroupContextBuilder*) setType:(SSKProtoGroupContextType) value; +- (SSKProtoGroupContextBuilder*) clearType; - (BOOL) hasName; - (NSString*) name; -- (OWSSignalServiceProtosGroupContextBuilder*) setName:(NSString*) value; -- (OWSSignalServiceProtosGroupContextBuilder*) clearName; +- (SSKProtoGroupContextBuilder*) setName:(NSString*) value; +- (SSKProtoGroupContextBuilder*) clearName; - (NSMutableArray *)members; - (NSString*)membersAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosGroupContextBuilder *)addMembers:(NSString*)value; -- (OWSSignalServiceProtosGroupContextBuilder *)setMembersArray:(NSArray *)array; -- (OWSSignalServiceProtosGroupContextBuilder *)clearMembers; +- (SSKProtoGroupContextBuilder *)addMembers:(NSString*)value; +- (SSKProtoGroupContextBuilder *)setMembersArray:(NSArray *)array; +- (SSKProtoGroupContextBuilder *)clearMembers; - (BOOL) hasAvatar; -- (OWSSignalServiceProtosAttachmentPointer*) avatar; -- (OWSSignalServiceProtosGroupContextBuilder*) setAvatar:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosGroupContextBuilder*) setAvatarBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue; -- (OWSSignalServiceProtosGroupContextBuilder*) mergeAvatar:(OWSSignalServiceProtosAttachmentPointer*) value; -- (OWSSignalServiceProtosGroupContextBuilder*) clearAvatar; +- (SSKProtoAttachmentPointer*) avatar; +- (SSKProtoGroupContextBuilder*) setAvatar:(SSKProtoAttachmentPointer*) value; +- (SSKProtoGroupContextBuilder*) setAvatarBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue; +- (SSKProtoGroupContextBuilder*) mergeAvatar:(SSKProtoAttachmentPointer*) value; +- (SSKProtoGroupContextBuilder*) clearAvatar; @end #define ContactDetails_number @"number" @@ -2658,7 +2659,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define ContactDetails_profileKey @"profileKey" #define ContactDetails_blocked @"blocked" #define ContactDetails_expireTimer @"expireTimer" -@interface OWSSignalServiceProtosContactDetails : PBGeneratedMessage { +@interface SSKProtoContactDetails : PBGeneratedMessage { @private BOOL hasBlocked_:1; BOOL hasNumber_:1; @@ -2672,8 +2673,8 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro NSString* number; NSString* name; NSString* color; - OWSSignalServiceProtosContactDetailsAvatar* avatar; - OWSSignalServiceProtosVerified* verified; + SSKProtoContactDetailsAvatar* avatar; + SSKProtoVerified* verified; NSData* profileKey; UInt32 expireTimer; } @@ -2687,9 +2688,9 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasExpireTimer; @property (readonly, strong) NSString* number; @property (readonly, strong) NSString* name; -@property (readonly, strong) OWSSignalServiceProtosContactDetailsAvatar* avatar; +@property (readonly, strong) SSKProtoContactDetailsAvatar* avatar; @property (readonly, strong) NSString* color; -@property (readonly, strong) OWSSignalServiceProtosVerified* verified; +@property (readonly, strong) SSKProtoVerified* verified; @property (readonly, strong) NSData* profileKey; - (BOOL) blocked; @property (readonly) UInt32 expireTimer; @@ -2699,22 +2700,22 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosContactDetailsBuilder*) builder; -+ (OWSSignalServiceProtosContactDetailsBuilder*) builder; -+ (OWSSignalServiceProtosContactDetailsBuilder*) builderWithPrototype:(OWSSignalServiceProtosContactDetails*) prototype; -- (OWSSignalServiceProtosContactDetailsBuilder*) toBuilder; +- (SSKProtoContactDetailsBuilder*) builder; ++ (SSKProtoContactDetailsBuilder*) builder; ++ (SSKProtoContactDetailsBuilder*) builderWithPrototype:(SSKProtoContactDetails*) prototype; +- (SSKProtoContactDetailsBuilder*) toBuilder; -+ (OWSSignalServiceProtosContactDetails*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosContactDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContactDetails*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosContactDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetails*) parseFromData:(NSData*) data; ++ (SSKProtoContactDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetails*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoContactDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Avatar_contentType @"contentType" #define Avatar_length @"length" -@interface OWSSignalServiceProtosContactDetailsAvatar : PBGeneratedMessage { +@interface SSKProtoContactDetailsAvatar : PBGeneratedMessage { @private BOOL hasContentType_:1; BOOL hasLength_:1; @@ -2731,107 +2732,107 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builder; -+ (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builder; -+ (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosContactDetailsAvatar*) prototype; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) toBuilder; +- (SSKProtoContactDetailsAvatarBuilder*) builder; ++ (SSKProtoContactDetailsAvatarBuilder*) builder; ++ (SSKProtoContactDetailsAvatarBuilder*) builderWithPrototype:(SSKProtoContactDetailsAvatar*) prototype; +- (SSKProtoContactDetailsAvatarBuilder*) toBuilder; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetailsAvatar*) parseFromData:(NSData*) data; ++ (SSKProtoContactDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosContactDetailsAvatarBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoContactDetailsAvatarBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosContactDetailsAvatar* resultAvatar; + SSKProtoContactDetailsAvatar* resultAvatar; } -- (OWSSignalServiceProtosContactDetailsAvatar*) defaultInstance; +- (SSKProtoContactDetailsAvatar*) defaultInstance; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clear; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clone; +- (SSKProtoContactDetailsAvatarBuilder*) clear; +- (SSKProtoContactDetailsAvatarBuilder*) clone; -- (OWSSignalServiceProtosContactDetailsAvatar*) build; -- (OWSSignalServiceProtosContactDetailsAvatar*) buildPartial; +- (SSKProtoContactDetailsAvatar*) build; +- (SSKProtoContactDetailsAvatar*) buildPartial; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosContactDetailsAvatar*) other; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoContactDetailsAvatarBuilder*) mergeFrom:(SSKProtoContactDetailsAvatar*) other; +- (SSKProtoContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasContentType; - (NSString*) contentType; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) setContentType:(NSString*) value; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clearContentType; +- (SSKProtoContactDetailsAvatarBuilder*) setContentType:(NSString*) value; +- (SSKProtoContactDetailsAvatarBuilder*) clearContentType; - (BOOL) hasLength; - (UInt32) length; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) setLength:(UInt32) value; -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clearLength; +- (SSKProtoContactDetailsAvatarBuilder*) setLength:(UInt32) value; +- (SSKProtoContactDetailsAvatarBuilder*) clearLength; @end -@interface OWSSignalServiceProtosContactDetailsBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoContactDetailsBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosContactDetails* resultContactDetails; + SSKProtoContactDetails* resultContactDetails; } -- (OWSSignalServiceProtosContactDetails*) defaultInstance; +- (SSKProtoContactDetails*) defaultInstance; -- (OWSSignalServiceProtosContactDetailsBuilder*) clear; -- (OWSSignalServiceProtosContactDetailsBuilder*) clone; +- (SSKProtoContactDetailsBuilder*) clear; +- (SSKProtoContactDetailsBuilder*) clone; -- (OWSSignalServiceProtosContactDetails*) build; -- (OWSSignalServiceProtosContactDetails*) buildPartial; +- (SSKProtoContactDetails*) build; +- (SSKProtoContactDetails*) buildPartial; -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFrom:(OWSSignalServiceProtosContactDetails*) other; -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoContactDetailsBuilder*) mergeFrom:(SSKProtoContactDetails*) other; +- (SSKProtoContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasNumber; - (NSString*) number; -- (OWSSignalServiceProtosContactDetailsBuilder*) setNumber:(NSString*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearNumber; +- (SSKProtoContactDetailsBuilder*) setNumber:(NSString*) value; +- (SSKProtoContactDetailsBuilder*) clearNumber; - (BOOL) hasName; - (NSString*) name; -- (OWSSignalServiceProtosContactDetailsBuilder*) setName:(NSString*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearName; +- (SSKProtoContactDetailsBuilder*) setName:(NSString*) value; +- (SSKProtoContactDetailsBuilder*) clearName; - (BOOL) hasAvatar; -- (OWSSignalServiceProtosContactDetailsAvatar*) avatar; -- (OWSSignalServiceProtosContactDetailsBuilder*) setAvatar:(OWSSignalServiceProtosContactDetailsAvatar*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) setAvatarBuilder:(OWSSignalServiceProtosContactDetailsAvatarBuilder*) builderForValue; -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeAvatar:(OWSSignalServiceProtosContactDetailsAvatar*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearAvatar; +- (SSKProtoContactDetailsAvatar*) avatar; +- (SSKProtoContactDetailsBuilder*) setAvatar:(SSKProtoContactDetailsAvatar*) value; +- (SSKProtoContactDetailsBuilder*) setAvatarBuilder:(SSKProtoContactDetailsAvatarBuilder*) builderForValue; +- (SSKProtoContactDetailsBuilder*) mergeAvatar:(SSKProtoContactDetailsAvatar*) value; +- (SSKProtoContactDetailsBuilder*) clearAvatar; - (BOOL) hasColor; - (NSString*) color; -- (OWSSignalServiceProtosContactDetailsBuilder*) setColor:(NSString*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearColor; +- (SSKProtoContactDetailsBuilder*) setColor:(NSString*) value; +- (SSKProtoContactDetailsBuilder*) clearColor; - (BOOL) hasVerified; -- (OWSSignalServiceProtosVerified*) verified; -- (OWSSignalServiceProtosContactDetailsBuilder*) setVerified:(OWSSignalServiceProtosVerified*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) setVerifiedBuilder:(OWSSignalServiceProtosVerifiedBuilder*) builderForValue; -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeVerified:(OWSSignalServiceProtosVerified*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearVerified; +- (SSKProtoVerified*) verified; +- (SSKProtoContactDetailsBuilder*) setVerified:(SSKProtoVerified*) value; +- (SSKProtoContactDetailsBuilder*) setVerifiedBuilder:(SSKProtoVerifiedBuilder*) builderForValue; +- (SSKProtoContactDetailsBuilder*) mergeVerified:(SSKProtoVerified*) value; +- (SSKProtoContactDetailsBuilder*) clearVerified; - (BOOL) hasProfileKey; - (NSData*) profileKey; -- (OWSSignalServiceProtosContactDetailsBuilder*) setProfileKey:(NSData*) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearProfileKey; +- (SSKProtoContactDetailsBuilder*) setProfileKey:(NSData*) value; +- (SSKProtoContactDetailsBuilder*) clearProfileKey; - (BOOL) hasBlocked; - (BOOL) blocked; -- (OWSSignalServiceProtosContactDetailsBuilder*) setBlocked:(BOOL) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearBlocked; +- (SSKProtoContactDetailsBuilder*) setBlocked:(BOOL) value; +- (SSKProtoContactDetailsBuilder*) clearBlocked; - (BOOL) hasExpireTimer; - (UInt32) expireTimer; -- (OWSSignalServiceProtosContactDetailsBuilder*) setExpireTimer:(UInt32) value; -- (OWSSignalServiceProtosContactDetailsBuilder*) clearExpireTimer; +- (SSKProtoContactDetailsBuilder*) setExpireTimer:(UInt32) value; +- (SSKProtoContactDetailsBuilder*) clearExpireTimer; @end #define GroupDetails_id @"id" @@ -2841,7 +2842,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro #define GroupDetails_active @"active" #define GroupDetails_expireTimer @"expireTimer" #define GroupDetails_color @"color" -@interface OWSSignalServiceProtosGroupDetails : PBGeneratedMessage { +@interface SSKProtoGroupDetails : PBGeneratedMessage { @private BOOL hasActive_:1; BOOL hasName_:1; @@ -2852,7 +2853,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro BOOL active_:1; NSString* name; NSString* color; - OWSSignalServiceProtosGroupDetailsAvatar* avatar; + SSKProtoGroupDetailsAvatar* avatar; NSData* id; UInt32 expireTimer; NSMutableArray * membersArray; @@ -2866,7 +2867,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro @property (readonly, strong) NSData* id; @property (readonly, strong) NSString* name; @property (readonly, strong) NSArray * members; -@property (readonly, strong) OWSSignalServiceProtosGroupDetailsAvatar* avatar; +@property (readonly, strong) SSKProtoGroupDetailsAvatar* avatar; - (BOOL) active; @property (readonly) UInt32 expireTimer; @property (readonly, strong) NSString* color; @@ -2877,22 +2878,22 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosGroupDetailsBuilder*) builder; -+ (OWSSignalServiceProtosGroupDetailsBuilder*) builder; -+ (OWSSignalServiceProtosGroupDetailsBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupDetails*) prototype; -- (OWSSignalServiceProtosGroupDetailsBuilder*) toBuilder; +- (SSKProtoGroupDetailsBuilder*) builder; ++ (SSKProtoGroupDetailsBuilder*) builder; ++ (SSKProtoGroupDetailsBuilder*) builderWithPrototype:(SSKProtoGroupDetails*) prototype; +- (SSKProtoGroupDetailsBuilder*) toBuilder; -+ (OWSSignalServiceProtosGroupDetails*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosGroupDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupDetails*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosGroupDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetails*) parseFromData:(NSData*) data; ++ (SSKProtoGroupDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetails*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoGroupDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end #define Avatar_contentType @"contentType" #define Avatar_length @"length" -@interface OWSSignalServiceProtosGroupDetailsAvatar : PBGeneratedMessage { +@interface SSKProtoGroupDetailsAvatar : PBGeneratedMessage { @private BOOL hasContentType_:1; BOOL hasLength_:1; @@ -2909,101 +2910,101 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) isInitialized; - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builder; -+ (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builder; -+ (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupDetailsAvatar*) prototype; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) toBuilder; +- (SSKProtoGroupDetailsAvatarBuilder*) builder; ++ (SSKProtoGroupDetailsAvatarBuilder*) builder; ++ (SSKProtoGroupDetailsAvatarBuilder*) builderWithPrototype:(SSKProtoGroupDetailsAvatar*) prototype; +- (SSKProtoGroupDetailsAvatarBuilder*) toBuilder; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromData:(NSData*) data; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetailsAvatar*) parseFromData:(NSData*) data; ++ (SSKProtoGroupDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input; ++ (SSKProtoGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; ++ (SSKProtoGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input; ++ (SSKProtoGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; @end -@interface OWSSignalServiceProtosGroupDetailsAvatarBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoGroupDetailsAvatarBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosGroupDetailsAvatar* resultAvatar; + SSKProtoGroupDetailsAvatar* resultAvatar; } -- (OWSSignalServiceProtosGroupDetailsAvatar*) defaultInstance; +- (SSKProtoGroupDetailsAvatar*) defaultInstance; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clear; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clone; +- (SSKProtoGroupDetailsAvatarBuilder*) clear; +- (SSKProtoGroupDetailsAvatarBuilder*) clone; -- (OWSSignalServiceProtosGroupDetailsAvatar*) build; -- (OWSSignalServiceProtosGroupDetailsAvatar*) buildPartial; +- (SSKProtoGroupDetailsAvatar*) build; +- (SSKProtoGroupDetailsAvatar*) buildPartial; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosGroupDetailsAvatar*) other; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFrom:(SSKProtoGroupDetailsAvatar*) other; +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasContentType; - (NSString*) contentType; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) setContentType:(NSString*) value; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clearContentType; +- (SSKProtoGroupDetailsAvatarBuilder*) setContentType:(NSString*) value; +- (SSKProtoGroupDetailsAvatarBuilder*) clearContentType; - (BOOL) hasLength; - (UInt32) length; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) setLength:(UInt32) value; -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clearLength; +- (SSKProtoGroupDetailsAvatarBuilder*) setLength:(UInt32) value; +- (SSKProtoGroupDetailsAvatarBuilder*) clearLength; @end -@interface OWSSignalServiceProtosGroupDetailsBuilder : PBGeneratedMessageBuilder { +@interface SSKProtoGroupDetailsBuilder : PBGeneratedMessageBuilder { @private - OWSSignalServiceProtosGroupDetails* resultGroupDetails; + SSKProtoGroupDetails* resultGroupDetails; } -- (OWSSignalServiceProtosGroupDetails*) defaultInstance; +- (SSKProtoGroupDetails*) defaultInstance; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clear; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clone; +- (SSKProtoGroupDetailsBuilder*) clear; +- (SSKProtoGroupDetailsBuilder*) clone; -- (OWSSignalServiceProtosGroupDetails*) build; -- (OWSSignalServiceProtosGroupDetails*) buildPartial; +- (SSKProtoGroupDetails*) build; +- (SSKProtoGroupDetails*) buildPartial; -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFrom:(OWSSignalServiceProtosGroupDetails*) other; -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; +- (SSKProtoGroupDetailsBuilder*) mergeFrom:(SSKProtoGroupDetails*) other; +- (SSKProtoGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; +- (SSKProtoGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (BOOL) hasId; - (NSData*) id; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setId:(NSData*) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearId; +- (SSKProtoGroupDetailsBuilder*) setId:(NSData*) value; +- (SSKProtoGroupDetailsBuilder*) clearId; - (BOOL) hasName; - (NSString*) name; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setName:(NSString*) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearName; +- (SSKProtoGroupDetailsBuilder*) setName:(NSString*) value; +- (SSKProtoGroupDetailsBuilder*) clearName; - (NSMutableArray *)members; - (NSString*)membersAtIndex:(NSUInteger)index; -- (OWSSignalServiceProtosGroupDetailsBuilder *)addMembers:(NSString*)value; -- (OWSSignalServiceProtosGroupDetailsBuilder *)setMembersArray:(NSArray *)array; -- (OWSSignalServiceProtosGroupDetailsBuilder *)clearMembers; +- (SSKProtoGroupDetailsBuilder *)addMembers:(NSString*)value; +- (SSKProtoGroupDetailsBuilder *)setMembersArray:(NSArray *)array; +- (SSKProtoGroupDetailsBuilder *)clearMembers; - (BOOL) hasAvatar; -- (OWSSignalServiceProtosGroupDetailsAvatar*) avatar; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setAvatar:(OWSSignalServiceProtosGroupDetailsAvatar*) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setAvatarBuilder:(OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builderForValue; -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeAvatar:(OWSSignalServiceProtosGroupDetailsAvatar*) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearAvatar; +- (SSKProtoGroupDetailsAvatar*) avatar; +- (SSKProtoGroupDetailsBuilder*) setAvatar:(SSKProtoGroupDetailsAvatar*) value; +- (SSKProtoGroupDetailsBuilder*) setAvatarBuilder:(SSKProtoGroupDetailsAvatarBuilder*) builderForValue; +- (SSKProtoGroupDetailsBuilder*) mergeAvatar:(SSKProtoGroupDetailsAvatar*) value; +- (SSKProtoGroupDetailsBuilder*) clearAvatar; - (BOOL) hasActive; - (BOOL) active; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setActive:(BOOL) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearActive; +- (SSKProtoGroupDetailsBuilder*) setActive:(BOOL) value; +- (SSKProtoGroupDetailsBuilder*) clearActive; - (BOOL) hasExpireTimer; - (UInt32) expireTimer; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setExpireTimer:(UInt32) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearExpireTimer; +- (SSKProtoGroupDetailsBuilder*) setExpireTimer:(UInt32) value; +- (SSKProtoGroupDetailsBuilder*) clearExpireTimer; - (BOOL) hasColor; - (NSString*) color; -- (OWSSignalServiceProtosGroupDetailsBuilder*) setColor:(NSString*) value; -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearColor; +- (SSKProtoGroupDetailsBuilder*) setColor:(NSString*) value; +- (SSKProtoGroupDetailsBuilder*) clearColor; @end diff --git a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m index c5eeef317..4f7b5e76a 100644 --- a/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m +++ b/SignalServiceKit/src/Messages/OWSSignalServiceProtos.pb.m @@ -1,16 +1,19 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import -#import "OWSSignalServiceProtos.pb.h" // @@protoc_insertion_point(imports) -@implementation OWSSignalServiceProtosOwssignalServiceProtosRoot +@implementation OWSSignalServiceProtosSSKProtoRoot static PBExtensionRegistry* extensionRegistry = nil; + (PBExtensionRegistry*) extensionRegistry { return extensionRegistry; } + (void) initialize { - if (self == [OWSSignalServiceProtosOwssignalServiceProtosRoot class]) { + if (self == [OWSSignalServiceProtosSSKProtoRoot class]) { PBMutableExtensionRegistry* registry = [PBMutableExtensionRegistry registry]; [self registerAllExtensions:registry]; [ObjectivecDescriptorRoot registerAllExtensions:registry]; @@ -21,8 +24,8 @@ static PBExtensionRegistry* extensionRegistry = nil; } @end -@interface OWSSignalServiceProtosEnvelope () -@property OWSSignalServiceProtosEnvelopeType type; +@interface SSKProtoEnvelope () +@property SSKProtoEnvelopeType type; @property (strong) NSString* source; @property UInt32 sourceDevice; @property (strong) NSString* relay; @@ -31,7 +34,7 @@ static PBExtensionRegistry* extensionRegistry = nil; @property (strong) NSData* content; @end -@implementation OWSSignalServiceProtosEnvelope +@implementation SSKProtoEnvelope - (BOOL) hasType { return !!hasType_; @@ -84,7 +87,7 @@ static PBExtensionRegistry* extensionRegistry = nil; @synthesize content; - (instancetype) init { if ((self = [super init])) { - self.type = OWSSignalServiceProtosEnvelopeTypeUnknown; + self.type = SSKProtoEnvelopeTypeUnknown; self.source = @""; self.sourceDevice = 0; self.relay = @""; @@ -94,17 +97,17 @@ static PBExtensionRegistry* extensionRegistry = nil; } return self; } -static OWSSignalServiceProtosEnvelope* defaultOWSSignalServiceProtosEnvelopeInstance = nil; +static SSKProtoEnvelope* defaultSSKProtoEnvelopeInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosEnvelope class]) { - defaultOWSSignalServiceProtosEnvelopeInstance = [[OWSSignalServiceProtosEnvelope alloc] init]; + if (self == [SSKProtoEnvelope class]) { + defaultSSKProtoEnvelopeInstance = [[SSKProtoEnvelope alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosEnvelopeInstance; + return defaultSSKProtoEnvelopeInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosEnvelopeInstance; + return defaultSSKProtoEnvelopeInstance; } - (BOOL) isInitialized { return YES; @@ -165,39 +168,39 @@ static OWSSignalServiceProtosEnvelope* defaultOWSSignalServiceProtosEnvelopeInst memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosEnvelope*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromData:data] build]; ++ (SSKProtoEnvelope*) parseFromData:(NSData*) data { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosEnvelope*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromInputStream:input] build]; ++ (SSKProtoEnvelope*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosEnvelope*)[[[OWSSignalServiceProtosEnvelope builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoEnvelope*)[[[SSKProtoEnvelope builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosEnvelopeBuilder*) builder { - return [[OWSSignalServiceProtosEnvelopeBuilder alloc] init]; ++ (SSKProtoEnvelopeBuilder*) builder { + return [[SSKProtoEnvelopeBuilder alloc] init]; } -+ (OWSSignalServiceProtosEnvelopeBuilder*) builderWithPrototype:(OWSSignalServiceProtosEnvelope*) prototype { - return [[OWSSignalServiceProtosEnvelope builder] mergeFrom:prototype]; ++ (SSKProtoEnvelopeBuilder*) builderWithPrototype:(SSKProtoEnvelope*) prototype { + return [[SSKProtoEnvelope builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosEnvelopeBuilder*) builder { - return [OWSSignalServiceProtosEnvelope builder]; +- (SSKProtoEnvelopeBuilder*) builder { + return [SSKProtoEnvelope builder]; } -- (OWSSignalServiceProtosEnvelopeBuilder*) toBuilder { - return [OWSSignalServiceProtosEnvelope builderWithPrototype:self]; +- (SSKProtoEnvelopeBuilder*) toBuilder { + return [SSKProtoEnvelope builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosEnvelopeType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoEnvelopeType(self.type)]; } if (self.hasSource) { [output appendFormat:@"%@%@: %@\n", indent, @"source", self.source]; @@ -247,10 +250,10 @@ static OWSSignalServiceProtosEnvelope* defaultOWSSignalServiceProtosEnvelopeInst if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosEnvelope class]]) { + if (![other isKindOfClass:[SSKProtoEnvelope class]]) { return NO; } - OWSSignalServiceProtosEnvelope *otherMessage = other; + SSKProtoEnvelope *otherMessage = other; return self.hasType == otherMessage.hasType && (!self.hasType || self.type == otherMessage.type) && @@ -296,71 +299,71 @@ static OWSSignalServiceProtosEnvelope* defaultOWSSignalServiceProtosEnvelopeInst } @end -BOOL OWSSignalServiceProtosEnvelopeTypeIsValidValue(OWSSignalServiceProtosEnvelopeType value) { +BOOL SSKProtoEnvelopeTypeIsValidValue(SSKProtoEnvelopeType value) { switch (value) { - case OWSSignalServiceProtosEnvelopeTypeUnknown: - case OWSSignalServiceProtosEnvelopeTypeCiphertext: - case OWSSignalServiceProtosEnvelopeTypeKeyExchange: - case OWSSignalServiceProtosEnvelopeTypePrekeyBundle: - case OWSSignalServiceProtosEnvelopeTypeReceipt: + case SSKProtoEnvelopeTypeUnknown: + case SSKProtoEnvelopeTypeCiphertext: + case SSKProtoEnvelopeTypeKeyExchange: + case SSKProtoEnvelopeTypePrekeyBundle: + case SSKProtoEnvelopeTypeReceipt: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosEnvelopeType value) { +NSString *NSStringFromSSKProtoEnvelopeType(SSKProtoEnvelopeType value) { switch (value) { - case OWSSignalServiceProtosEnvelopeTypeUnknown: - return @"OWSSignalServiceProtosEnvelopeTypeUnknown"; - case OWSSignalServiceProtosEnvelopeTypeCiphertext: - return @"OWSSignalServiceProtosEnvelopeTypeCiphertext"; - case OWSSignalServiceProtosEnvelopeTypeKeyExchange: - return @"OWSSignalServiceProtosEnvelopeTypeKeyExchange"; - case OWSSignalServiceProtosEnvelopeTypePrekeyBundle: - return @"OWSSignalServiceProtosEnvelopeTypePrekeyBundle"; - case OWSSignalServiceProtosEnvelopeTypeReceipt: - return @"OWSSignalServiceProtosEnvelopeTypeReceipt"; + case SSKProtoEnvelopeTypeUnknown: + return @"SSKProtoEnvelopeTypeUnknown"; + case SSKProtoEnvelopeTypeCiphertext: + return @"SSKProtoEnvelopeTypeCiphertext"; + case SSKProtoEnvelopeTypeKeyExchange: + return @"SSKProtoEnvelopeTypeKeyExchange"; + case SSKProtoEnvelopeTypePrekeyBundle: + return @"SSKProtoEnvelopeTypePrekeyBundle"; + case SSKProtoEnvelopeTypeReceipt: + return @"SSKProtoEnvelopeTypeReceipt"; default: return nil; } } -@interface OWSSignalServiceProtosEnvelopeBuilder() -@property (strong) OWSSignalServiceProtosEnvelope* resultEnvelope; +@interface SSKProtoEnvelopeBuilder() +@property (strong) SSKProtoEnvelope* resultEnvelope; @end -@implementation OWSSignalServiceProtosEnvelopeBuilder +@implementation SSKProtoEnvelopeBuilder @synthesize resultEnvelope; - (instancetype) init { if ((self = [super init])) { - self.resultEnvelope = [[OWSSignalServiceProtosEnvelope alloc] init]; + self.resultEnvelope = [[SSKProtoEnvelope alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultEnvelope; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clear { - self.resultEnvelope = [[OWSSignalServiceProtosEnvelope alloc] init]; +- (SSKProtoEnvelopeBuilder*) clear { + self.resultEnvelope = [[SSKProtoEnvelope alloc] init]; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clone { - return [OWSSignalServiceProtosEnvelope builderWithPrototype:resultEnvelope]; +- (SSKProtoEnvelopeBuilder*) clone { + return [SSKProtoEnvelope builderWithPrototype:resultEnvelope]; } -- (OWSSignalServiceProtosEnvelope*) defaultInstance { - return [OWSSignalServiceProtosEnvelope defaultInstance]; +- (SSKProtoEnvelope*) defaultInstance { + return [SSKProtoEnvelope defaultInstance]; } -- (OWSSignalServiceProtosEnvelope*) build { +- (SSKProtoEnvelope*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosEnvelope*) buildPartial { - OWSSignalServiceProtosEnvelope* returnMe = resultEnvelope; +- (SSKProtoEnvelope*) buildPartial { + SSKProtoEnvelope* returnMe = resultEnvelope; self.resultEnvelope = nil; return returnMe; } -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFrom:(OWSSignalServiceProtosEnvelope*) other { - if (other == [OWSSignalServiceProtosEnvelope defaultInstance]) { +- (SSKProtoEnvelopeBuilder*) mergeFrom:(SSKProtoEnvelope*) other { + if (other == [SSKProtoEnvelope defaultInstance]) { return self; } if (other.hasType) { @@ -387,10 +390,10 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -406,8 +409,8 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE break; } case 8: { - OWSSignalServiceProtosEnvelopeType value = (OWSSignalServiceProtosEnvelopeType)[input readEnum]; - if (OWSSignalServiceProtosEnvelopeTypeIsValidValue(value)) { + SSKProtoEnvelopeType value = (SSKProtoEnvelopeType)[input readEnum]; + if (SSKProtoEnvelopeTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:1 value:value]; @@ -444,17 +447,17 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (BOOL) hasType { return resultEnvelope.hasType; } -- (OWSSignalServiceProtosEnvelopeType) type { +- (SSKProtoEnvelopeType) type { return resultEnvelope.type; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setType:(OWSSignalServiceProtosEnvelopeType) value { +- (SSKProtoEnvelopeBuilder*) setType:(SSKProtoEnvelopeType) value { resultEnvelope.hasType = YES; resultEnvelope.type = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearType { +- (SSKProtoEnvelopeBuilder*) clearType { resultEnvelope.hasType = NO; - resultEnvelope.type = OWSSignalServiceProtosEnvelopeTypeUnknown; + resultEnvelope.type = SSKProtoEnvelopeTypeUnknown; return self; } - (BOOL) hasSource { @@ -463,12 +466,12 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (NSString*) source { return resultEnvelope.source; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setSource:(NSString*) value { +- (SSKProtoEnvelopeBuilder*) setSource:(NSString*) value { resultEnvelope.hasSource = YES; resultEnvelope.source = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearSource { +- (SSKProtoEnvelopeBuilder*) clearSource { resultEnvelope.hasSource = NO; resultEnvelope.source = @""; return self; @@ -479,12 +482,12 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (UInt32) sourceDevice { return resultEnvelope.sourceDevice; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setSourceDevice:(UInt32) value { +- (SSKProtoEnvelopeBuilder*) setSourceDevice:(UInt32) value { resultEnvelope.hasSourceDevice = YES; resultEnvelope.sourceDevice = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearSourceDevice { +- (SSKProtoEnvelopeBuilder*) clearSourceDevice { resultEnvelope.hasSourceDevice = NO; resultEnvelope.sourceDevice = 0; return self; @@ -495,12 +498,12 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (NSString*) relay { return resultEnvelope.relay; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setRelay:(NSString*) value { +- (SSKProtoEnvelopeBuilder*) setRelay:(NSString*) value { resultEnvelope.hasRelay = YES; resultEnvelope.relay = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearRelay { +- (SSKProtoEnvelopeBuilder*) clearRelay { resultEnvelope.hasRelay = NO; resultEnvelope.relay = @""; return self; @@ -511,12 +514,12 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (UInt64) timestamp { return resultEnvelope.timestamp; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setTimestamp:(UInt64) value { +- (SSKProtoEnvelopeBuilder*) setTimestamp:(UInt64) value { resultEnvelope.hasTimestamp = YES; resultEnvelope.timestamp = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearTimestamp { +- (SSKProtoEnvelopeBuilder*) clearTimestamp { resultEnvelope.hasTimestamp = NO; resultEnvelope.timestamp = 0L; return self; @@ -527,12 +530,12 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (NSData*) legacyMessage { return resultEnvelope.legacyMessage; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setLegacyMessage:(NSData*) value { +- (SSKProtoEnvelopeBuilder*) setLegacyMessage:(NSData*) value { resultEnvelope.hasLegacyMessage = YES; resultEnvelope.legacyMessage = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearLegacyMessage { +- (SSKProtoEnvelopeBuilder*) clearLegacyMessage { resultEnvelope.hasLegacyMessage = NO; resultEnvelope.legacyMessage = [NSData data]; return self; @@ -543,27 +546,27 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE - (NSData*) content { return resultEnvelope.content; } -- (OWSSignalServiceProtosEnvelopeBuilder*) setContent:(NSData*) value { +- (SSKProtoEnvelopeBuilder*) setContent:(NSData*) value { resultEnvelope.hasContent = YES; resultEnvelope.content = value; return self; } -- (OWSSignalServiceProtosEnvelopeBuilder*) clearContent { +- (SSKProtoEnvelopeBuilder*) clearContent { resultEnvelope.hasContent = NO; resultEnvelope.content = [NSData data]; return self; } @end -@interface OWSSignalServiceProtosContent () -@property (strong) OWSSignalServiceProtosDataMessage* dataMessage; -@property (strong) OWSSignalServiceProtosSyncMessage* syncMessage; -@property (strong) OWSSignalServiceProtosCallMessage* callMessage; -@property (strong) OWSSignalServiceProtosNullMessage* nullMessage; -@property (strong) OWSSignalServiceProtosReceiptMessage* receiptMessage; +@interface SSKProtoContent () +@property (strong) SSKProtoDataMessage* dataMessage; +@property (strong) SSKProtoSyncMessage* syncMessage; +@property (strong) SSKProtoCallMessage* callMessage; +@property (strong) SSKProtoNullMessage* nullMessage; +@property (strong) SSKProtoReceiptMessage* receiptMessage; @end -@implementation OWSSignalServiceProtosContent +@implementation SSKProtoContent - (BOOL) hasDataMessage { return !!hasDataMessage_; @@ -602,25 +605,25 @@ NSString *NSStringFromOWSSignalServiceProtosEnvelopeType(OWSSignalServiceProtosE @synthesize receiptMessage; - (instancetype) init { if ((self = [super init])) { - self.dataMessage = [OWSSignalServiceProtosDataMessage defaultInstance]; - self.syncMessage = [OWSSignalServiceProtosSyncMessage defaultInstance]; - self.callMessage = [OWSSignalServiceProtosCallMessage defaultInstance]; - self.nullMessage = [OWSSignalServiceProtosNullMessage defaultInstance]; - self.receiptMessage = [OWSSignalServiceProtosReceiptMessage defaultInstance]; + self.dataMessage = [SSKProtoDataMessage defaultInstance]; + self.syncMessage = [SSKProtoSyncMessage defaultInstance]; + self.callMessage = [SSKProtoCallMessage defaultInstance]; + self.nullMessage = [SSKProtoNullMessage defaultInstance]; + self.receiptMessage = [SSKProtoReceiptMessage defaultInstance]; } return self; } -static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstance = nil; +static SSKProtoContent* defaultSSKProtoContentInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosContent class]) { - defaultOWSSignalServiceProtosContentInstance = [[OWSSignalServiceProtosContent alloc] init]; + if (self == [SSKProtoContent class]) { + defaultSSKProtoContentInstance = [[SSKProtoContent alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContentInstance; + return defaultSSKProtoContentInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContentInstance; + return defaultSSKProtoContentInstance; } - (BOOL) isInitialized { return YES; @@ -669,35 +672,35 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosContent*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromData:data] build]; ++ (SSKProtoContent*) parseFromData:(NSData*) data { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosContent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContent*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromInputStream:input] build]; ++ (SSKProtoContent*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosContent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContent*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoContent*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosContent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContent*)[[[OWSSignalServiceProtosContent builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContent*)[[[SSKProtoContent builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContentBuilder*) builder { - return [[OWSSignalServiceProtosContentBuilder alloc] init]; ++ (SSKProtoContentBuilder*) builder { + return [[SSKProtoContentBuilder alloc] init]; } -+ (OWSSignalServiceProtosContentBuilder*) builderWithPrototype:(OWSSignalServiceProtosContent*) prototype { - return [[OWSSignalServiceProtosContent builder] mergeFrom:prototype]; ++ (SSKProtoContentBuilder*) builderWithPrototype:(SSKProtoContent*) prototype { + return [[SSKProtoContent builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosContentBuilder*) builder { - return [OWSSignalServiceProtosContent builder]; +- (SSKProtoContentBuilder*) builder { + return [SSKProtoContent builder]; } -- (OWSSignalServiceProtosContentBuilder*) toBuilder { - return [OWSSignalServiceProtosContent builderWithPrototype:self]; +- (SSKProtoContentBuilder*) toBuilder { + return [SSKProtoContent builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasDataMessage) { @@ -764,10 +767,10 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosContent class]]) { + if (![other isKindOfClass:[SSKProtoContent class]]) { return NO; } - OWSSignalServiceProtosContent *otherMessage = other; + SSKProtoContent *otherMessage = other; return self.hasDataMessage == otherMessage.hasDataMessage && (!self.hasDataMessage || [self.dataMessage isEqual:otherMessage.dataMessage]) && @@ -803,42 +806,42 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan } @end -@interface OWSSignalServiceProtosContentBuilder() -@property (strong) OWSSignalServiceProtosContent* resultContent; +@interface SSKProtoContentBuilder() +@property (strong) SSKProtoContent* resultContent; @end -@implementation OWSSignalServiceProtosContentBuilder +@implementation SSKProtoContentBuilder @synthesize resultContent; - (instancetype) init { if ((self = [super init])) { - self.resultContent = [[OWSSignalServiceProtosContent alloc] init]; + self.resultContent = [[SSKProtoContent alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultContent; } -- (OWSSignalServiceProtosContentBuilder*) clear { - self.resultContent = [[OWSSignalServiceProtosContent alloc] init]; +- (SSKProtoContentBuilder*) clear { + self.resultContent = [[SSKProtoContent alloc] init]; return self; } -- (OWSSignalServiceProtosContentBuilder*) clone { - return [OWSSignalServiceProtosContent builderWithPrototype:resultContent]; +- (SSKProtoContentBuilder*) clone { + return [SSKProtoContent builderWithPrototype:resultContent]; } -- (OWSSignalServiceProtosContent*) defaultInstance { - return [OWSSignalServiceProtosContent defaultInstance]; +- (SSKProtoContent*) defaultInstance { + return [SSKProtoContent defaultInstance]; } -- (OWSSignalServiceProtosContent*) build { +- (SSKProtoContent*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosContent*) buildPartial { - OWSSignalServiceProtosContent* returnMe = resultContent; +- (SSKProtoContent*) buildPartial { + SSKProtoContent* returnMe = resultContent; self.resultContent = nil; return returnMe; } -- (OWSSignalServiceProtosContentBuilder*) mergeFrom:(OWSSignalServiceProtosContent*) other { - if (other == [OWSSignalServiceProtosContent defaultInstance]) { +- (SSKProtoContentBuilder*) mergeFrom:(SSKProtoContent*) other { + if (other == [SSKProtoContent defaultInstance]) { return self; } if (other.hasDataMessage) { @@ -859,10 +862,10 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoContentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -878,7 +881,7 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan break; } case 10: { - OWSSignalServiceProtosDataMessageBuilder* subBuilder = [OWSSignalServiceProtosDataMessage builder]; + SSKProtoDataMessageBuilder* subBuilder = [SSKProtoDataMessage builder]; if (self.hasDataMessage) { [subBuilder mergeFrom:self.dataMessage]; } @@ -887,7 +890,7 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan break; } case 18: { - OWSSignalServiceProtosSyncMessageBuilder* subBuilder = [OWSSignalServiceProtosSyncMessage builder]; + SSKProtoSyncMessageBuilder* subBuilder = [SSKProtoSyncMessage builder]; if (self.hasSyncMessage) { [subBuilder mergeFrom:self.syncMessage]; } @@ -896,7 +899,7 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan break; } case 26: { - OWSSignalServiceProtosCallMessageBuilder* subBuilder = [OWSSignalServiceProtosCallMessage builder]; + SSKProtoCallMessageBuilder* subBuilder = [SSKProtoCallMessage builder]; if (self.hasCallMessage) { [subBuilder mergeFrom:self.callMessage]; } @@ -905,7 +908,7 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan break; } case 34: { - OWSSignalServiceProtosNullMessageBuilder* subBuilder = [OWSSignalServiceProtosNullMessage builder]; + SSKProtoNullMessageBuilder* subBuilder = [SSKProtoNullMessage builder]; if (self.hasNullMessage) { [subBuilder mergeFrom:self.nullMessage]; } @@ -914,7 +917,7 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan break; } case 42: { - OWSSignalServiceProtosReceiptMessageBuilder* subBuilder = [OWSSignalServiceProtosReceiptMessage builder]; + SSKProtoReceiptMessageBuilder* subBuilder = [SSKProtoReceiptMessage builder]; if (self.hasReceiptMessage) { [subBuilder mergeFrom:self.receiptMessage]; } @@ -928,165 +931,165 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan - (BOOL) hasDataMessage { return resultContent.hasDataMessage; } -- (OWSSignalServiceProtosDataMessage*) dataMessage { +- (SSKProtoDataMessage*) dataMessage { return resultContent.dataMessage; } -- (OWSSignalServiceProtosContentBuilder*) setDataMessage:(OWSSignalServiceProtosDataMessage*) value { +- (SSKProtoContentBuilder*) setDataMessage:(SSKProtoDataMessage*) value { resultContent.hasDataMessage = YES; resultContent.dataMessage = value; return self; } -- (OWSSignalServiceProtosContentBuilder*) setDataMessageBuilder:(OWSSignalServiceProtosDataMessageBuilder*) builderForValue { +- (SSKProtoContentBuilder*) setDataMessageBuilder:(SSKProtoDataMessageBuilder*) builderForValue { return [self setDataMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeDataMessage:(OWSSignalServiceProtosDataMessage*) value { +- (SSKProtoContentBuilder*) mergeDataMessage:(SSKProtoDataMessage*) value { if (resultContent.hasDataMessage && - resultContent.dataMessage != [OWSSignalServiceProtosDataMessage defaultInstance]) { + resultContent.dataMessage != [SSKProtoDataMessage defaultInstance]) { resultContent.dataMessage = - [[[OWSSignalServiceProtosDataMessage builderWithPrototype:resultContent.dataMessage] mergeFrom:value] buildPartial]; + [[[SSKProtoDataMessage builderWithPrototype:resultContent.dataMessage] mergeFrom:value] buildPartial]; } else { resultContent.dataMessage = value; } resultContent.hasDataMessage = YES; return self; } -- (OWSSignalServiceProtosContentBuilder*) clearDataMessage { +- (SSKProtoContentBuilder*) clearDataMessage { resultContent.hasDataMessage = NO; - resultContent.dataMessage = [OWSSignalServiceProtosDataMessage defaultInstance]; + resultContent.dataMessage = [SSKProtoDataMessage defaultInstance]; return self; } - (BOOL) hasSyncMessage { return resultContent.hasSyncMessage; } -- (OWSSignalServiceProtosSyncMessage*) syncMessage { +- (SSKProtoSyncMessage*) syncMessage { return resultContent.syncMessage; } -- (OWSSignalServiceProtosContentBuilder*) setSyncMessage:(OWSSignalServiceProtosSyncMessage*) value { +- (SSKProtoContentBuilder*) setSyncMessage:(SSKProtoSyncMessage*) value { resultContent.hasSyncMessage = YES; resultContent.syncMessage = value; return self; } -- (OWSSignalServiceProtosContentBuilder*) setSyncMessageBuilder:(OWSSignalServiceProtosSyncMessageBuilder*) builderForValue { +- (SSKProtoContentBuilder*) setSyncMessageBuilder:(SSKProtoSyncMessageBuilder*) builderForValue { return [self setSyncMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeSyncMessage:(OWSSignalServiceProtosSyncMessage*) value { +- (SSKProtoContentBuilder*) mergeSyncMessage:(SSKProtoSyncMessage*) value { if (resultContent.hasSyncMessage && - resultContent.syncMessage != [OWSSignalServiceProtosSyncMessage defaultInstance]) { + resultContent.syncMessage != [SSKProtoSyncMessage defaultInstance]) { resultContent.syncMessage = - [[[OWSSignalServiceProtosSyncMessage builderWithPrototype:resultContent.syncMessage] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessage builderWithPrototype:resultContent.syncMessage] mergeFrom:value] buildPartial]; } else { resultContent.syncMessage = value; } resultContent.hasSyncMessage = YES; return self; } -- (OWSSignalServiceProtosContentBuilder*) clearSyncMessage { +- (SSKProtoContentBuilder*) clearSyncMessage { resultContent.hasSyncMessage = NO; - resultContent.syncMessage = [OWSSignalServiceProtosSyncMessage defaultInstance]; + resultContent.syncMessage = [SSKProtoSyncMessage defaultInstance]; return self; } - (BOOL) hasCallMessage { return resultContent.hasCallMessage; } -- (OWSSignalServiceProtosCallMessage*) callMessage { +- (SSKProtoCallMessage*) callMessage { return resultContent.callMessage; } -- (OWSSignalServiceProtosContentBuilder*) setCallMessage:(OWSSignalServiceProtosCallMessage*) value { +- (SSKProtoContentBuilder*) setCallMessage:(SSKProtoCallMessage*) value { resultContent.hasCallMessage = YES; resultContent.callMessage = value; return self; } -- (OWSSignalServiceProtosContentBuilder*) setCallMessageBuilder:(OWSSignalServiceProtosCallMessageBuilder*) builderForValue { +- (SSKProtoContentBuilder*) setCallMessageBuilder:(SSKProtoCallMessageBuilder*) builderForValue { return [self setCallMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeCallMessage:(OWSSignalServiceProtosCallMessage*) value { +- (SSKProtoContentBuilder*) mergeCallMessage:(SSKProtoCallMessage*) value { if (resultContent.hasCallMessage && - resultContent.callMessage != [OWSSignalServiceProtosCallMessage defaultInstance]) { + resultContent.callMessage != [SSKProtoCallMessage defaultInstance]) { resultContent.callMessage = - [[[OWSSignalServiceProtosCallMessage builderWithPrototype:resultContent.callMessage] mergeFrom:value] buildPartial]; + [[[SSKProtoCallMessage builderWithPrototype:resultContent.callMessage] mergeFrom:value] buildPartial]; } else { resultContent.callMessage = value; } resultContent.hasCallMessage = YES; return self; } -- (OWSSignalServiceProtosContentBuilder*) clearCallMessage { +- (SSKProtoContentBuilder*) clearCallMessage { resultContent.hasCallMessage = NO; - resultContent.callMessage = [OWSSignalServiceProtosCallMessage defaultInstance]; + resultContent.callMessage = [SSKProtoCallMessage defaultInstance]; return self; } - (BOOL) hasNullMessage { return resultContent.hasNullMessage; } -- (OWSSignalServiceProtosNullMessage*) nullMessage { +- (SSKProtoNullMessage*) nullMessage { return resultContent.nullMessage; } -- (OWSSignalServiceProtosContentBuilder*) setNullMessage:(OWSSignalServiceProtosNullMessage*) value { +- (SSKProtoContentBuilder*) setNullMessage:(SSKProtoNullMessage*) value { resultContent.hasNullMessage = YES; resultContent.nullMessage = value; return self; } -- (OWSSignalServiceProtosContentBuilder*) setNullMessageBuilder:(OWSSignalServiceProtosNullMessageBuilder*) builderForValue { +- (SSKProtoContentBuilder*) setNullMessageBuilder:(SSKProtoNullMessageBuilder*) builderForValue { return [self setNullMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeNullMessage:(OWSSignalServiceProtosNullMessage*) value { +- (SSKProtoContentBuilder*) mergeNullMessage:(SSKProtoNullMessage*) value { if (resultContent.hasNullMessage && - resultContent.nullMessage != [OWSSignalServiceProtosNullMessage defaultInstance]) { + resultContent.nullMessage != [SSKProtoNullMessage defaultInstance]) { resultContent.nullMessage = - [[[OWSSignalServiceProtosNullMessage builderWithPrototype:resultContent.nullMessage] mergeFrom:value] buildPartial]; + [[[SSKProtoNullMessage builderWithPrototype:resultContent.nullMessage] mergeFrom:value] buildPartial]; } else { resultContent.nullMessage = value; } resultContent.hasNullMessage = YES; return self; } -- (OWSSignalServiceProtosContentBuilder*) clearNullMessage { +- (SSKProtoContentBuilder*) clearNullMessage { resultContent.hasNullMessage = NO; - resultContent.nullMessage = [OWSSignalServiceProtosNullMessage defaultInstance]; + resultContent.nullMessage = [SSKProtoNullMessage defaultInstance]; return self; } - (BOOL) hasReceiptMessage { return resultContent.hasReceiptMessage; } -- (OWSSignalServiceProtosReceiptMessage*) receiptMessage { +- (SSKProtoReceiptMessage*) receiptMessage { return resultContent.receiptMessage; } -- (OWSSignalServiceProtosContentBuilder*) setReceiptMessage:(OWSSignalServiceProtosReceiptMessage*) value { +- (SSKProtoContentBuilder*) setReceiptMessage:(SSKProtoReceiptMessage*) value { resultContent.hasReceiptMessage = YES; resultContent.receiptMessage = value; return self; } -- (OWSSignalServiceProtosContentBuilder*) setReceiptMessageBuilder:(OWSSignalServiceProtosReceiptMessageBuilder*) builderForValue { +- (SSKProtoContentBuilder*) setReceiptMessageBuilder:(SSKProtoReceiptMessageBuilder*) builderForValue { return [self setReceiptMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosContentBuilder*) mergeReceiptMessage:(OWSSignalServiceProtosReceiptMessage*) value { +- (SSKProtoContentBuilder*) mergeReceiptMessage:(SSKProtoReceiptMessage*) value { if (resultContent.hasReceiptMessage && - resultContent.receiptMessage != [OWSSignalServiceProtosReceiptMessage defaultInstance]) { + resultContent.receiptMessage != [SSKProtoReceiptMessage defaultInstance]) { resultContent.receiptMessage = - [[[OWSSignalServiceProtosReceiptMessage builderWithPrototype:resultContent.receiptMessage] mergeFrom:value] buildPartial]; + [[[SSKProtoReceiptMessage builderWithPrototype:resultContent.receiptMessage] mergeFrom:value] buildPartial]; } else { resultContent.receiptMessage = value; } resultContent.hasReceiptMessage = YES; return self; } -- (OWSSignalServiceProtosContentBuilder*) clearReceiptMessage { +- (SSKProtoContentBuilder*) clearReceiptMessage { resultContent.hasReceiptMessage = NO; - resultContent.receiptMessage = [OWSSignalServiceProtosReceiptMessage defaultInstance]; + resultContent.receiptMessage = [SSKProtoReceiptMessage defaultInstance]; 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; +@interface SSKProtoCallMessage () +@property (strong) SSKProtoCallMessageOffer* offer; +@property (strong) SSKProtoCallMessageAnswer* answer; +@property (strong) NSMutableArray * iceUpdateArray; +@property (strong) SSKProtoCallMessageHangup* hangup; +@property (strong) SSKProtoCallMessageBusy* busy; @property (strong) NSData* profileKey; @end -@implementation OWSSignalServiceProtosCallMessage +@implementation SSKProtoCallMessage - (BOOL) hasOffer { return !!hasOffer_; @@ -1127,30 +1130,30 @@ static OWSSignalServiceProtosContent* defaultOWSSignalServiceProtosContentInstan @synthesize profileKey; - (instancetype) init { if ((self = [super init])) { - self.offer = [OWSSignalServiceProtosCallMessageOffer defaultInstance]; - self.answer = [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; - self.hangup = [OWSSignalServiceProtosCallMessageHangup defaultInstance]; - self.busy = [OWSSignalServiceProtosCallMessageBusy defaultInstance]; + self.offer = [SSKProtoCallMessageOffer defaultInstance]; + self.answer = [SSKProtoCallMessageAnswer defaultInstance]; + self.hangup = [SSKProtoCallMessageHangup defaultInstance]; + self.busy = [SSKProtoCallMessageBusy defaultInstance]; self.profileKey = [NSData data]; } return self; } -static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessageInstance = nil; +static SSKProtoCallMessage* defaultSSKProtoCallMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessage class]) { - defaultOWSSignalServiceProtosCallMessageInstance = [[OWSSignalServiceProtosCallMessage alloc] init]; + if (self == [SSKProtoCallMessage class]) { + defaultSSKProtoCallMessageInstance = [[SSKProtoCallMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageInstance; + return defaultSSKProtoCallMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageInstance; + return defaultSSKProtoCallMessageInstance; } -- (NSArray *)iceUpdate { +- (NSArray *)iceUpdate { return iceUpdateArray; } -- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { +- (SSKProtoCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { return [iceUpdateArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -1163,7 +1166,7 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa if (self.hasAnswer) { [output writeMessage:2 value:self.answer]; } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [self.iceUpdateArray enumerateObjectsUsingBlock:^(SSKProtoCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { [output writeMessage:3 value:element]; }]; if (self.hasHangup) { @@ -1190,7 +1193,7 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa if (self.hasAnswer) { size_ += computeMessageSize(2, self.answer); } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [self.iceUpdateArray enumerateObjectsUsingBlock:^(SSKProtoCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(3, element); }]; if (self.hasHangup) { @@ -1206,35 +1209,35 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data] build]; ++ (SSKProtoCallMessage*) parseFromData:(NSData*) data { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessage*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessage*)[[[OWSSignalServiceProtosCallMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessage*)[[[SSKProtoCallMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageBuilder alloc] init]; ++ (SSKProtoCallMessageBuilder*) builder { + return [[SSKProtoCallMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessage*) prototype { - return [[OWSSignalServiceProtosCallMessage builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageBuilder*) builderWithPrototype:(SSKProtoCallMessage*) prototype { + return [[SSKProtoCallMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageBuilder*) builder { - return [OWSSignalServiceProtosCallMessage builder]; +- (SSKProtoCallMessageBuilder*) builder { + return [SSKProtoCallMessage builder]; } -- (OWSSignalServiceProtosCallMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessage builderWithPrototype:self]; +- (SSKProtoCallMessageBuilder*) toBuilder { + return [SSKProtoCallMessage builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasOffer) { @@ -1249,7 +1252,7 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [self.iceUpdateArray enumerateObjectsUsingBlock:^(SSKProtoCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"iceUpdate"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -1283,7 +1286,7 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa [self.answer storeInDictionary:messageDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"answer"]; } - for (OWSSignalServiceProtosCallMessageIceUpdate* element in self.iceUpdateArray) { + for (SSKProtoCallMessageIceUpdate* element in self.iceUpdateArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"iceUpdate"]; @@ -1307,10 +1310,10 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessage class]]) { + if (![other isKindOfClass:[SSKProtoCallMessage class]]) { return NO; } - OWSSignalServiceProtosCallMessage *otherMessage = other; + SSKProtoCallMessage *otherMessage = other; return self.hasOffer == otherMessage.hasOffer && (!self.hasOffer || [self.offer isEqual:otherMessage.offer]) && @@ -1333,7 +1336,7 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa if (self.hasAnswer) { hashCode = hashCode * 31 + [self.answer hash]; } - [self.iceUpdateArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { + [self.iceUpdateArray enumerateObjectsUsingBlock:^(SSKProtoCallMessageIceUpdate *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; if (self.hasHangup) { @@ -1350,12 +1353,12 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa } @end -@interface OWSSignalServiceProtosCallMessageOffer () +@interface SSKProtoCallMessageOffer () @property UInt64 id; @property (strong) NSString* sessionDescription; @end -@implementation OWSSignalServiceProtosCallMessageOffer +@implementation SSKProtoCallMessageOffer - (BOOL) hasId { return !!hasId_; @@ -1378,17 +1381,17 @@ static OWSSignalServiceProtosCallMessage* defaultOWSSignalServiceProtosCallMessa } return self; } -static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCallMessageOfferInstance = nil; +static SSKProtoCallMessageOffer* defaultSSKProtoCallMessageOfferInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageOffer class]) { - defaultOWSSignalServiceProtosCallMessageOfferInstance = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; + if (self == [SSKProtoCallMessageOffer class]) { + defaultSSKProtoCallMessageOfferInstance = [[SSKProtoCallMessageOffer alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageOfferInstance; + return defaultSSKProtoCallMessageOfferInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageOfferInstance; + return defaultSSKProtoCallMessageOfferInstance; } - (BOOL) isInitialized { return YES; @@ -1419,35 +1422,35 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data] build]; ++ (SSKProtoCallMessageOffer*) parseFromData:(NSData*) data { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageOffer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessageOffer*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageOffer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageOffer*)[[[OWSSignalServiceProtosCallMessageOffer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageOffer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageOffer*)[[[SSKProtoCallMessageOffer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageOfferBuilder alloc] init]; ++ (SSKProtoCallMessageOfferBuilder*) builder { + return [[SSKProtoCallMessageOfferBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageOfferBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageOffer*) prototype { - return [[OWSSignalServiceProtosCallMessageOffer builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageOfferBuilder*) builderWithPrototype:(SSKProtoCallMessageOffer*) prototype { + return [[SSKProtoCallMessageOffer builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) builder { - return [OWSSignalServiceProtosCallMessageOffer builder]; +- (SSKProtoCallMessageOfferBuilder*) builder { + return [SSKProtoCallMessageOffer builder]; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:self]; +- (SSKProtoCallMessageOfferBuilder*) toBuilder { + return [SSKProtoCallMessageOffer builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -1471,10 +1474,10 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageOffer class]]) { + if (![other isKindOfClass:[SSKProtoCallMessageOffer class]]) { return NO; } - OWSSignalServiceProtosCallMessageOffer *otherMessage = other; + SSKProtoCallMessageOffer *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -1495,42 +1498,42 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall } @end -@interface OWSSignalServiceProtosCallMessageOfferBuilder() -@property (strong) OWSSignalServiceProtosCallMessageOffer* resultOffer; +@interface SSKProtoCallMessageOfferBuilder() +@property (strong) SSKProtoCallMessageOffer* resultOffer; @end -@implementation OWSSignalServiceProtosCallMessageOfferBuilder +@implementation SSKProtoCallMessageOfferBuilder @synthesize resultOffer; - (instancetype) init { if ((self = [super init])) { - self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; + self.resultOffer = [[SSKProtoCallMessageOffer alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultOffer; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clear { - self.resultOffer = [[OWSSignalServiceProtosCallMessageOffer alloc] init]; +- (SSKProtoCallMessageOfferBuilder*) clear { + self.resultOffer = [[SSKProtoCallMessageOffer alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clone { - return [OWSSignalServiceProtosCallMessageOffer builderWithPrototype:resultOffer]; +- (SSKProtoCallMessageOfferBuilder*) clone { + return [SSKProtoCallMessageOffer builderWithPrototype:resultOffer]; } -- (OWSSignalServiceProtosCallMessageOffer*) defaultInstance { - return [OWSSignalServiceProtosCallMessageOffer defaultInstance]; +- (SSKProtoCallMessageOffer*) defaultInstance { + return [SSKProtoCallMessageOffer defaultInstance]; } -- (OWSSignalServiceProtosCallMessageOffer*) build { +- (SSKProtoCallMessageOffer*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageOffer*) buildPartial { - OWSSignalServiceProtosCallMessageOffer* returnMe = resultOffer; +- (SSKProtoCallMessageOffer*) buildPartial { + SSKProtoCallMessageOffer* returnMe = resultOffer; self.resultOffer = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageOffer*) other { - if (other == [OWSSignalServiceProtosCallMessageOffer defaultInstance]) { +- (SSKProtoCallMessageOfferBuilder*) mergeFrom:(SSKProtoCallMessageOffer*) other { + if (other == [SSKProtoCallMessageOffer defaultInstance]) { return self; } if (other.hasId) { @@ -1542,10 +1545,10 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageOfferBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -1577,12 +1580,12 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall - (UInt64) id { return resultOffer.id; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setId:(UInt64) value { +- (SSKProtoCallMessageOfferBuilder*) setId:(UInt64) value { resultOffer.hasId = YES; resultOffer.id = value; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearId { +- (SSKProtoCallMessageOfferBuilder*) clearId { resultOffer.hasId = NO; resultOffer.id = 0L; return self; @@ -1593,24 +1596,24 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall - (NSString*) sessionDescription { return resultOffer.sessionDescription; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) setSessionDescription:(NSString*) value { +- (SSKProtoCallMessageOfferBuilder*) setSessionDescription:(NSString*) value { resultOffer.hasSessionDescription = YES; resultOffer.sessionDescription = value; return self; } -- (OWSSignalServiceProtosCallMessageOfferBuilder*) clearSessionDescription { +- (SSKProtoCallMessageOfferBuilder*) clearSessionDescription { resultOffer.hasSessionDescription = NO; resultOffer.sessionDescription = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessageAnswer () +@interface SSKProtoCallMessageAnswer () @property UInt64 id; @property (strong) NSString* sessionDescription; @end -@implementation OWSSignalServiceProtosCallMessageAnswer +@implementation SSKProtoCallMessageAnswer - (BOOL) hasId { return !!hasId_; @@ -1633,17 +1636,17 @@ static OWSSignalServiceProtosCallMessageOffer* defaultOWSSignalServiceProtosCall } return self; } -static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCallMessageAnswerInstance = nil; +static SSKProtoCallMessageAnswer* defaultSSKProtoCallMessageAnswerInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageAnswer class]) { - defaultOWSSignalServiceProtosCallMessageAnswerInstance = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; + if (self == [SSKProtoCallMessageAnswer class]) { + defaultSSKProtoCallMessageAnswerInstance = [[SSKProtoCallMessageAnswer alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageAnswerInstance; + return defaultSSKProtoCallMessageAnswerInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageAnswerInstance; + return defaultSSKProtoCallMessageAnswerInstance; } - (BOOL) isInitialized { return YES; @@ -1674,35 +1677,35 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data] build]; ++ (SSKProtoCallMessageAnswer*) parseFromData:(NSData*) data { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageAnswer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageAnswer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageAnswer*)[[[OWSSignalServiceProtosCallMessageAnswer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageAnswer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageAnswer*)[[[SSKProtoCallMessageAnswer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageAnswerBuilder alloc] init]; ++ (SSKProtoCallMessageAnswerBuilder*) builder { + return [[SSKProtoCallMessageAnswerBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageAnswerBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageAnswer*) prototype { - return [[OWSSignalServiceProtosCallMessageAnswer builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageAnswerBuilder*) builderWithPrototype:(SSKProtoCallMessageAnswer*) prototype { + return [[SSKProtoCallMessageAnswer builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) builder { - return [OWSSignalServiceProtosCallMessageAnswer builder]; +- (SSKProtoCallMessageAnswerBuilder*) builder { + return [SSKProtoCallMessageAnswer builder]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:self]; +- (SSKProtoCallMessageAnswerBuilder*) toBuilder { + return [SSKProtoCallMessageAnswer builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -1726,10 +1729,10 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageAnswer class]]) { + if (![other isKindOfClass:[SSKProtoCallMessageAnswer class]]) { return NO; } - OWSSignalServiceProtosCallMessageAnswer *otherMessage = other; + SSKProtoCallMessageAnswer *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -1750,42 +1753,42 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal } @end -@interface OWSSignalServiceProtosCallMessageAnswerBuilder() -@property (strong) OWSSignalServiceProtosCallMessageAnswer* resultAnswer; +@interface SSKProtoCallMessageAnswerBuilder() +@property (strong) SSKProtoCallMessageAnswer* resultAnswer; @end -@implementation OWSSignalServiceProtosCallMessageAnswerBuilder +@implementation SSKProtoCallMessageAnswerBuilder @synthesize resultAnswer; - (instancetype) init { if ((self = [super init])) { - self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; + self.resultAnswer = [[SSKProtoCallMessageAnswer alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultAnswer; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clear { - self.resultAnswer = [[OWSSignalServiceProtosCallMessageAnswer alloc] init]; +- (SSKProtoCallMessageAnswerBuilder*) clear { + self.resultAnswer = [[SSKProtoCallMessageAnswer alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clone { - return [OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:resultAnswer]; +- (SSKProtoCallMessageAnswerBuilder*) clone { + return [SSKProtoCallMessageAnswer builderWithPrototype:resultAnswer]; } -- (OWSSignalServiceProtosCallMessageAnswer*) defaultInstance { - return [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; +- (SSKProtoCallMessageAnswer*) defaultInstance { + return [SSKProtoCallMessageAnswer defaultInstance]; } -- (OWSSignalServiceProtosCallMessageAnswer*) build { +- (SSKProtoCallMessageAnswer*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageAnswer*) buildPartial { - OWSSignalServiceProtosCallMessageAnswer* returnMe = resultAnswer; +- (SSKProtoCallMessageAnswer*) buildPartial { + SSKProtoCallMessageAnswer* returnMe = resultAnswer; self.resultAnswer = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageAnswer*) other { - if (other == [OWSSignalServiceProtosCallMessageAnswer defaultInstance]) { +- (SSKProtoCallMessageAnswerBuilder*) mergeFrom:(SSKProtoCallMessageAnswer*) other { + if (other == [SSKProtoCallMessageAnswer defaultInstance]) { return self; } if (other.hasId) { @@ -1797,10 +1800,10 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageAnswerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -1832,12 +1835,12 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal - (UInt64) id { return resultAnswer.id; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setId:(UInt64) value { +- (SSKProtoCallMessageAnswerBuilder*) setId:(UInt64) value { resultAnswer.hasId = YES; resultAnswer.id = value; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearId { +- (SSKProtoCallMessageAnswerBuilder*) clearId { resultAnswer.hasId = NO; resultAnswer.id = 0L; return self; @@ -1848,26 +1851,26 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal - (NSString*) sessionDescription { return resultAnswer.sessionDescription; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value { +- (SSKProtoCallMessageAnswerBuilder*) setSessionDescription:(NSString*) value { resultAnswer.hasSessionDescription = YES; resultAnswer.sessionDescription = value; return self; } -- (OWSSignalServiceProtosCallMessageAnswerBuilder*) clearSessionDescription { +- (SSKProtoCallMessageAnswerBuilder*) clearSessionDescription { resultAnswer.hasSessionDescription = NO; resultAnswer.sessionDescription = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessageIceUpdate () +@interface SSKProtoCallMessageIceUpdate () @property UInt64 id; @property (strong) NSString* sdpMid; @property UInt32 sdpMlineIndex; @property (strong) NSString* sdp; @end -@implementation OWSSignalServiceProtosCallMessageIceUpdate +@implementation SSKProtoCallMessageIceUpdate - (BOOL) hasId { return !!hasId_; @@ -1906,17 +1909,17 @@ static OWSSignalServiceProtosCallMessageAnswer* defaultOWSSignalServiceProtosCal } return self; } -static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = nil; +static SSKProtoCallMessageIceUpdate* defaultSSKProtoCallMessageIceUpdateInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageIceUpdate class]) { - defaultOWSSignalServiceProtosCallMessageIceUpdateInstance = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; + if (self == [SSKProtoCallMessageIceUpdate class]) { + defaultSSKProtoCallMessageIceUpdateInstance = [[SSKProtoCallMessageIceUpdate alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; + return defaultSSKProtoCallMessageIceUpdateInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageIceUpdateInstance; + return defaultSSKProtoCallMessageIceUpdateInstance; } - (BOOL) isInitialized { return YES; @@ -1959,35 +1962,35 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromData:(NSData*) data { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageIceUpdate*)[[[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageIceUpdate*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageIceUpdate*)[[[SSKProtoCallMessageIceUpdate builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageIceUpdateBuilder alloc] init]; ++ (SSKProtoCallMessageIceUpdateBuilder*) builder { + return [[SSKProtoCallMessageIceUpdateBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageIceUpdate*) prototype { - return [[OWSSignalServiceProtosCallMessageIceUpdate builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageIceUpdateBuilder*) builderWithPrototype:(SSKProtoCallMessageIceUpdate*) prototype { + return [[SSKProtoCallMessageIceUpdate builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) builder { - return [OWSSignalServiceProtosCallMessageIceUpdate builder]; +- (SSKProtoCallMessageIceUpdateBuilder*) builder { + return [SSKProtoCallMessageIceUpdate builder]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:self]; +- (SSKProtoCallMessageIceUpdateBuilder*) toBuilder { + return [SSKProtoCallMessageIceUpdate builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -2023,10 +2026,10 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageIceUpdate class]]) { + if (![other isKindOfClass:[SSKProtoCallMessageIceUpdate class]]) { return NO; } - OWSSignalServiceProtosCallMessageIceUpdate *otherMessage = other; + SSKProtoCallMessageIceUpdate *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -2057,42 +2060,42 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos } @end -@interface OWSSignalServiceProtosCallMessageIceUpdateBuilder() -@property (strong) OWSSignalServiceProtosCallMessageIceUpdate* resultIceUpdate; +@interface SSKProtoCallMessageIceUpdateBuilder() +@property (strong) SSKProtoCallMessageIceUpdate* resultIceUpdate; @end -@implementation OWSSignalServiceProtosCallMessageIceUpdateBuilder +@implementation SSKProtoCallMessageIceUpdateBuilder @synthesize resultIceUpdate; - (instancetype) init { if ((self = [super init])) { - self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; + self.resultIceUpdate = [[SSKProtoCallMessageIceUpdate alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultIceUpdate; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clear { - self.resultIceUpdate = [[OWSSignalServiceProtosCallMessageIceUpdate alloc] init]; +- (SSKProtoCallMessageIceUpdateBuilder*) clear { + self.resultIceUpdate = [[SSKProtoCallMessageIceUpdate alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clone { - return [OWSSignalServiceProtosCallMessageIceUpdate builderWithPrototype:resultIceUpdate]; +- (SSKProtoCallMessageIceUpdateBuilder*) clone { + return [SSKProtoCallMessageIceUpdate builderWithPrototype:resultIceUpdate]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) defaultInstance { - return [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]; +- (SSKProtoCallMessageIceUpdate*) defaultInstance { + return [SSKProtoCallMessageIceUpdate defaultInstance]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) build { +- (SSKProtoCallMessageIceUpdate*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageIceUpdate*) buildPartial { - OWSSignalServiceProtosCallMessageIceUpdate* returnMe = resultIceUpdate; +- (SSKProtoCallMessageIceUpdate*) buildPartial { + SSKProtoCallMessageIceUpdate* returnMe = resultIceUpdate; self.resultIceUpdate = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageIceUpdate*) other { - if (other == [OWSSignalServiceProtosCallMessageIceUpdate defaultInstance]) { +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFrom:(SSKProtoCallMessageIceUpdate*) other { + if (other == [SSKProtoCallMessageIceUpdate defaultInstance]) { return self; } if (other.hasId) { @@ -2110,10 +2113,10 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageIceUpdateBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2153,12 +2156,12 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos - (UInt64) id { return resultIceUpdate.id; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setId:(UInt64) value { +- (SSKProtoCallMessageIceUpdateBuilder*) setId:(UInt64) value { resultIceUpdate.hasId = YES; resultIceUpdate.id = value; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearId { +- (SSKProtoCallMessageIceUpdateBuilder*) clearId { resultIceUpdate.hasId = NO; resultIceUpdate.id = 0L; return self; @@ -2169,12 +2172,12 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos - (NSString*) sdpMid { return resultIceUpdate.sdpMid; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value { +- (SSKProtoCallMessageIceUpdateBuilder*) setSdpMid:(NSString*) value { resultIceUpdate.hasSdpMid = YES; resultIceUpdate.sdpMid = value; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMid { +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdpMid { resultIceUpdate.hasSdpMid = NO; resultIceUpdate.sdpMid = @""; return self; @@ -2185,12 +2188,12 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos - (UInt32) sdpMlineIndex { return resultIceUpdate.sdpMlineIndex; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value { +- (SSKProtoCallMessageIceUpdateBuilder*) setSdpMlineIndex:(UInt32) value { resultIceUpdate.hasSdpMlineIndex = YES; resultIceUpdate.sdpMlineIndex = value; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdpMlineIndex { +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdpMlineIndex { resultIceUpdate.hasSdpMlineIndex = NO; resultIceUpdate.sdpMlineIndex = 0; return self; @@ -2201,23 +2204,23 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos - (NSString*) sdp { return resultIceUpdate.sdp; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) setSdp:(NSString*) value { +- (SSKProtoCallMessageIceUpdateBuilder*) setSdp:(NSString*) value { resultIceUpdate.hasSdp = YES; resultIceUpdate.sdp = value; return self; } -- (OWSSignalServiceProtosCallMessageIceUpdateBuilder*) clearSdp { +- (SSKProtoCallMessageIceUpdateBuilder*) clearSdp { resultIceUpdate.hasSdp = NO; resultIceUpdate.sdp = @""; return self; } @end -@interface OWSSignalServiceProtosCallMessageBusy () +@interface SSKProtoCallMessageBusy () @property UInt64 id; @end -@implementation OWSSignalServiceProtosCallMessageBusy +@implementation SSKProtoCallMessageBusy - (BOOL) hasId { return !!hasId_; @@ -2232,17 +2235,17 @@ static OWSSignalServiceProtosCallMessageIceUpdate* defaultOWSSignalServiceProtos } return self; } -static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallMessageBusyInstance = nil; +static SSKProtoCallMessageBusy* defaultSSKProtoCallMessageBusyInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageBusy class]) { - defaultOWSSignalServiceProtosCallMessageBusyInstance = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; + if (self == [SSKProtoCallMessageBusy class]) { + defaultSSKProtoCallMessageBusyInstance = [[SSKProtoCallMessageBusy alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageBusyInstance; + return defaultSSKProtoCallMessageBusyInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageBusyInstance; + return defaultSSKProtoCallMessageBusyInstance; } - (BOOL) isInitialized { return YES; @@ -2267,35 +2270,35 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data] build]; ++ (SSKProtoCallMessageBusy*) parseFromData:(NSData*) data { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageBusy*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessageBusy*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageBusy*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageBusy*)[[[OWSSignalServiceProtosCallMessageBusy builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageBusy*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageBusy*)[[[SSKProtoCallMessageBusy builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageBusyBuilder alloc] init]; ++ (SSKProtoCallMessageBusyBuilder*) builder { + return [[SSKProtoCallMessageBusyBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageBusyBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageBusy*) prototype { - return [[OWSSignalServiceProtosCallMessageBusy builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageBusyBuilder*) builderWithPrototype:(SSKProtoCallMessageBusy*) prototype { + return [[SSKProtoCallMessageBusy builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) builder { - return [OWSSignalServiceProtosCallMessageBusy builder]; +- (SSKProtoCallMessageBusyBuilder*) builder { + return [SSKProtoCallMessageBusy builder]; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:self]; +- (SSKProtoCallMessageBusyBuilder*) toBuilder { + return [SSKProtoCallMessageBusy builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -2313,10 +2316,10 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageBusy class]]) { + if (![other isKindOfClass:[SSKProtoCallMessageBusy class]]) { return NO; } - OWSSignalServiceProtosCallMessageBusy *otherMessage = other; + SSKProtoCallMessageBusy *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -2332,42 +2335,42 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM } @end -@interface OWSSignalServiceProtosCallMessageBusyBuilder() -@property (strong) OWSSignalServiceProtosCallMessageBusy* resultBusy; +@interface SSKProtoCallMessageBusyBuilder() +@property (strong) SSKProtoCallMessageBusy* resultBusy; @end -@implementation OWSSignalServiceProtosCallMessageBusyBuilder +@implementation SSKProtoCallMessageBusyBuilder @synthesize resultBusy; - (instancetype) init { if ((self = [super init])) { - self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; + self.resultBusy = [[SSKProtoCallMessageBusy alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultBusy; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clear { - self.resultBusy = [[OWSSignalServiceProtosCallMessageBusy alloc] init]; +- (SSKProtoCallMessageBusyBuilder*) clear { + self.resultBusy = [[SSKProtoCallMessageBusy alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clone { - return [OWSSignalServiceProtosCallMessageBusy builderWithPrototype:resultBusy]; +- (SSKProtoCallMessageBusyBuilder*) clone { + return [SSKProtoCallMessageBusy builderWithPrototype:resultBusy]; } -- (OWSSignalServiceProtosCallMessageBusy*) defaultInstance { - return [OWSSignalServiceProtosCallMessageBusy defaultInstance]; +- (SSKProtoCallMessageBusy*) defaultInstance { + return [SSKProtoCallMessageBusy defaultInstance]; } -- (OWSSignalServiceProtosCallMessageBusy*) build { +- (SSKProtoCallMessageBusy*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageBusy*) buildPartial { - OWSSignalServiceProtosCallMessageBusy* returnMe = resultBusy; +- (SSKProtoCallMessageBusy*) buildPartial { + SSKProtoCallMessageBusy* returnMe = resultBusy; self.resultBusy = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageBusy*) other { - if (other == [OWSSignalServiceProtosCallMessageBusy defaultInstance]) { +- (SSKProtoCallMessageBusyBuilder*) mergeFrom:(SSKProtoCallMessageBusy*) other { + if (other == [SSKProtoCallMessageBusy defaultInstance]) { return self; } if (other.hasId) { @@ -2376,10 +2379,10 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageBusyBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2407,23 +2410,23 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM - (UInt64) id { return resultBusy.id; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) setId:(UInt64) value { +- (SSKProtoCallMessageBusyBuilder*) setId:(UInt64) value { resultBusy.hasId = YES; resultBusy.id = value; return self; } -- (OWSSignalServiceProtosCallMessageBusyBuilder*) clearId { +- (SSKProtoCallMessageBusyBuilder*) clearId { resultBusy.hasId = NO; resultBusy.id = 0L; return self; } @end -@interface OWSSignalServiceProtosCallMessageHangup () +@interface SSKProtoCallMessageHangup () @property UInt64 id; @end -@implementation OWSSignalServiceProtosCallMessageHangup +@implementation SSKProtoCallMessageHangup - (BOOL) hasId { return !!hasId_; @@ -2438,17 +2441,17 @@ static OWSSignalServiceProtosCallMessageBusy* defaultOWSSignalServiceProtosCallM } return self; } -static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCallMessageHangupInstance = nil; +static SSKProtoCallMessageHangup* defaultSSKProtoCallMessageHangupInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosCallMessageHangup class]) { - defaultOWSSignalServiceProtosCallMessageHangupInstance = [[OWSSignalServiceProtosCallMessageHangup alloc] init]; + if (self == [SSKProtoCallMessageHangup class]) { + defaultSSKProtoCallMessageHangupInstance = [[SSKProtoCallMessageHangup alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageHangupInstance; + return defaultSSKProtoCallMessageHangupInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosCallMessageHangupInstance; + return defaultSSKProtoCallMessageHangupInstance; } - (BOOL) isInitialized { return YES; @@ -2473,35 +2476,35 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data] build]; ++ (SSKProtoCallMessageHangup*) parseFromData:(NSData*) data { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageHangup*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input] build]; ++ (SSKProtoCallMessageHangup*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageHangup*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosCallMessageHangup*)[[[OWSSignalServiceProtosCallMessageHangup builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoCallMessageHangup*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoCallMessageHangup*)[[[SSKProtoCallMessageHangup builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { - return [[OWSSignalServiceProtosCallMessageHangupBuilder alloc] init]; ++ (SSKProtoCallMessageHangupBuilder*) builder { + return [[SSKProtoCallMessageHangupBuilder alloc] init]; } -+ (OWSSignalServiceProtosCallMessageHangupBuilder*) builderWithPrototype:(OWSSignalServiceProtosCallMessageHangup*) prototype { - return [[OWSSignalServiceProtosCallMessageHangup builder] mergeFrom:prototype]; ++ (SSKProtoCallMessageHangupBuilder*) builderWithPrototype:(SSKProtoCallMessageHangup*) prototype { + return [[SSKProtoCallMessageHangup builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) builder { - return [OWSSignalServiceProtosCallMessageHangup builder]; +- (SSKProtoCallMessageHangupBuilder*) builder { + return [SSKProtoCallMessageHangup builder]; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) toBuilder { - return [OWSSignalServiceProtosCallMessageHangup builderWithPrototype:self]; +- (SSKProtoCallMessageHangupBuilder*) toBuilder { + return [SSKProtoCallMessageHangup builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -2519,10 +2522,10 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosCallMessageHangup class]]) { + if (![other isKindOfClass:[SSKProtoCallMessageHangup class]]) { return NO; } - OWSSignalServiceProtosCallMessageHangup *otherMessage = other; + SSKProtoCallMessageHangup *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -2538,42 +2541,42 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal } @end -@interface OWSSignalServiceProtosCallMessageHangupBuilder() -@property (strong) OWSSignalServiceProtosCallMessageHangup* resultHangup; +@interface SSKProtoCallMessageHangupBuilder() +@property (strong) SSKProtoCallMessageHangup* resultHangup; @end -@implementation OWSSignalServiceProtosCallMessageHangupBuilder +@implementation SSKProtoCallMessageHangupBuilder @synthesize resultHangup; - (instancetype) init { if ((self = [super init])) { - self.resultHangup = [[OWSSignalServiceProtosCallMessageHangup alloc] init]; + self.resultHangup = [[SSKProtoCallMessageHangup alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultHangup; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clear { - self.resultHangup = [[OWSSignalServiceProtosCallMessageHangup alloc] init]; +- (SSKProtoCallMessageHangupBuilder*) clear { + self.resultHangup = [[SSKProtoCallMessageHangup alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clone { - return [OWSSignalServiceProtosCallMessageHangup builderWithPrototype:resultHangup]; +- (SSKProtoCallMessageHangupBuilder*) clone { + return [SSKProtoCallMessageHangup builderWithPrototype:resultHangup]; } -- (OWSSignalServiceProtosCallMessageHangup*) defaultInstance { - return [OWSSignalServiceProtosCallMessageHangup defaultInstance]; +- (SSKProtoCallMessageHangup*) defaultInstance { + return [SSKProtoCallMessageHangup defaultInstance]; } -- (OWSSignalServiceProtosCallMessageHangup*) build { +- (SSKProtoCallMessageHangup*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessageHangup*) buildPartial { - OWSSignalServiceProtosCallMessageHangup* returnMe = resultHangup; +- (SSKProtoCallMessageHangup*) buildPartial { + SSKProtoCallMessageHangup* returnMe = resultHangup; self.resultHangup = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessageHangup*) other { - if (other == [OWSSignalServiceProtosCallMessageHangup defaultInstance]) { +- (SSKProtoCallMessageHangupBuilder*) mergeFrom:(SSKProtoCallMessageHangup*) other { + if (other == [SSKProtoCallMessageHangup defaultInstance]) { return self; } if (other.hasId) { @@ -2582,10 +2585,10 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageHangupBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2613,54 +2616,54 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal - (UInt64) id { return resultHangup.id; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) setId:(UInt64) value { +- (SSKProtoCallMessageHangupBuilder*) setId:(UInt64) value { resultHangup.hasId = YES; resultHangup.id = value; return self; } -- (OWSSignalServiceProtosCallMessageHangupBuilder*) clearId { +- (SSKProtoCallMessageHangupBuilder*) clearId { resultHangup.hasId = NO; resultHangup.id = 0L; return self; } @end -@interface OWSSignalServiceProtosCallMessageBuilder() -@property (strong) OWSSignalServiceProtosCallMessage* resultCallMessage; +@interface SSKProtoCallMessageBuilder() +@property (strong) SSKProtoCallMessage* resultCallMessage; @end -@implementation OWSSignalServiceProtosCallMessageBuilder +@implementation SSKProtoCallMessageBuilder @synthesize resultCallMessage; - (instancetype) init { if ((self = [super init])) { - self.resultCallMessage = [[OWSSignalServiceProtosCallMessage alloc] init]; + self.resultCallMessage = [[SSKProtoCallMessage alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultCallMessage; } -- (OWSSignalServiceProtosCallMessageBuilder*) clear { - self.resultCallMessage = [[OWSSignalServiceProtosCallMessage alloc] init]; +- (SSKProtoCallMessageBuilder*) clear { + self.resultCallMessage = [[SSKProtoCallMessage alloc] init]; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clone { - return [OWSSignalServiceProtosCallMessage builderWithPrototype:resultCallMessage]; +- (SSKProtoCallMessageBuilder*) clone { + return [SSKProtoCallMessage builderWithPrototype:resultCallMessage]; } -- (OWSSignalServiceProtosCallMessage*) defaultInstance { - return [OWSSignalServiceProtosCallMessage defaultInstance]; +- (SSKProtoCallMessage*) defaultInstance { + return [SSKProtoCallMessage defaultInstance]; } -- (OWSSignalServiceProtosCallMessage*) build { +- (SSKProtoCallMessage*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosCallMessage*) buildPartial { - OWSSignalServiceProtosCallMessage* returnMe = resultCallMessage; +- (SSKProtoCallMessage*) buildPartial { + SSKProtoCallMessage* returnMe = resultCallMessage; self.resultCallMessage = nil; return returnMe; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFrom:(OWSSignalServiceProtosCallMessage*) other { - if (other == [OWSSignalServiceProtosCallMessage defaultInstance]) { +- (SSKProtoCallMessageBuilder*) mergeFrom:(SSKProtoCallMessage*) other { + if (other == [SSKProtoCallMessage defaultInstance]) { return self; } if (other.hasOffer) { @@ -2688,10 +2691,10 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoCallMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -2707,7 +2710,7 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal break; } case 10: { - OWSSignalServiceProtosCallMessageOfferBuilder* subBuilder = [OWSSignalServiceProtosCallMessageOffer builder]; + SSKProtoCallMessageOfferBuilder* subBuilder = [SSKProtoCallMessageOffer builder]; if (self.hasOffer) { [subBuilder mergeFrom:self.offer]; } @@ -2716,7 +2719,7 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal break; } case 18: { - OWSSignalServiceProtosCallMessageAnswerBuilder* subBuilder = [OWSSignalServiceProtosCallMessageAnswer builder]; + SSKProtoCallMessageAnswerBuilder* subBuilder = [SSKProtoCallMessageAnswer builder]; if (self.hasAnswer) { [subBuilder mergeFrom:self.answer]; } @@ -2725,13 +2728,13 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal break; } case 26: { - OWSSignalServiceProtosCallMessageIceUpdateBuilder* subBuilder = [OWSSignalServiceProtosCallMessageIceUpdate builder]; + SSKProtoCallMessageIceUpdateBuilder* subBuilder = [SSKProtoCallMessageIceUpdate builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addIceUpdate:[subBuilder buildPartial]]; break; } case 34: { - OWSSignalServiceProtosCallMessageHangupBuilder* subBuilder = [OWSSignalServiceProtosCallMessageHangup builder]; + SSKProtoCallMessageHangupBuilder* subBuilder = [SSKProtoCallMessageHangup builder]; if (self.hasHangup) { [subBuilder mergeFrom:self.hangup]; } @@ -2740,7 +2743,7 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal break; } case 42: { - OWSSignalServiceProtosCallMessageBusyBuilder* subBuilder = [OWSSignalServiceProtosCallMessageBusy builder]; + SSKProtoCallMessageBusyBuilder* subBuilder = [SSKProtoCallMessageBusy builder]; if (self.hasBusy) { [subBuilder mergeFrom:self.busy]; } @@ -2758,142 +2761,142 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal - (BOOL) hasOffer { return resultCallMessage.hasOffer; } -- (OWSSignalServiceProtosCallMessageOffer*) offer { +- (SSKProtoCallMessageOffer*) offer { return resultCallMessage.offer; } -- (OWSSignalServiceProtosCallMessageBuilder*) setOffer:(OWSSignalServiceProtosCallMessageOffer*) value { +- (SSKProtoCallMessageBuilder*) setOffer:(SSKProtoCallMessageOffer*) value { resultCallMessage.hasOffer = YES; resultCallMessage.offer = value; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) setOfferBuilder:(OWSSignalServiceProtosCallMessageOfferBuilder*) builderForValue { +- (SSKProtoCallMessageBuilder*) setOfferBuilder:(SSKProtoCallMessageOfferBuilder*) builderForValue { return [self setOffer:[builderForValue build]]; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeOffer:(OWSSignalServiceProtosCallMessageOffer*) value { +- (SSKProtoCallMessageBuilder*) mergeOffer:(SSKProtoCallMessageOffer*) value { if (resultCallMessage.hasOffer && - resultCallMessage.offer != [OWSSignalServiceProtosCallMessageOffer defaultInstance]) { + resultCallMessage.offer != [SSKProtoCallMessageOffer defaultInstance]) { resultCallMessage.offer = - [[[OWSSignalServiceProtosCallMessageOffer builderWithPrototype:resultCallMessage.offer] mergeFrom:value] buildPartial]; + [[[SSKProtoCallMessageOffer builderWithPrototype:resultCallMessage.offer] mergeFrom:value] buildPartial]; } else { resultCallMessage.offer = value; } resultCallMessage.hasOffer = YES; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clearOffer { +- (SSKProtoCallMessageBuilder*) clearOffer { resultCallMessage.hasOffer = NO; - resultCallMessage.offer = [OWSSignalServiceProtosCallMessageOffer defaultInstance]; + resultCallMessage.offer = [SSKProtoCallMessageOffer defaultInstance]; return self; } - (BOOL) hasAnswer { return resultCallMessage.hasAnswer; } -- (OWSSignalServiceProtosCallMessageAnswer*) answer { +- (SSKProtoCallMessageAnswer*) answer { return resultCallMessage.answer; } -- (OWSSignalServiceProtosCallMessageBuilder*) setAnswer:(OWSSignalServiceProtosCallMessageAnswer*) value { +- (SSKProtoCallMessageBuilder*) setAnswer:(SSKProtoCallMessageAnswer*) value { resultCallMessage.hasAnswer = YES; resultCallMessage.answer = value; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) setAnswerBuilder:(OWSSignalServiceProtosCallMessageAnswerBuilder*) builderForValue { +- (SSKProtoCallMessageBuilder*) setAnswerBuilder:(SSKProtoCallMessageAnswerBuilder*) builderForValue { return [self setAnswer:[builderForValue build]]; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeAnswer:(OWSSignalServiceProtosCallMessageAnswer*) value { +- (SSKProtoCallMessageBuilder*) mergeAnswer:(SSKProtoCallMessageAnswer*) value { if (resultCallMessage.hasAnswer && - resultCallMessage.answer != [OWSSignalServiceProtosCallMessageAnswer defaultInstance]) { + resultCallMessage.answer != [SSKProtoCallMessageAnswer defaultInstance]) { resultCallMessage.answer = - [[[OWSSignalServiceProtosCallMessageAnswer builderWithPrototype:resultCallMessage.answer] mergeFrom:value] buildPartial]; + [[[SSKProtoCallMessageAnswer builderWithPrototype:resultCallMessage.answer] mergeFrom:value] buildPartial]; } else { resultCallMessage.answer = value; } resultCallMessage.hasAnswer = YES; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clearAnswer { +- (SSKProtoCallMessageBuilder*) clearAnswer { resultCallMessage.hasAnswer = NO; - resultCallMessage.answer = [OWSSignalServiceProtosCallMessageAnswer defaultInstance]; + resultCallMessage.answer = [SSKProtoCallMessageAnswer defaultInstance]; return self; } -- (NSMutableArray *)iceUpdate { +- (NSMutableArray *)iceUpdate { return resultCallMessage.iceUpdateArray; } -- (OWSSignalServiceProtosCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { +- (SSKProtoCallMessageIceUpdate*)iceUpdateAtIndex:(NSUInteger)index { return [resultCallMessage iceUpdateAtIndex:index]; } -- (OWSSignalServiceProtosCallMessageBuilder *)addIceUpdate:(OWSSignalServiceProtosCallMessageIceUpdate*)value { +- (SSKProtoCallMessageBuilder *)addIceUpdate:(SSKProtoCallMessageIceUpdate*)value { if (resultCallMessage.iceUpdateArray == nil) { resultCallMessage.iceUpdateArray = [[NSMutableArray alloc]init]; } [resultCallMessage.iceUpdateArray addObject:value]; return self; } -- (OWSSignalServiceProtosCallMessageBuilder *)setIceUpdateArray:(NSArray *)array { +- (SSKProtoCallMessageBuilder *)setIceUpdateArray:(NSArray *)array { resultCallMessage.iceUpdateArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosCallMessageBuilder *)clearIceUpdate { +- (SSKProtoCallMessageBuilder *)clearIceUpdate { resultCallMessage.iceUpdateArray = nil; return self; } - (BOOL) hasHangup { return resultCallMessage.hasHangup; } -- (OWSSignalServiceProtosCallMessageHangup*) hangup { +- (SSKProtoCallMessageHangup*) hangup { return resultCallMessage.hangup; } -- (OWSSignalServiceProtosCallMessageBuilder*) setHangup:(OWSSignalServiceProtosCallMessageHangup*) value { +- (SSKProtoCallMessageBuilder*) setHangup:(SSKProtoCallMessageHangup*) value { resultCallMessage.hasHangup = YES; resultCallMessage.hangup = value; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) setHangupBuilder:(OWSSignalServiceProtosCallMessageHangupBuilder*) builderForValue { +- (SSKProtoCallMessageBuilder*) setHangupBuilder:(SSKProtoCallMessageHangupBuilder*) builderForValue { return [self setHangup:[builderForValue build]]; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeHangup:(OWSSignalServiceProtosCallMessageHangup*) value { +- (SSKProtoCallMessageBuilder*) mergeHangup:(SSKProtoCallMessageHangup*) value { if (resultCallMessage.hasHangup && - resultCallMessage.hangup != [OWSSignalServiceProtosCallMessageHangup defaultInstance]) { + resultCallMessage.hangup != [SSKProtoCallMessageHangup defaultInstance]) { resultCallMessage.hangup = - [[[OWSSignalServiceProtosCallMessageHangup builderWithPrototype:resultCallMessage.hangup] mergeFrom:value] buildPartial]; + [[[SSKProtoCallMessageHangup builderWithPrototype:resultCallMessage.hangup] mergeFrom:value] buildPartial]; } else { resultCallMessage.hangup = value; } resultCallMessage.hasHangup = YES; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clearHangup { +- (SSKProtoCallMessageBuilder*) clearHangup { resultCallMessage.hasHangup = NO; - resultCallMessage.hangup = [OWSSignalServiceProtosCallMessageHangup defaultInstance]; + resultCallMessage.hangup = [SSKProtoCallMessageHangup defaultInstance]; return self; } - (BOOL) hasBusy { return resultCallMessage.hasBusy; } -- (OWSSignalServiceProtosCallMessageBusy*) busy { +- (SSKProtoCallMessageBusy*) busy { return resultCallMessage.busy; } -- (OWSSignalServiceProtosCallMessageBuilder*) setBusy:(OWSSignalServiceProtosCallMessageBusy*) value { +- (SSKProtoCallMessageBuilder*) setBusy:(SSKProtoCallMessageBusy*) value { resultCallMessage.hasBusy = YES; resultCallMessage.busy = value; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) setBusyBuilder:(OWSSignalServiceProtosCallMessageBusyBuilder*) builderForValue { +- (SSKProtoCallMessageBuilder*) setBusyBuilder:(SSKProtoCallMessageBusyBuilder*) builderForValue { return [self setBusy:[builderForValue build]]; } -- (OWSSignalServiceProtosCallMessageBuilder*) mergeBusy:(OWSSignalServiceProtosCallMessageBusy*) value { +- (SSKProtoCallMessageBuilder*) mergeBusy:(SSKProtoCallMessageBusy*) value { if (resultCallMessage.hasBusy && - resultCallMessage.busy != [OWSSignalServiceProtosCallMessageBusy defaultInstance]) { + resultCallMessage.busy != [SSKProtoCallMessageBusy defaultInstance]) { resultCallMessage.busy = - [[[OWSSignalServiceProtosCallMessageBusy builderWithPrototype:resultCallMessage.busy] mergeFrom:value] buildPartial]; + [[[SSKProtoCallMessageBusy builderWithPrototype:resultCallMessage.busy] mergeFrom:value] buildPartial]; } else { resultCallMessage.busy = value; } resultCallMessage.hasBusy = YES; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clearBusy { +- (SSKProtoCallMessageBuilder*) clearBusy { resultCallMessage.hasBusy = NO; - resultCallMessage.busy = [OWSSignalServiceProtosCallMessageBusy defaultInstance]; + resultCallMessage.busy = [SSKProtoCallMessageBusy defaultInstance]; return self; } - (BOOL) hasProfileKey { @@ -2902,31 +2905,31 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal - (NSData*) profileKey { return resultCallMessage.profileKey; } -- (OWSSignalServiceProtosCallMessageBuilder*) setProfileKey:(NSData*) value { +- (SSKProtoCallMessageBuilder*) setProfileKey:(NSData*) value { resultCallMessage.hasProfileKey = YES; resultCallMessage.profileKey = value; return self; } -- (OWSSignalServiceProtosCallMessageBuilder*) clearProfileKey { +- (SSKProtoCallMessageBuilder*) clearProfileKey { resultCallMessage.hasProfileKey = NO; resultCallMessage.profileKey = [NSData data]; return self; } @end -@interface OWSSignalServiceProtosDataMessage () +@interface SSKProtoDataMessage () @property (strong) NSString* body; -@property (strong) NSMutableArray * attachmentsArray; -@property (strong) OWSSignalServiceProtosGroupContext* group; +@property (strong) NSMutableArray * attachmentsArray; +@property (strong) SSKProtoGroupContext* group; @property UInt32 flags; @property UInt32 expireTimer; @property (strong) NSData* profileKey; @property UInt64 timestamp; -@property (strong) OWSSignalServiceProtosDataMessageQuote* quote; -@property (strong) NSMutableArray * contactArray; +@property (strong) SSKProtoDataMessageQuote* quote; +@property (strong) NSMutableArray * contactArray; @end -@implementation OWSSignalServiceProtosDataMessage +@implementation SSKProtoDataMessage - (BOOL) hasBody { return !!hasBody_; @@ -2984,37 +2987,37 @@ static OWSSignalServiceProtosCallMessageHangup* defaultOWSSignalServiceProtosCal - (instancetype) init { if ((self = [super init])) { self.body = @""; - self.group = [OWSSignalServiceProtosGroupContext defaultInstance]; + self.group = [SSKProtoGroupContext defaultInstance]; self.flags = 0; self.expireTimer = 0; self.profileKey = [NSData data]; self.timestamp = 0L; - self.quote = [OWSSignalServiceProtosDataMessageQuote defaultInstance]; + self.quote = [SSKProtoDataMessageQuote defaultInstance]; } return self; } -static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessageInstance = nil; +static SSKProtoDataMessage* defaultSSKProtoDataMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessage class]) { - defaultOWSSignalServiceProtosDataMessageInstance = [[OWSSignalServiceProtosDataMessage alloc] init]; + if (self == [SSKProtoDataMessage class]) { + defaultSSKProtoDataMessageInstance = [[SSKProtoDataMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageInstance; + return defaultSSKProtoDataMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageInstance; + return defaultSSKProtoDataMessageInstance; } -- (NSArray *)attachments { +- (NSArray *)attachments { return attachmentsArray; } -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { +- (SSKProtoAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { return [attachmentsArray objectAtIndex:index]; } -- (NSArray *)contact { +- (NSArray *)contact { return contactArray; } -- (OWSSignalServiceProtosDataMessageContact*)contactAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContact*)contactAtIndex:(NSUInteger)index { return [contactArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -3024,7 +3027,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasBody) { [output writeString:1 value:self.body]; } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoAttachmentPointer *element, NSUInteger idx, BOOL *stop) { [output writeMessage:2 value:element]; }]; if (self.hasGroup) { @@ -3045,7 +3048,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasQuote) { [output writeMessage:8 value:self.quote]; } - [self.contactArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContact *element, NSUInteger idx, BOOL *stop) { + [self.contactArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContact *element, NSUInteger idx, BOOL *stop) { [output writeMessage:9 value:element]; }]; [self.unknownFields writeToCodedOutputStream:output]; @@ -3060,7 +3063,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasBody) { size_ += computeStringSize(1, self.body); } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoAttachmentPointer *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(2, element); }]; if (self.hasGroup) { @@ -3081,48 +3084,48 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasQuote) { size_ += computeMessageSize(8, self.quote); } - [self.contactArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContact *element, NSUInteger idx, BOOL *stop) { + [self.contactArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContact *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(9, element); }]; size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data] build]; ++ (SSKProtoDataMessage*) parseFromData:(NSData*) data { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessage*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessage*)[[[OWSSignalServiceProtosDataMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessage*)[[[SSKProtoDataMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageBuilder alloc] init]; ++ (SSKProtoDataMessageBuilder*) builder { + return [[SSKProtoDataMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessage*) prototype { - return [[OWSSignalServiceProtosDataMessage builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageBuilder*) builderWithPrototype:(SSKProtoDataMessage*) prototype { + return [[SSKProtoDataMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageBuilder*) builder { - return [OWSSignalServiceProtosDataMessage builder]; +- (SSKProtoDataMessageBuilder*) builder { + return [SSKProtoDataMessage builder]; } -- (OWSSignalServiceProtosDataMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessage builderWithPrototype:self]; +- (SSKProtoDataMessageBuilder*) toBuilder { + return [SSKProtoDataMessage 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) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoAttachmentPointer *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"attachments"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -3152,7 +3155,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } - [self.contactArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContact *element, NSUInteger idx, BOOL *stop) { + [self.contactArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContact *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"contact"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -3164,7 +3167,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasBody) { [dictionary setObject: self.body forKey: @"body"]; } - for (OWSSignalServiceProtosAttachmentPointer* element in self.attachmentsArray) { + for (SSKProtoAttachmentPointer* element in self.attachmentsArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"attachments"]; @@ -3191,7 +3194,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa [self.quote storeInDictionary:messageDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"quote"]; } - for (OWSSignalServiceProtosDataMessageContact* element in self.contactArray) { + for (SSKProtoDataMessageContact* element in self.contactArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"contact"]; @@ -3202,10 +3205,10 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessage class]]) { + if (![other isKindOfClass:[SSKProtoDataMessage class]]) { return NO; } - OWSSignalServiceProtosDataMessage *otherMessage = other; + SSKProtoDataMessage *otherMessage = other; return self.hasBody == otherMessage.hasBody && (!self.hasBody || [self.body isEqual:otherMessage.body]) && @@ -3230,7 +3233,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasBody) { hashCode = hashCode * 31 + [self.body hash]; } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosAttachmentPointer *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoAttachmentPointer *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; if (self.hasGroup) { @@ -3251,7 +3254,7 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa if (self.hasQuote) { hashCode = hashCode * 31 + [self.quote hash]; } - [self.contactArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContact *element, NSUInteger idx, BOOL *stop) { + [self.contactArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContact *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; hashCode = hashCode * 31 + [self.unknownFields hash]; @@ -3259,37 +3262,37 @@ static OWSSignalServiceProtosDataMessage* defaultOWSSignalServiceProtosDataMessa } @end -BOOL OWSSignalServiceProtosDataMessageFlagsIsValidValue(OWSSignalServiceProtosDataMessageFlags value) { +BOOL SSKProtoDataMessageFlagsIsValidValue(SSKProtoDataMessageFlags value) { switch (value) { - case OWSSignalServiceProtosDataMessageFlagsEndSession: - case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: - case OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate: + case SSKProtoDataMessageFlagsEndSession: + case SSKProtoDataMessageFlagsExpirationTimerUpdate: + case SSKProtoDataMessageFlagsProfileKeyUpdate: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServiceProtosDataMessageFlags value) { +NSString *NSStringFromSSKProtoDataMessageFlags(SSKProtoDataMessageFlags value) { switch (value) { - case OWSSignalServiceProtosDataMessageFlagsEndSession: - return @"OWSSignalServiceProtosDataMessageFlagsEndSession"; - case OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate: - return @"OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate"; - case OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate: - return @"OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate"; + case SSKProtoDataMessageFlagsEndSession: + return @"SSKProtoDataMessageFlagsEndSession"; + case SSKProtoDataMessageFlagsExpirationTimerUpdate: + return @"SSKProtoDataMessageFlagsExpirationTimerUpdate"; + case SSKProtoDataMessageFlagsProfileKeyUpdate: + return @"SSKProtoDataMessageFlagsProfileKeyUpdate"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageQuote () +@interface SSKProtoDataMessageQuote () @property UInt64 id; @property (strong) NSString* author; @property (strong) NSString* text; -@property (strong) NSMutableArray * attachmentsArray; +@property (strong) NSMutableArray * attachmentsArray; @end -@implementation OWSSignalServiceProtosDataMessageQuote +@implementation SSKProtoDataMessageQuote - (BOOL) hasId { return !!hasId_; @@ -3322,22 +3325,22 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageFlags(OWSSignalServicePro } return self; } -static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosDataMessageQuoteInstance = nil; +static SSKProtoDataMessageQuote* defaultSSKProtoDataMessageQuoteInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageQuote class]) { - defaultOWSSignalServiceProtosDataMessageQuoteInstance = [[OWSSignalServiceProtosDataMessageQuote alloc] init]; + if (self == [SSKProtoDataMessageQuote class]) { + defaultSSKProtoDataMessageQuoteInstance = [[SSKProtoDataMessageQuote alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageQuoteInstance; + return defaultSSKProtoDataMessageQuoteInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageQuoteInstance; + return defaultSSKProtoDataMessageQuoteInstance; } -- (NSArray *)attachments { +- (NSArray *)attachments { return attachmentsArray; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index { return [attachmentsArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -3353,7 +3356,7 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (self.hasText) { [output writeString:3 value:self.text]; } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { [output writeMessage:4 value:element]; }]; [self.unknownFields writeToCodedOutputStream:output]; @@ -3374,42 +3377,42 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (self.hasText) { size_ += computeStringSize(3, self.text); } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(4, element); }]; size_ += self.unknownFields.serializedSize; memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageQuote*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuote*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageQuote*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuote*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuote*)[[[OWSSignalServiceProtosDataMessageQuote builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuote*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuote*)[[[SSKProtoDataMessageQuote builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageQuoteBuilder alloc] init]; ++ (SSKProtoDataMessageQuoteBuilder*) builder { + return [[SSKProtoDataMessageQuoteBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageQuoteBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuote*) prototype { - return [[OWSSignalServiceProtosDataMessageQuote builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageQuoteBuilder*) builderWithPrototype:(SSKProtoDataMessageQuote*) prototype { + return [[SSKProtoDataMessageQuote builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) builder { - return [OWSSignalServiceProtosDataMessageQuote builder]; +- (SSKProtoDataMessageQuoteBuilder*) builder { + return [SSKProtoDataMessageQuote builder]; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageQuote builderWithPrototype:self]; +- (SSKProtoDataMessageQuoteBuilder*) toBuilder { + return [SSKProtoDataMessageQuote builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -3421,7 +3424,7 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (self.hasText) { [output appendFormat:@"%@%@: %@\n", indent, @"text", self.text]; } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"attachments"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -3439,7 +3442,7 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (self.hasText) { [dictionary setObject: self.text forKey: @"text"]; } - for (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* element in self.attachmentsArray) { + for (SSKProtoDataMessageQuoteQuotedAttachment* element in self.attachmentsArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"attachments"]; @@ -3450,10 +3453,10 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageQuote class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageQuote class]]) { return NO; } - OWSSignalServiceProtosDataMessageQuote *otherMessage = other; + SSKProtoDataMessageQuote *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -3475,7 +3478,7 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if (self.hasText) { hashCode = hashCode * 31 + [self.text hash]; } - [self.attachmentsArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { + [self.attachmentsArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageQuoteQuotedAttachment *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; hashCode = hashCode * 31 + [self.unknownFields hash]; @@ -3483,14 +3486,14 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData } @end -@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachment () +@interface SSKProtoDataMessageQuoteQuotedAttachment () @property (strong) NSString* contentType; @property (strong) NSString* fileName; -@property (strong) OWSSignalServiceProtosAttachmentPointer* thumbnail; +@property (strong) SSKProtoAttachmentPointer* thumbnail; @property UInt32 flags; @end -@implementation OWSSignalServiceProtosDataMessageQuoteQuotedAttachment +@implementation SSKProtoDataMessageQuoteQuotedAttachment - (BOOL) hasContentType { return !!hasContentType_; @@ -3524,22 +3527,22 @@ static OWSSignalServiceProtosDataMessageQuote* defaultOWSSignalServiceProtosData if ((self = [super init])) { self.contentType = @""; self.fileName = @""; - self.thumbnail = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + self.thumbnail = [SSKProtoAttachmentPointer defaultInstance]; self.flags = 0; } return self; } -static OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* defaultOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentInstance = nil; +static SSKProtoDataMessageQuoteQuotedAttachment* defaultSSKProtoDataMessageQuoteQuotedAttachmentInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment class]) { - defaultOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentInstance = [[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment alloc] init]; + if (self == [SSKProtoDataMessageQuoteQuotedAttachment class]) { + defaultSSKProtoDataMessageQuoteQuotedAttachmentInstance = [[SSKProtoDataMessageQuoteQuotedAttachment alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentInstance; + return defaultSSKProtoDataMessageQuoteQuotedAttachmentInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentInstance; + return defaultSSKProtoDataMessageQuoteQuotedAttachmentInstance; } - (BOOL) isInitialized { return YES; @@ -3582,35 +3585,35 @@ static OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* defaultOWSSignalS memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)[[[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageQuoteQuotedAttachment*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageQuoteQuotedAttachment*)[[[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder alloc] init]; ++ (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builder { + return [[SSKProtoDataMessageQuoteQuotedAttachmentBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) prototype { - return [[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builderWithPrototype:(SSKProtoDataMessageQuoteQuotedAttachment*) prototype { + return [[SSKProtoDataMessageQuoteQuotedAttachment builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) builder { - return [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder]; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) builder { + return [SSKProtoDataMessageQuoteQuotedAttachment builder]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builderWithPrototype:self]; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) toBuilder { + return [SSKProtoDataMessageQuoteQuotedAttachment builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasContentType) { @@ -3651,10 +3654,10 @@ static OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* defaultOWSSignalS if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageQuoteQuotedAttachment class]]) { return NO; } - OWSSignalServiceProtosDataMessageQuoteQuotedAttachment *otherMessage = other; + SSKProtoDataMessageQuoteQuotedAttachment *otherMessage = other; return self.hasContentType == otherMessage.hasContentType && (!self.hasContentType || [self.contentType isEqual:otherMessage.contentType]) && @@ -3685,59 +3688,59 @@ static OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* defaultOWSSignalS } @end -BOOL OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsIsValidValue(OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags value) { +BOOL SSKProtoDataMessageQuoteQuotedAttachmentFlagsIsValidValue(SSKProtoDataMessageQuoteQuotedAttachmentFlags value) { switch (value) { - case OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsVoiceMessage: + case SSKProtoDataMessageQuoteQuotedAttachmentFlagsVoiceMessage: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags(OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlags value) { +NSString *NSStringFromSSKProtoDataMessageQuoteQuotedAttachmentFlags(SSKProtoDataMessageQuoteQuotedAttachmentFlags value) { switch (value) { - case OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsVoiceMessage: - return @"OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlagsVoiceMessage"; + case SSKProtoDataMessageQuoteQuotedAttachmentFlagsVoiceMessage: + return @"SSKProtoDataMessageQuoteQuotedAttachmentFlagsVoiceMessage"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder() -@property (strong) OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* resultQuotedAttachment; +@interface SSKProtoDataMessageQuoteQuotedAttachmentBuilder() +@property (strong) SSKProtoDataMessageQuoteQuotedAttachment* resultQuotedAttachment; @end -@implementation OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder +@implementation SSKProtoDataMessageQuoteQuotedAttachmentBuilder @synthesize resultQuotedAttachment; - (instancetype) init { if ((self = [super init])) { - self.resultQuotedAttachment = [[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment alloc] init]; + self.resultQuotedAttachment = [[SSKProtoDataMessageQuoteQuotedAttachment alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultQuotedAttachment; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clear { - self.resultQuotedAttachment = [[OWSSignalServiceProtosDataMessageQuoteQuotedAttachment alloc] init]; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clear { + self.resultQuotedAttachment = [[SSKProtoDataMessageQuoteQuotedAttachment alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clone { - return [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builderWithPrototype:resultQuotedAttachment]; +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clone { + return [SSKProtoDataMessageQuoteQuotedAttachment builderWithPrototype:resultQuotedAttachment]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) defaultInstance { - return [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment defaultInstance]; +- (SSKProtoDataMessageQuoteQuotedAttachment*) defaultInstance { + return [SSKProtoDataMessageQuoteQuotedAttachment defaultInstance]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) build { +- (SSKProtoDataMessageQuoteQuotedAttachment*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) buildPartial { - OWSSignalServiceProtosDataMessageQuoteQuotedAttachment* returnMe = resultQuotedAttachment; +- (SSKProtoDataMessageQuoteQuotedAttachment*) buildPartial { + SSKProtoDataMessageQuoteQuotedAttachment* returnMe = resultQuotedAttachment; self.resultQuotedAttachment = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*) other { - if (other == [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment defaultInstance]) { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFrom:(SSKProtoDataMessageQuoteQuotedAttachment*) other { + if (other == [SSKProtoDataMessageQuoteQuotedAttachment defaultInstance]) { return self; } if (other.hasContentType) { @@ -3755,10 +3758,10 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -3782,7 +3785,7 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag break; } case 26: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; if (self.hasThumbnail) { [subBuilder mergeFrom:self.thumbnail]; } @@ -3803,12 +3806,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (NSString*) contentType { return resultQuotedAttachment.contentType; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setContentType:(NSString*) value { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setContentType:(NSString*) value { resultQuotedAttachment.hasContentType = YES; resultQuotedAttachment.contentType = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearContentType { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearContentType { resultQuotedAttachment.hasContentType = NO; resultQuotedAttachment.contentType = @""; return self; @@ -3819,12 +3822,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (NSString*) fileName { return resultQuotedAttachment.fileName; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setFileName:(NSString*) value { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setFileName:(NSString*) value { resultQuotedAttachment.hasFileName = YES; resultQuotedAttachment.fileName = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearFileName { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearFileName { resultQuotedAttachment.hasFileName = NO; resultQuotedAttachment.fileName = @""; return self; @@ -3832,31 +3835,31 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (BOOL) hasThumbnail { return resultQuotedAttachment.hasThumbnail; } -- (OWSSignalServiceProtosAttachmentPointer*) thumbnail { +- (SSKProtoAttachmentPointer*) thumbnail { return resultQuotedAttachment.thumbnail; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setThumbnail:(SSKProtoAttachmentPointer*) value { resultQuotedAttachment.hasThumbnail = YES; resultQuotedAttachment.thumbnail = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setThumbnailBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setThumbnailBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue { return [self setThumbnail:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) mergeThumbnail:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) mergeThumbnail:(SSKProtoAttachmentPointer*) value { if (resultQuotedAttachment.hasThumbnail && - resultQuotedAttachment.thumbnail != [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { + resultQuotedAttachment.thumbnail != [SSKProtoAttachmentPointer defaultInstance]) { resultQuotedAttachment.thumbnail = - [[[OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultQuotedAttachment.thumbnail] mergeFrom:value] buildPartial]; + [[[SSKProtoAttachmentPointer builderWithPrototype:resultQuotedAttachment.thumbnail] mergeFrom:value] buildPartial]; } else { resultQuotedAttachment.thumbnail = value; } resultQuotedAttachment.hasThumbnail = YES; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearThumbnail { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearThumbnail { resultQuotedAttachment.hasThumbnail = NO; - resultQuotedAttachment.thumbnail = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + resultQuotedAttachment.thumbnail = [SSKProtoAttachmentPointer defaultInstance]; return self; } - (BOOL) hasFlags { @@ -3865,54 +3868,54 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (UInt32) flags { return resultQuotedAttachment.flags; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) setFlags:(UInt32) value { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) setFlags:(UInt32) value { resultQuotedAttachment.hasFlags = YES; resultQuotedAttachment.flags = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder*) clearFlags { +- (SSKProtoDataMessageQuoteQuotedAttachmentBuilder*) clearFlags { resultQuotedAttachment.hasFlags = NO; resultQuotedAttachment.flags = 0; return self; } @end -@interface OWSSignalServiceProtosDataMessageQuoteBuilder() -@property (strong) OWSSignalServiceProtosDataMessageQuote* resultQuote; +@interface SSKProtoDataMessageQuoteBuilder() +@property (strong) SSKProtoDataMessageQuote* resultQuote; @end -@implementation OWSSignalServiceProtosDataMessageQuoteBuilder +@implementation SSKProtoDataMessageQuoteBuilder @synthesize resultQuote; - (instancetype) init { if ((self = [super init])) { - self.resultQuote = [[OWSSignalServiceProtosDataMessageQuote alloc] init]; + self.resultQuote = [[SSKProtoDataMessageQuote alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultQuote; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clear { - self.resultQuote = [[OWSSignalServiceProtosDataMessageQuote alloc] init]; +- (SSKProtoDataMessageQuoteBuilder*) clear { + self.resultQuote = [[SSKProtoDataMessageQuote alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clone { - return [OWSSignalServiceProtosDataMessageQuote builderWithPrototype:resultQuote]; +- (SSKProtoDataMessageQuoteBuilder*) clone { + return [SSKProtoDataMessageQuote builderWithPrototype:resultQuote]; } -- (OWSSignalServiceProtosDataMessageQuote*) defaultInstance { - return [OWSSignalServiceProtosDataMessageQuote defaultInstance]; +- (SSKProtoDataMessageQuote*) defaultInstance { + return [SSKProtoDataMessageQuote defaultInstance]; } -- (OWSSignalServiceProtosDataMessageQuote*) build { +- (SSKProtoDataMessageQuote*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageQuote*) buildPartial { - OWSSignalServiceProtosDataMessageQuote* returnMe = resultQuote; +- (SSKProtoDataMessageQuote*) buildPartial { + SSKProtoDataMessageQuote* returnMe = resultQuote; self.resultQuote = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageQuote*) other { - if (other == [OWSSignalServiceProtosDataMessageQuote defaultInstance]) { +- (SSKProtoDataMessageQuoteBuilder*) mergeFrom:(SSKProtoDataMessageQuote*) other { + if (other == [SSKProtoDataMessageQuote defaultInstance]) { return self; } if (other.hasId) { @@ -3934,10 +3937,10 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageQuoteBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -3965,7 +3968,7 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag break; } case 34: { - OWSSignalServiceProtosDataMessageQuoteQuotedAttachmentBuilder* subBuilder = [OWSSignalServiceProtosDataMessageQuoteQuotedAttachment builder]; + SSKProtoDataMessageQuoteQuotedAttachmentBuilder* subBuilder = [SSKProtoDataMessageQuoteQuotedAttachment builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addAttachments:[subBuilder buildPartial]]; break; @@ -3979,12 +3982,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (UInt64) id { return resultQuote.id; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setId:(UInt64) value { +- (SSKProtoDataMessageQuoteBuilder*) setId:(UInt64) value { resultQuote.hasId = YES; resultQuote.id = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearId { +- (SSKProtoDataMessageQuoteBuilder*) clearId { resultQuote.hasId = NO; resultQuote.id = 0L; return self; @@ -3995,12 +3998,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (NSString*) author { return resultQuote.author; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setAuthor:(NSString*) value { +- (SSKProtoDataMessageQuoteBuilder*) setAuthor:(NSString*) value { resultQuote.hasAuthor = YES; resultQuote.author = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearAuthor { +- (SSKProtoDataMessageQuoteBuilder*) clearAuthor { resultQuote.hasAuthor = NO; resultQuote.author = @""; return self; @@ -4011,49 +4014,49 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag - (NSString*) text { return resultQuote.text; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) setText:(NSString*) value { +- (SSKProtoDataMessageQuoteBuilder*) setText:(NSString*) value { resultQuote.hasText = YES; resultQuote.text = value; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder*) clearText { +- (SSKProtoDataMessageQuoteBuilder*) clearText { resultQuote.hasText = NO; resultQuote.text = @""; return self; } -- (NSMutableArray *)attachments { +- (NSMutableArray *)attachments { return resultQuote.attachmentsArray; } -- (OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageQuoteQuotedAttachment*)attachmentsAtIndex:(NSUInteger)index { return [resultQuote attachmentsAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)addAttachments:(OWSSignalServiceProtosDataMessageQuoteQuotedAttachment*)value { +- (SSKProtoDataMessageQuoteBuilder *)addAttachments:(SSKProtoDataMessageQuoteQuotedAttachment*)value { if (resultQuote.attachmentsArray == nil) { resultQuote.attachmentsArray = [[NSMutableArray alloc]init]; } [resultQuote.attachmentsArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)setAttachmentsArray:(NSArray *)array { +- (SSKProtoDataMessageQuoteBuilder *)setAttachmentsArray:(NSArray *)array { resultQuote.attachmentsArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageQuoteBuilder *)clearAttachments { +- (SSKProtoDataMessageQuoteBuilder *)clearAttachments { resultQuote.attachmentsArray = nil; return self; } @end -@interface OWSSignalServiceProtosDataMessageContact () -@property (strong) OWSSignalServiceProtosDataMessageContactName* name; -@property (strong) NSMutableArray * numberArray; -@property (strong) NSMutableArray * emailArray; -@property (strong) NSMutableArray * addressArray; -@property (strong) OWSSignalServiceProtosDataMessageContactAvatar* avatar; +@interface SSKProtoDataMessageContact () +@property (strong) SSKProtoDataMessageContactName* name; +@property (strong) NSMutableArray * numberArray; +@property (strong) NSMutableArray * emailArray; +@property (strong) NSMutableArray * addressArray; +@property (strong) SSKProtoDataMessageContactAvatar* avatar; @property (strong) NSString* organization; @end -@implementation OWSSignalServiceProtosDataMessageContact +@implementation SSKProtoDataMessageContact - (BOOL) hasName { return !!hasName_; @@ -4084,40 +4087,40 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageQuoteQuotedAttachmentFlag @synthesize organization; - (instancetype) init { if ((self = [super init])) { - self.name = [OWSSignalServiceProtosDataMessageContactName defaultInstance]; - self.avatar = [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance]; + self.name = [SSKProtoDataMessageContactName defaultInstance]; + self.avatar = [SSKProtoDataMessageContactAvatar defaultInstance]; self.organization = @""; } return self; } -static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDataMessageContactInstance = nil; +static SSKProtoDataMessageContact* defaultSSKProtoDataMessageContactInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContact class]) { - defaultOWSSignalServiceProtosDataMessageContactInstance = [[OWSSignalServiceProtosDataMessageContact alloc] init]; + if (self == [SSKProtoDataMessageContact class]) { + defaultSSKProtoDataMessageContactInstance = [[SSKProtoDataMessageContact alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactInstance; + return defaultSSKProtoDataMessageContactInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactInstance; + return defaultSSKProtoDataMessageContactInstance; } -- (NSArray *)number { +- (NSArray *)number { return numberArray; } -- (OWSSignalServiceProtosDataMessageContactPhone*)numberAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactPhone*)numberAtIndex:(NSUInteger)index { return [numberArray objectAtIndex:index]; } -- (NSArray *)email { +- (NSArray *)email { return emailArray; } -- (OWSSignalServiceProtosDataMessageContactEmail*)emailAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactEmail*)emailAtIndex:(NSUInteger)index { return [emailArray objectAtIndex:index]; } -- (NSArray *)address { +- (NSArray *)address { return addressArray; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index { return [addressArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -4127,13 +4130,13 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa if (self.hasName) { [output writeMessage:1 value:self.name]; } - [self.numberArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { + [self.numberArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { [output writeMessage:3 value:element]; }]; - [self.emailArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { + [self.emailArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { [output writeMessage:4 value:element]; }]; - [self.addressArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { + [self.addressArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { [output writeMessage:5 value:element]; }]; if (self.hasAvatar) { @@ -4154,13 +4157,13 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa if (self.hasName) { size_ += computeMessageSize(1, self.name); } - [self.numberArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { + [self.numberArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(3, element); }]; - [self.emailArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { + [self.emailArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(4, element); }]; - [self.addressArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { + [self.addressArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(5, element); }]; if (self.hasAvatar) { @@ -4173,35 +4176,35 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContact*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContact*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContact*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContact*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContact*)[[[OWSSignalServiceProtosDataMessageContact builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContact*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContact*)[[[SSKProtoDataMessageContact builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactBuilder alloc] init]; ++ (SSKProtoDataMessageContactBuilder*) builder { + return [[SSKProtoDataMessageContactBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContact*) prototype { - return [[OWSSignalServiceProtosDataMessageContact builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactBuilder*) builderWithPrototype:(SSKProtoDataMessageContact*) prototype { + return [[SSKProtoDataMessageContact builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContact builder]; +- (SSKProtoDataMessageContactBuilder*) builder { + return [SSKProtoDataMessageContact builder]; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContact builderWithPrototype:self]; +- (SSKProtoDataMessageContactBuilder*) toBuilder { + return [SSKProtoDataMessageContact builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasName) { @@ -4210,19 +4213,19 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } - [self.numberArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { + [self.numberArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"number"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; }]; - [self.emailArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { + [self.emailArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"email"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; }]; - [self.addressArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { + [self.addressArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"address"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -4245,17 +4248,17 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa [self.name storeInDictionary:messageDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"name"]; } - for (OWSSignalServiceProtosDataMessageContactPhone* element in self.numberArray) { + for (SSKProtoDataMessageContactPhone* element in self.numberArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"number"]; } - for (OWSSignalServiceProtosDataMessageContactEmail* element in self.emailArray) { + for (SSKProtoDataMessageContactEmail* element in self.emailArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"email"]; } - for (OWSSignalServiceProtosDataMessageContactPostalAddress* element in self.addressArray) { + for (SSKProtoDataMessageContactPostalAddress* element in self.addressArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"address"]; @@ -4274,10 +4277,10 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContact class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContact class]]) { return NO; } - OWSSignalServiceProtosDataMessageContact *otherMessage = other; + SSKProtoDataMessageContact *otherMessage = other; return self.hasName == otherMessage.hasName && (!self.hasName || [self.name isEqual:otherMessage.name]) && @@ -4295,13 +4298,13 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa if (self.hasName) { hashCode = hashCode * 31 + [self.name hash]; } - [self.numberArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { + [self.numberArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPhone *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; - [self.emailArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { + [self.emailArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactEmail *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; - [self.addressArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { + [self.addressArray enumerateObjectsUsingBlock:^(SSKProtoDataMessageContactPostalAddress *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; if (self.hasAvatar) { @@ -4315,7 +4318,7 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa } @end -@interface OWSSignalServiceProtosDataMessageContactName () +@interface SSKProtoDataMessageContactName () @property (strong) NSString* givenName; @property (strong) NSString* familyName; @property (strong) NSString* prefix; @@ -4324,7 +4327,7 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa @property (strong) NSString* displayName; @end -@implementation OWSSignalServiceProtosDataMessageContactName +@implementation SSKProtoDataMessageContactName - (BOOL) hasGivenName { return !!hasGivenName_; @@ -4379,17 +4382,17 @@ static OWSSignalServiceProtosDataMessageContact* defaultOWSSignalServiceProtosDa } return self; } -static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProtosDataMessageContactNameInstance = nil; +static SSKProtoDataMessageContactName* defaultSSKProtoDataMessageContactNameInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContactName class]) { - defaultOWSSignalServiceProtosDataMessageContactNameInstance = [[OWSSignalServiceProtosDataMessageContactName alloc] init]; + if (self == [SSKProtoDataMessageContactName class]) { + defaultSSKProtoDataMessageContactNameInstance = [[SSKProtoDataMessageContactName alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactNameInstance; + return defaultSSKProtoDataMessageContactNameInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactNameInstance; + return defaultSSKProtoDataMessageContactNameInstance; } - (BOOL) isInitialized { return YES; @@ -4444,35 +4447,35 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContactName*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactName*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContactName*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactName*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactName*)[[[OWSSignalServiceProtosDataMessageContactName builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactName*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactName*)[[[SSKProtoDataMessageContactName builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactNameBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactNameBuilder alloc] init]; ++ (SSKProtoDataMessageContactNameBuilder*) builder { + return [[SSKProtoDataMessageContactNameBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactNameBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactName*) prototype { - return [[OWSSignalServiceProtosDataMessageContactName builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactNameBuilder*) builderWithPrototype:(SSKProtoDataMessageContactName*) prototype { + return [[SSKProtoDataMessageContactName builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContactName builder]; +- (SSKProtoDataMessageContactNameBuilder*) builder { + return [SSKProtoDataMessageContactName builder]; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContactName builderWithPrototype:self]; +- (SSKProtoDataMessageContactNameBuilder*) toBuilder { + return [SSKProtoDataMessageContactName builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasGivenName) { @@ -4520,10 +4523,10 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContactName class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContactName class]]) { return NO; } - OWSSignalServiceProtosDataMessageContactName *otherMessage = other; + SSKProtoDataMessageContactName *otherMessage = other; return self.hasGivenName == otherMessage.hasGivenName && (!self.hasGivenName || [self.givenName isEqual:otherMessage.givenName]) && @@ -4564,42 +4567,42 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt } @end -@interface OWSSignalServiceProtosDataMessageContactNameBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContactName* resultName; +@interface SSKProtoDataMessageContactNameBuilder() +@property (strong) SSKProtoDataMessageContactName* resultName; @end -@implementation OWSSignalServiceProtosDataMessageContactNameBuilder +@implementation SSKProtoDataMessageContactNameBuilder @synthesize resultName; - (instancetype) init { if ((self = [super init])) { - self.resultName = [[OWSSignalServiceProtosDataMessageContactName alloc] init]; + self.resultName = [[SSKProtoDataMessageContactName alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultName; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clear { - self.resultName = [[OWSSignalServiceProtosDataMessageContactName alloc] init]; +- (SSKProtoDataMessageContactNameBuilder*) clear { + self.resultName = [[SSKProtoDataMessageContactName alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContactName builderWithPrototype:resultName]; +- (SSKProtoDataMessageContactNameBuilder*) clone { + return [SSKProtoDataMessageContactName builderWithPrototype:resultName]; } -- (OWSSignalServiceProtosDataMessageContactName*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContactName defaultInstance]; +- (SSKProtoDataMessageContactName*) defaultInstance { + return [SSKProtoDataMessageContactName defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContactName*) build { +- (SSKProtoDataMessageContactName*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContactName*) buildPartial { - OWSSignalServiceProtosDataMessageContactName* returnMe = resultName; +- (SSKProtoDataMessageContactName*) buildPartial { + SSKProtoDataMessageContactName* returnMe = resultName; self.resultName = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactName*) other { - if (other == [OWSSignalServiceProtosDataMessageContactName defaultInstance]) { +- (SSKProtoDataMessageContactNameBuilder*) mergeFrom:(SSKProtoDataMessageContactName*) other { + if (other == [SSKProtoDataMessageContactName defaultInstance]) { return self; } if (other.hasGivenName) { @@ -4623,10 +4626,10 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactNameBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -4674,12 +4677,12 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) givenName { return resultName.givenName; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setGivenName:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setGivenName:(NSString*) value { resultName.hasGivenName = YES; resultName.givenName = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearGivenName { +- (SSKProtoDataMessageContactNameBuilder*) clearGivenName { resultName.hasGivenName = NO; resultName.givenName = @""; return self; @@ -4690,12 +4693,12 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) familyName { return resultName.familyName; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setFamilyName:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setFamilyName:(NSString*) value { resultName.hasFamilyName = YES; resultName.familyName = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearFamilyName { +- (SSKProtoDataMessageContactNameBuilder*) clearFamilyName { resultName.hasFamilyName = NO; resultName.familyName = @""; return self; @@ -4706,12 +4709,12 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) prefix { return resultName.prefix; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setPrefix:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setPrefix:(NSString*) value { resultName.hasPrefix = YES; resultName.prefix = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearPrefix { +- (SSKProtoDataMessageContactNameBuilder*) clearPrefix { resultName.hasPrefix = NO; resultName.prefix = @""; return self; @@ -4722,12 +4725,12 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) suffix { return resultName.suffix; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setSuffix:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setSuffix:(NSString*) value { resultName.hasSuffix = YES; resultName.suffix = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearSuffix { +- (SSKProtoDataMessageContactNameBuilder*) clearSuffix { resultName.hasSuffix = NO; resultName.suffix = @""; return self; @@ -4738,12 +4741,12 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) middleName { return resultName.middleName; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setMiddleName:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setMiddleName:(NSString*) value { resultName.hasMiddleName = YES; resultName.middleName = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearMiddleName { +- (SSKProtoDataMessageContactNameBuilder*) clearMiddleName { resultName.hasMiddleName = NO; resultName.middleName = @""; return self; @@ -4754,25 +4757,25 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (NSString*) displayName { return resultName.displayName; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) setDisplayName:(NSString*) value { +- (SSKProtoDataMessageContactNameBuilder*) setDisplayName:(NSString*) value { resultName.hasDisplayName = YES; resultName.displayName = value; return self; } -- (OWSSignalServiceProtosDataMessageContactNameBuilder*) clearDisplayName { +- (SSKProtoDataMessageContactNameBuilder*) clearDisplayName { resultName.hasDisplayName = NO; resultName.displayName = @""; return self; } @end -@interface OWSSignalServiceProtosDataMessageContactPhone () +@interface SSKProtoDataMessageContactPhone () @property (strong) NSString* value; -@property OWSSignalServiceProtosDataMessageContactPhoneType type; +@property SSKProtoDataMessageContactPhoneType type; @property (strong) NSString* label; @end -@implementation OWSSignalServiceProtosDataMessageContactPhone +@implementation SSKProtoDataMessageContactPhone - (BOOL) hasValue { return !!hasValue_; @@ -4798,22 +4801,22 @@ static OWSSignalServiceProtosDataMessageContactName* defaultOWSSignalServiceProt - (instancetype) init { if ((self = [super init])) { self.value = @""; - self.type = OWSSignalServiceProtosDataMessageContactPhoneTypeHome; + self.type = SSKProtoDataMessageContactPhoneTypeHome; self.label = @""; } return self; } -static OWSSignalServiceProtosDataMessageContactPhone* defaultOWSSignalServiceProtosDataMessageContactPhoneInstance = nil; +static SSKProtoDataMessageContactPhone* defaultSSKProtoDataMessageContactPhoneInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContactPhone class]) { - defaultOWSSignalServiceProtosDataMessageContactPhoneInstance = [[OWSSignalServiceProtosDataMessageContactPhone alloc] init]; + if (self == [SSKProtoDataMessageContactPhone class]) { + defaultSSKProtoDataMessageContactPhoneInstance = [[SSKProtoDataMessageContactPhone alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactPhoneInstance; + return defaultSSKProtoDataMessageContactPhoneInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactPhoneInstance; + return defaultSSKProtoDataMessageContactPhoneInstance; } - (BOOL) isInitialized { return YES; @@ -4850,42 +4853,42 @@ static OWSSignalServiceProtosDataMessageContactPhone* defaultOWSSignalServicePro memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPhone*)[[[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPhone*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPhone*)[[[SSKProtoDataMessageContactPhone builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactPhoneBuilder alloc] init]; ++ (SSKProtoDataMessageContactPhoneBuilder*) builder { + return [[SSKProtoDataMessageContactPhoneBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactPhone*) prototype { - return [[OWSSignalServiceProtosDataMessageContactPhone builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactPhoneBuilder*) builderWithPrototype:(SSKProtoDataMessageContactPhone*) prototype { + return [[SSKProtoDataMessageContactPhone builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContactPhone builder]; +- (SSKProtoDataMessageContactPhoneBuilder*) builder { + return [SSKProtoDataMessageContactPhone builder]; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContactPhone builderWithPrototype:self]; +- (SSKProtoDataMessageContactPhoneBuilder*) toBuilder { + return [SSKProtoDataMessageContactPhone builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasValue) { [output appendFormat:@"%@%@: %@\n", indent, @"value", self.value]; } if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoDataMessageContactPhoneType(self.type)]; } if (self.hasLabel) { [output appendFormat:@"%@%@: %@\n", indent, @"label", self.label]; @@ -4908,10 +4911,10 @@ static OWSSignalServiceProtosDataMessageContactPhone* defaultOWSSignalServicePro if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContactPhone class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContactPhone class]]) { return NO; } - OWSSignalServiceProtosDataMessageContactPhone *otherMessage = other; + SSKProtoDataMessageContactPhone *otherMessage = other; return self.hasValue == otherMessage.hasValue && (!self.hasValue || [self.value isEqual:otherMessage.value]) && @@ -4937,68 +4940,68 @@ static OWSSignalServiceProtosDataMessageContactPhone* defaultOWSSignalServicePro } @end -BOOL OWSSignalServiceProtosDataMessageContactPhoneTypeIsValidValue(OWSSignalServiceProtosDataMessageContactPhoneType value) { +BOOL SSKProtoDataMessageContactPhoneTypeIsValidValue(SSKProtoDataMessageContactPhoneType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactPhoneTypeHome: - case OWSSignalServiceProtosDataMessageContactPhoneTypeMobile: - case OWSSignalServiceProtosDataMessageContactPhoneTypeWork: - case OWSSignalServiceProtosDataMessageContactPhoneTypeCustom: + case SSKProtoDataMessageContactPhoneTypeHome: + case SSKProtoDataMessageContactPhoneTypeMobile: + case SSKProtoDataMessageContactPhoneTypeWork: + case SSKProtoDataMessageContactPhoneTypeCustom: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSignalServiceProtosDataMessageContactPhoneType value) { +NSString *NSStringFromSSKProtoDataMessageContactPhoneType(SSKProtoDataMessageContactPhoneType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactPhoneTypeHome: - return @"OWSSignalServiceProtosDataMessageContactPhoneTypeHome"; - case OWSSignalServiceProtosDataMessageContactPhoneTypeMobile: - return @"OWSSignalServiceProtosDataMessageContactPhoneTypeMobile"; - case OWSSignalServiceProtosDataMessageContactPhoneTypeWork: - return @"OWSSignalServiceProtosDataMessageContactPhoneTypeWork"; - case OWSSignalServiceProtosDataMessageContactPhoneTypeCustom: - return @"OWSSignalServiceProtosDataMessageContactPhoneTypeCustom"; + case SSKProtoDataMessageContactPhoneTypeHome: + return @"SSKProtoDataMessageContactPhoneTypeHome"; + case SSKProtoDataMessageContactPhoneTypeMobile: + return @"SSKProtoDataMessageContactPhoneTypeMobile"; + case SSKProtoDataMessageContactPhoneTypeWork: + return @"SSKProtoDataMessageContactPhoneTypeWork"; + case SSKProtoDataMessageContactPhoneTypeCustom: + return @"SSKProtoDataMessageContactPhoneTypeCustom"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageContactPhoneBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContactPhone* resultPhone; +@interface SSKProtoDataMessageContactPhoneBuilder() +@property (strong) SSKProtoDataMessageContactPhone* resultPhone; @end -@implementation OWSSignalServiceProtosDataMessageContactPhoneBuilder +@implementation SSKProtoDataMessageContactPhoneBuilder @synthesize resultPhone; - (instancetype) init { if ((self = [super init])) { - self.resultPhone = [[OWSSignalServiceProtosDataMessageContactPhone alloc] init]; + self.resultPhone = [[SSKProtoDataMessageContactPhone alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultPhone; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clear { - self.resultPhone = [[OWSSignalServiceProtosDataMessageContactPhone alloc] init]; +- (SSKProtoDataMessageContactPhoneBuilder*) clear { + self.resultPhone = [[SSKProtoDataMessageContactPhone alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContactPhone builderWithPrototype:resultPhone]; +- (SSKProtoDataMessageContactPhoneBuilder*) clone { + return [SSKProtoDataMessageContactPhone builderWithPrototype:resultPhone]; } -- (OWSSignalServiceProtosDataMessageContactPhone*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContactPhone defaultInstance]; +- (SSKProtoDataMessageContactPhone*) defaultInstance { + return [SSKProtoDataMessageContactPhone defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContactPhone*) build { +- (SSKProtoDataMessageContactPhone*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContactPhone*) buildPartial { - OWSSignalServiceProtosDataMessageContactPhone* returnMe = resultPhone; +- (SSKProtoDataMessageContactPhone*) buildPartial { + SSKProtoDataMessageContactPhone* returnMe = resultPhone; self.resultPhone = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactPhone*) other { - if (other == [OWSSignalServiceProtosDataMessageContactPhone defaultInstance]) { +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFrom:(SSKProtoDataMessageContactPhone*) other { + if (other == [SSKProtoDataMessageContactPhone defaultInstance]) { return self; } if (other.hasValue) { @@ -5013,10 +5016,10 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactPhoneBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -5036,8 +5039,8 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna break; } case 16: { - OWSSignalServiceProtosDataMessageContactPhoneType value = (OWSSignalServiceProtosDataMessageContactPhoneType)[input readEnum]; - if (OWSSignalServiceProtosDataMessageContactPhoneTypeIsValidValue(value)) { + SSKProtoDataMessageContactPhoneType value = (SSKProtoDataMessageContactPhoneType)[input readEnum]; + if (SSKProtoDataMessageContactPhoneTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:2 value:value]; @@ -5057,12 +5060,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna - (NSString*) value { return resultPhone.value; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setValue:(NSString*) value { +- (SSKProtoDataMessageContactPhoneBuilder*) setValue:(NSString*) value { resultPhone.hasValue = YES; resultPhone.value = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearValue { +- (SSKProtoDataMessageContactPhoneBuilder*) clearValue { resultPhone.hasValue = NO; resultPhone.value = @""; return self; @@ -5070,17 +5073,17 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna - (BOOL) hasType { return resultPhone.hasType; } -- (OWSSignalServiceProtosDataMessageContactPhoneType) type { +- (SSKProtoDataMessageContactPhoneType) type { return resultPhone.type; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setType:(OWSSignalServiceProtosDataMessageContactPhoneType) value { +- (SSKProtoDataMessageContactPhoneBuilder*) setType:(SSKProtoDataMessageContactPhoneType) value { resultPhone.hasType = YES; resultPhone.type = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearType { +- (SSKProtoDataMessageContactPhoneBuilder*) clearType { resultPhone.hasType = NO; - resultPhone.type = OWSSignalServiceProtosDataMessageContactPhoneTypeHome; + resultPhone.type = SSKProtoDataMessageContactPhoneTypeHome; return self; } - (BOOL) hasLabel { @@ -5089,25 +5092,25 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna - (NSString*) label { return resultPhone.label; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) setLabel:(NSString*) value { +- (SSKProtoDataMessageContactPhoneBuilder*) setLabel:(NSString*) value { resultPhone.hasLabel = YES; resultPhone.label = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPhoneBuilder*) clearLabel { +- (SSKProtoDataMessageContactPhoneBuilder*) clearLabel { resultPhone.hasLabel = NO; resultPhone.label = @""; return self; } @end -@interface OWSSignalServiceProtosDataMessageContactEmail () +@interface SSKProtoDataMessageContactEmail () @property (strong) NSString* value; -@property OWSSignalServiceProtosDataMessageContactEmailType type; +@property SSKProtoDataMessageContactEmailType type; @property (strong) NSString* label; @end -@implementation OWSSignalServiceProtosDataMessageContactEmail +@implementation SSKProtoDataMessageContactEmail - (BOOL) hasValue { return !!hasValue_; @@ -5133,22 +5136,22 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPhoneType(OWSSigna - (instancetype) init { if ((self = [super init])) { self.value = @""; - self.type = OWSSignalServiceProtosDataMessageContactEmailTypeHome; + self.type = SSKProtoDataMessageContactEmailTypeHome; self.label = @""; } return self; } -static OWSSignalServiceProtosDataMessageContactEmail* defaultOWSSignalServiceProtosDataMessageContactEmailInstance = nil; +static SSKProtoDataMessageContactEmail* defaultSSKProtoDataMessageContactEmailInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContactEmail class]) { - defaultOWSSignalServiceProtosDataMessageContactEmailInstance = [[OWSSignalServiceProtosDataMessageContactEmail alloc] init]; + if (self == [SSKProtoDataMessageContactEmail class]) { + defaultSSKProtoDataMessageContactEmailInstance = [[SSKProtoDataMessageContactEmail alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactEmailInstance; + return defaultSSKProtoDataMessageContactEmailInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactEmailInstance; + return defaultSSKProtoDataMessageContactEmailInstance; } - (BOOL) isInitialized { return YES; @@ -5185,42 +5188,42 @@ static OWSSignalServiceProtosDataMessageContactEmail* defaultOWSSignalServicePro memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactEmail*)[[[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactEmail*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactEmail*)[[[SSKProtoDataMessageContactEmail builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactEmailBuilder alloc] init]; ++ (SSKProtoDataMessageContactEmailBuilder*) builder { + return [[SSKProtoDataMessageContactEmailBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactEmail*) prototype { - return [[OWSSignalServiceProtosDataMessageContactEmail builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactEmailBuilder*) builderWithPrototype:(SSKProtoDataMessageContactEmail*) prototype { + return [[SSKProtoDataMessageContactEmail builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContactEmail builder]; +- (SSKProtoDataMessageContactEmailBuilder*) builder { + return [SSKProtoDataMessageContactEmail builder]; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContactEmail builderWithPrototype:self]; +- (SSKProtoDataMessageContactEmailBuilder*) toBuilder { + return [SSKProtoDataMessageContactEmail builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasValue) { [output appendFormat:@"%@%@: %@\n", indent, @"value", self.value]; } if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoDataMessageContactEmailType(self.type)]; } if (self.hasLabel) { [output appendFormat:@"%@%@: %@\n", indent, @"label", self.label]; @@ -5243,10 +5246,10 @@ static OWSSignalServiceProtosDataMessageContactEmail* defaultOWSSignalServicePro if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContactEmail class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContactEmail class]]) { return NO; } - OWSSignalServiceProtosDataMessageContactEmail *otherMessage = other; + SSKProtoDataMessageContactEmail *otherMessage = other; return self.hasValue == otherMessage.hasValue && (!self.hasValue || [self.value isEqual:otherMessage.value]) && @@ -5272,68 +5275,68 @@ static OWSSignalServiceProtosDataMessageContactEmail* defaultOWSSignalServicePro } @end -BOOL OWSSignalServiceProtosDataMessageContactEmailTypeIsValidValue(OWSSignalServiceProtosDataMessageContactEmailType value) { +BOOL SSKProtoDataMessageContactEmailTypeIsValidValue(SSKProtoDataMessageContactEmailType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactEmailTypeHome: - case OWSSignalServiceProtosDataMessageContactEmailTypeMobile: - case OWSSignalServiceProtosDataMessageContactEmailTypeWork: - case OWSSignalServiceProtosDataMessageContactEmailTypeCustom: + case SSKProtoDataMessageContactEmailTypeHome: + case SSKProtoDataMessageContactEmailTypeMobile: + case SSKProtoDataMessageContactEmailTypeWork: + case SSKProtoDataMessageContactEmailTypeCustom: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSignalServiceProtosDataMessageContactEmailType value) { +NSString *NSStringFromSSKProtoDataMessageContactEmailType(SSKProtoDataMessageContactEmailType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactEmailTypeHome: - return @"OWSSignalServiceProtosDataMessageContactEmailTypeHome"; - case OWSSignalServiceProtosDataMessageContactEmailTypeMobile: - return @"OWSSignalServiceProtosDataMessageContactEmailTypeMobile"; - case OWSSignalServiceProtosDataMessageContactEmailTypeWork: - return @"OWSSignalServiceProtosDataMessageContactEmailTypeWork"; - case OWSSignalServiceProtosDataMessageContactEmailTypeCustom: - return @"OWSSignalServiceProtosDataMessageContactEmailTypeCustom"; + case SSKProtoDataMessageContactEmailTypeHome: + return @"SSKProtoDataMessageContactEmailTypeHome"; + case SSKProtoDataMessageContactEmailTypeMobile: + return @"SSKProtoDataMessageContactEmailTypeMobile"; + case SSKProtoDataMessageContactEmailTypeWork: + return @"SSKProtoDataMessageContactEmailTypeWork"; + case SSKProtoDataMessageContactEmailTypeCustom: + return @"SSKProtoDataMessageContactEmailTypeCustom"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageContactEmailBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContactEmail* resultEmail; +@interface SSKProtoDataMessageContactEmailBuilder() +@property (strong) SSKProtoDataMessageContactEmail* resultEmail; @end -@implementation OWSSignalServiceProtosDataMessageContactEmailBuilder +@implementation SSKProtoDataMessageContactEmailBuilder @synthesize resultEmail; - (instancetype) init { if ((self = [super init])) { - self.resultEmail = [[OWSSignalServiceProtosDataMessageContactEmail alloc] init]; + self.resultEmail = [[SSKProtoDataMessageContactEmail alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultEmail; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clear { - self.resultEmail = [[OWSSignalServiceProtosDataMessageContactEmail alloc] init]; +- (SSKProtoDataMessageContactEmailBuilder*) clear { + self.resultEmail = [[SSKProtoDataMessageContactEmail alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContactEmail builderWithPrototype:resultEmail]; +- (SSKProtoDataMessageContactEmailBuilder*) clone { + return [SSKProtoDataMessageContactEmail builderWithPrototype:resultEmail]; } -- (OWSSignalServiceProtosDataMessageContactEmail*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContactEmail defaultInstance]; +- (SSKProtoDataMessageContactEmail*) defaultInstance { + return [SSKProtoDataMessageContactEmail defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContactEmail*) build { +- (SSKProtoDataMessageContactEmail*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContactEmail*) buildPartial { - OWSSignalServiceProtosDataMessageContactEmail* returnMe = resultEmail; +- (SSKProtoDataMessageContactEmail*) buildPartial { + SSKProtoDataMessageContactEmail* returnMe = resultEmail; self.resultEmail = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactEmail*) other { - if (other == [OWSSignalServiceProtosDataMessageContactEmail defaultInstance]) { +- (SSKProtoDataMessageContactEmailBuilder*) mergeFrom:(SSKProtoDataMessageContactEmail*) other { + if (other == [SSKProtoDataMessageContactEmail defaultInstance]) { return self; } if (other.hasValue) { @@ -5348,10 +5351,10 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactEmailBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -5371,8 +5374,8 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna break; } case 16: { - OWSSignalServiceProtosDataMessageContactEmailType value = (OWSSignalServiceProtosDataMessageContactEmailType)[input readEnum]; - if (OWSSignalServiceProtosDataMessageContactEmailTypeIsValidValue(value)) { + SSKProtoDataMessageContactEmailType value = (SSKProtoDataMessageContactEmailType)[input readEnum]; + if (SSKProtoDataMessageContactEmailTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:2 value:value]; @@ -5392,12 +5395,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna - (NSString*) value { return resultEmail.value; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setValue:(NSString*) value { +- (SSKProtoDataMessageContactEmailBuilder*) setValue:(NSString*) value { resultEmail.hasValue = YES; resultEmail.value = value; return self; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearValue { +- (SSKProtoDataMessageContactEmailBuilder*) clearValue { resultEmail.hasValue = NO; resultEmail.value = @""; return self; @@ -5405,17 +5408,17 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna - (BOOL) hasType { return resultEmail.hasType; } -- (OWSSignalServiceProtosDataMessageContactEmailType) type { +- (SSKProtoDataMessageContactEmailType) type { return resultEmail.type; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setType:(OWSSignalServiceProtosDataMessageContactEmailType) value { +- (SSKProtoDataMessageContactEmailBuilder*) setType:(SSKProtoDataMessageContactEmailType) value { resultEmail.hasType = YES; resultEmail.type = value; return self; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearType { +- (SSKProtoDataMessageContactEmailBuilder*) clearType { resultEmail.hasType = NO; - resultEmail.type = OWSSignalServiceProtosDataMessageContactEmailTypeHome; + resultEmail.type = SSKProtoDataMessageContactEmailTypeHome; return self; } - (BOOL) hasLabel { @@ -5424,20 +5427,20 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna - (NSString*) label { return resultEmail.label; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) setLabel:(NSString*) value { +- (SSKProtoDataMessageContactEmailBuilder*) setLabel:(NSString*) value { resultEmail.hasLabel = YES; resultEmail.label = value; return self; } -- (OWSSignalServiceProtosDataMessageContactEmailBuilder*) clearLabel { +- (SSKProtoDataMessageContactEmailBuilder*) clearLabel { resultEmail.hasLabel = NO; resultEmail.label = @""; return self; } @end -@interface OWSSignalServiceProtosDataMessageContactPostalAddress () -@property OWSSignalServiceProtosDataMessageContactPostalAddressType type; +@interface SSKProtoDataMessageContactPostalAddress () +@property SSKProtoDataMessageContactPostalAddressType type; @property (strong) NSString* label; @property (strong) NSString* street; @property (strong) NSString* pobox; @@ -5448,7 +5451,7 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna @property (strong) NSString* country; @end -@implementation OWSSignalServiceProtosDataMessageContactPostalAddress +@implementation SSKProtoDataMessageContactPostalAddress - (BOOL) hasType { return !!hasType_; @@ -5515,7 +5518,7 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna @synthesize country; - (instancetype) init { if ((self = [super init])) { - self.type = OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome; + self.type = SSKProtoDataMessageContactPostalAddressTypeHome; self.label = @""; self.street = @""; self.pobox = @""; @@ -5527,17 +5530,17 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactEmailType(OWSSigna } return self; } -static OWSSignalServiceProtosDataMessageContactPostalAddress* defaultOWSSignalServiceProtosDataMessageContactPostalAddressInstance = nil; +static SSKProtoDataMessageContactPostalAddress* defaultSSKProtoDataMessageContactPostalAddressInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContactPostalAddress class]) { - defaultOWSSignalServiceProtosDataMessageContactPostalAddressInstance = [[OWSSignalServiceProtosDataMessageContactPostalAddress alloc] init]; + if (self == [SSKProtoDataMessageContactPostalAddress class]) { + defaultSSKProtoDataMessageContactPostalAddressInstance = [[SSKProtoDataMessageContactPostalAddress alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactPostalAddressInstance; + return defaultSSKProtoDataMessageContactPostalAddressInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactPostalAddressInstance; + return defaultSSKProtoDataMessageContactPostalAddressInstance; } - (BOOL) isInitialized { return YES; @@ -5610,39 +5613,39 @@ static OWSSignalServiceProtosDataMessageContactPostalAddress* defaultOWSSignalSe memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactPostalAddress*)[[[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactPostalAddress*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactPostalAddress*)[[[SSKProtoDataMessageContactPostalAddress builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactPostalAddressBuilder alloc] init]; ++ (SSKProtoDataMessageContactPostalAddressBuilder*) builder { + return [[SSKProtoDataMessageContactPostalAddressBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactPostalAddress*) prototype { - return [[OWSSignalServiceProtosDataMessageContactPostalAddress builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactPostalAddressBuilder*) builderWithPrototype:(SSKProtoDataMessageContactPostalAddress*) prototype { + return [[SSKProtoDataMessageContactPostalAddress builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContactPostalAddress builder]; +- (SSKProtoDataMessageContactPostalAddressBuilder*) builder { + return [SSKProtoDataMessageContactPostalAddress builder]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContactPostalAddress builderWithPrototype:self]; +- (SSKProtoDataMessageContactPostalAddressBuilder*) toBuilder { + return [SSKProtoDataMessageContactPostalAddress builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoDataMessageContactPostalAddressType(self.type)]; } if (self.hasLabel) { [output appendFormat:@"%@%@: %@\n", indent, @"label", self.label]; @@ -5704,10 +5707,10 @@ static OWSSignalServiceProtosDataMessageContactPostalAddress* defaultOWSSignalSe if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContactPostalAddress class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContactPostalAddress class]]) { return NO; } - OWSSignalServiceProtosDataMessageContactPostalAddress *otherMessage = other; + SSKProtoDataMessageContactPostalAddress *otherMessage = other; return self.hasType == otherMessage.hasType && (!self.hasType || self.type == otherMessage.type) && @@ -5763,65 +5766,65 @@ static OWSSignalServiceProtosDataMessageContactPostalAddress* defaultOWSSignalSe } @end -BOOL OWSSignalServiceProtosDataMessageContactPostalAddressTypeIsValidValue(OWSSignalServiceProtosDataMessageContactPostalAddressType value) { +BOOL SSKProtoDataMessageContactPostalAddressTypeIsValidValue(SSKProtoDataMessageContactPostalAddressType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome: - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeWork: - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeCustom: + case SSKProtoDataMessageContactPostalAddressTypeHome: + case SSKProtoDataMessageContactPostalAddressTypeWork: + case SSKProtoDataMessageContactPostalAddressTypeCustom: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType(OWSSignalServiceProtosDataMessageContactPostalAddressType value) { +NSString *NSStringFromSSKProtoDataMessageContactPostalAddressType(SSKProtoDataMessageContactPostalAddressType value) { switch (value) { - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome: - return @"OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome"; - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeWork: - return @"OWSSignalServiceProtosDataMessageContactPostalAddressTypeWork"; - case OWSSignalServiceProtosDataMessageContactPostalAddressTypeCustom: - return @"OWSSignalServiceProtosDataMessageContactPostalAddressTypeCustom"; + case SSKProtoDataMessageContactPostalAddressTypeHome: + return @"SSKProtoDataMessageContactPostalAddressTypeHome"; + case SSKProtoDataMessageContactPostalAddressTypeWork: + return @"SSKProtoDataMessageContactPostalAddressTypeWork"; + case SSKProtoDataMessageContactPostalAddressTypeCustom: + return @"SSKProtoDataMessageContactPostalAddressTypeCustom"; default: return nil; } } -@interface OWSSignalServiceProtosDataMessageContactPostalAddressBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContactPostalAddress* resultPostalAddress; +@interface SSKProtoDataMessageContactPostalAddressBuilder() +@property (strong) SSKProtoDataMessageContactPostalAddress* resultPostalAddress; @end -@implementation OWSSignalServiceProtosDataMessageContactPostalAddressBuilder +@implementation SSKProtoDataMessageContactPostalAddressBuilder @synthesize resultPostalAddress; - (instancetype) init { if ((self = [super init])) { - self.resultPostalAddress = [[OWSSignalServiceProtosDataMessageContactPostalAddress alloc] init]; + self.resultPostalAddress = [[SSKProtoDataMessageContactPostalAddress alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultPostalAddress; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clear { - self.resultPostalAddress = [[OWSSignalServiceProtosDataMessageContactPostalAddress alloc] init]; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clear { + self.resultPostalAddress = [[SSKProtoDataMessageContactPostalAddress alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContactPostalAddress builderWithPrototype:resultPostalAddress]; +- (SSKProtoDataMessageContactPostalAddressBuilder*) clone { + return [SSKProtoDataMessageContactPostalAddress builderWithPrototype:resultPostalAddress]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContactPostalAddress defaultInstance]; +- (SSKProtoDataMessageContactPostalAddress*) defaultInstance { + return [SSKProtoDataMessageContactPostalAddress defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) build { +- (SSKProtoDataMessageContactPostalAddress*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*) buildPartial { - OWSSignalServiceProtosDataMessageContactPostalAddress* returnMe = resultPostalAddress; +- (SSKProtoDataMessageContactPostalAddress*) buildPartial { + SSKProtoDataMessageContactPostalAddress* returnMe = resultPostalAddress; self.resultPostalAddress = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactPostalAddress*) other { - if (other == [OWSSignalServiceProtosDataMessageContactPostalAddress defaultInstance]) { +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFrom:(SSKProtoDataMessageContactPostalAddress*) other { + if (other == [SSKProtoDataMessageContactPostalAddress defaultInstance]) { return self; } if (other.hasType) { @@ -5854,10 +5857,10 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactPostalAddressBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -5873,8 +5876,8 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( break; } case 8: { - OWSSignalServiceProtosDataMessageContactPostalAddressType value = (OWSSignalServiceProtosDataMessageContactPostalAddressType)[input readEnum]; - if (OWSSignalServiceProtosDataMessageContactPostalAddressTypeIsValidValue(value)) { + SSKProtoDataMessageContactPostalAddressType value = (SSKProtoDataMessageContactPostalAddressType)[input readEnum]; + if (SSKProtoDataMessageContactPostalAddressTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:1 value:value]; @@ -5919,17 +5922,17 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (BOOL) hasType { return resultPostalAddress.hasType; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressType) type { +- (SSKProtoDataMessageContactPostalAddressType) type { return resultPostalAddress.type; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setType:(OWSSignalServiceProtosDataMessageContactPostalAddressType) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setType:(SSKProtoDataMessageContactPostalAddressType) value { resultPostalAddress.hasType = YES; resultPostalAddress.type = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearType { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearType { resultPostalAddress.hasType = NO; - resultPostalAddress.type = OWSSignalServiceProtosDataMessageContactPostalAddressTypeHome; + resultPostalAddress.type = SSKProtoDataMessageContactPostalAddressTypeHome; return self; } - (BOOL) hasLabel { @@ -5938,12 +5941,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) label { return resultPostalAddress.label; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setLabel:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setLabel:(NSString*) value { resultPostalAddress.hasLabel = YES; resultPostalAddress.label = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearLabel { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearLabel { resultPostalAddress.hasLabel = NO; resultPostalAddress.label = @""; return self; @@ -5954,12 +5957,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) street { return resultPostalAddress.street; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setStreet:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setStreet:(NSString*) value { resultPostalAddress.hasStreet = YES; resultPostalAddress.street = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearStreet { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearStreet { resultPostalAddress.hasStreet = NO; resultPostalAddress.street = @""; return self; @@ -5970,12 +5973,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) pobox { return resultPostalAddress.pobox; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setPobox:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setPobox:(NSString*) value { resultPostalAddress.hasPobox = YES; resultPostalAddress.pobox = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearPobox { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearPobox { resultPostalAddress.hasPobox = NO; resultPostalAddress.pobox = @""; return self; @@ -5986,12 +5989,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) neighborhood { return resultPostalAddress.neighborhood; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setNeighborhood:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setNeighborhood:(NSString*) value { resultPostalAddress.hasNeighborhood = YES; resultPostalAddress.neighborhood = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearNeighborhood { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearNeighborhood { resultPostalAddress.hasNeighborhood = NO; resultPostalAddress.neighborhood = @""; return self; @@ -6002,12 +6005,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) city { return resultPostalAddress.city; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setCity:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setCity:(NSString*) value { resultPostalAddress.hasCity = YES; resultPostalAddress.city = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearCity { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearCity { resultPostalAddress.hasCity = NO; resultPostalAddress.city = @""; return self; @@ -6018,12 +6021,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) region { return resultPostalAddress.region; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setRegion:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setRegion:(NSString*) value { resultPostalAddress.hasRegion = YES; resultPostalAddress.region = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearRegion { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearRegion { resultPostalAddress.hasRegion = NO; resultPostalAddress.region = @""; return self; @@ -6034,12 +6037,12 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) postcode { return resultPostalAddress.postcode; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setPostcode:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setPostcode:(NSString*) value { resultPostalAddress.hasPostcode = YES; resultPostalAddress.postcode = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearPostcode { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearPostcode { resultPostalAddress.hasPostcode = NO; resultPostalAddress.postcode = @""; return self; @@ -6050,24 +6053,24 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( - (NSString*) country { return resultPostalAddress.country; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) setCountry:(NSString*) value { +- (SSKProtoDataMessageContactPostalAddressBuilder*) setCountry:(NSString*) value { resultPostalAddress.hasCountry = YES; resultPostalAddress.country = value; return self; } -- (OWSSignalServiceProtosDataMessageContactPostalAddressBuilder*) clearCountry { +- (SSKProtoDataMessageContactPostalAddressBuilder*) clearCountry { resultPostalAddress.hasCountry = NO; resultPostalAddress.country = @""; return self; } @end -@interface OWSSignalServiceProtosDataMessageContactAvatar () -@property (strong) OWSSignalServiceProtosAttachmentPointer* avatar; +@interface SSKProtoDataMessageContactAvatar () +@property (strong) SSKProtoAttachmentPointer* avatar; @property BOOL isProfile; @end -@implementation OWSSignalServiceProtosDataMessageContactAvatar +@implementation SSKProtoDataMessageContactAvatar - (BOOL) hasAvatar { return !!hasAvatar_; @@ -6090,22 +6093,22 @@ NSString *NSStringFromOWSSignalServiceProtosDataMessageContactPostalAddressType( } - (instancetype) init { if ((self = [super init])) { - self.avatar = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + self.avatar = [SSKProtoAttachmentPointer defaultInstance]; self.isProfile = NO; } return self; } -static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServiceProtosDataMessageContactAvatarInstance = nil; +static SSKProtoDataMessageContactAvatar* defaultSSKProtoDataMessageContactAvatarInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosDataMessageContactAvatar class]) { - defaultOWSSignalServiceProtosDataMessageContactAvatarInstance = [[OWSSignalServiceProtosDataMessageContactAvatar alloc] init]; + if (self == [SSKProtoDataMessageContactAvatar class]) { + defaultSSKProtoDataMessageContactAvatarInstance = [[SSKProtoDataMessageContactAvatar alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactAvatarInstance; + return defaultSSKProtoDataMessageContactAvatarInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosDataMessageContactAvatarInstance; + return defaultSSKProtoDataMessageContactAvatarInstance; } - (BOOL) isInitialized { return YES; @@ -6136,35 +6139,35 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromData:data] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromData:(NSData*) data { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromInputStream:input] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosDataMessageContactAvatar*)[[[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoDataMessageContactAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoDataMessageContactAvatar*)[[[SSKProtoDataMessageContactAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builder { - return [[OWSSignalServiceProtosDataMessageContactAvatarBuilder alloc] init]; ++ (SSKProtoDataMessageContactAvatarBuilder*) builder { + return [[SSKProtoDataMessageContactAvatarBuilder alloc] init]; } -+ (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosDataMessageContactAvatar*) prototype { - return [[OWSSignalServiceProtosDataMessageContactAvatar builder] mergeFrom:prototype]; ++ (SSKProtoDataMessageContactAvatarBuilder*) builderWithPrototype:(SSKProtoDataMessageContactAvatar*) prototype { + return [[SSKProtoDataMessageContactAvatar builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builder { - return [OWSSignalServiceProtosDataMessageContactAvatar builder]; +- (SSKProtoDataMessageContactAvatarBuilder*) builder { + return [SSKProtoDataMessageContactAvatar builder]; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) toBuilder { - return [OWSSignalServiceProtosDataMessageContactAvatar builderWithPrototype:self]; +- (SSKProtoDataMessageContactAvatarBuilder*) toBuilder { + return [SSKProtoDataMessageContactAvatar builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasAvatar) { @@ -6193,10 +6196,10 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosDataMessageContactAvatar class]]) { + if (![other isKindOfClass:[SSKProtoDataMessageContactAvatar class]]) { return NO; } - OWSSignalServiceProtosDataMessageContactAvatar *otherMessage = other; + SSKProtoDataMessageContactAvatar *otherMessage = other; return self.hasAvatar == otherMessage.hasAvatar && (!self.hasAvatar || [self.avatar isEqual:otherMessage.avatar]) && @@ -6217,42 +6220,42 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr } @end -@interface OWSSignalServiceProtosDataMessageContactAvatarBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContactAvatar* resultAvatar; +@interface SSKProtoDataMessageContactAvatarBuilder() +@property (strong) SSKProtoDataMessageContactAvatar* resultAvatar; @end -@implementation OWSSignalServiceProtosDataMessageContactAvatarBuilder +@implementation SSKProtoDataMessageContactAvatarBuilder @synthesize resultAvatar; - (instancetype) init { if ((self = [super init])) { - self.resultAvatar = [[OWSSignalServiceProtosDataMessageContactAvatar alloc] init]; + self.resultAvatar = [[SSKProtoDataMessageContactAvatar alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultAvatar; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clear { - self.resultAvatar = [[OWSSignalServiceProtosDataMessageContactAvatar alloc] init]; +- (SSKProtoDataMessageContactAvatarBuilder*) clear { + self.resultAvatar = [[SSKProtoDataMessageContactAvatar alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContactAvatar builderWithPrototype:resultAvatar]; +- (SSKProtoDataMessageContactAvatarBuilder*) clone { + return [SSKProtoDataMessageContactAvatar builderWithPrototype:resultAvatar]; } -- (OWSSignalServiceProtosDataMessageContactAvatar*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance]; +- (SSKProtoDataMessageContactAvatar*) defaultInstance { + return [SSKProtoDataMessageContactAvatar defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContactAvatar*) build { +- (SSKProtoDataMessageContactAvatar*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContactAvatar*) buildPartial { - OWSSignalServiceProtosDataMessageContactAvatar* returnMe = resultAvatar; +- (SSKProtoDataMessageContactAvatar*) buildPartial { + SSKProtoDataMessageContactAvatar* returnMe = resultAvatar; self.resultAvatar = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContactAvatar*) other { - if (other == [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance]) { +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFrom:(SSKProtoDataMessageContactAvatar*) other { + if (other == [SSKProtoDataMessageContactAvatar defaultInstance]) { return self; } if (other.hasAvatar) { @@ -6264,10 +6267,10 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -6283,7 +6286,7 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 10: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; if (self.hasAvatar) { [subBuilder mergeFrom:self.avatar]; } @@ -6301,31 +6304,31 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (BOOL) hasAvatar { return resultAvatar.hasAvatar; } -- (OWSSignalServiceProtosAttachmentPointer*) avatar { +- (SSKProtoAttachmentPointer*) avatar { return resultAvatar.avatar; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setAvatar:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoDataMessageContactAvatarBuilder*) setAvatar:(SSKProtoAttachmentPointer*) value { resultAvatar.hasAvatar = YES; resultAvatar.avatar = value; return self; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setAvatarBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue { +- (SSKProtoDataMessageContactAvatarBuilder*) setAvatarBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue { return [self setAvatar:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) mergeAvatar:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoDataMessageContactAvatarBuilder*) mergeAvatar:(SSKProtoAttachmentPointer*) value { if (resultAvatar.hasAvatar && - resultAvatar.avatar != [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { + resultAvatar.avatar != [SSKProtoAttachmentPointer defaultInstance]) { resultAvatar.avatar = - [[[OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultAvatar.avatar] mergeFrom:value] buildPartial]; + [[[SSKProtoAttachmentPointer builderWithPrototype:resultAvatar.avatar] mergeFrom:value] buildPartial]; } else { resultAvatar.avatar = value; } resultAvatar.hasAvatar = YES; return self; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clearAvatar { +- (SSKProtoDataMessageContactAvatarBuilder*) clearAvatar { resultAvatar.hasAvatar = NO; - resultAvatar.avatar = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + resultAvatar.avatar = [SSKProtoAttachmentPointer defaultInstance]; return self; } - (BOOL) hasIsProfile { @@ -6334,54 +6337,54 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (BOOL) isProfile { return resultAvatar.isProfile; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) setIsProfile:(BOOL) value { +- (SSKProtoDataMessageContactAvatarBuilder*) setIsProfile:(BOOL) value { resultAvatar.hasIsProfile = YES; resultAvatar.isProfile = value; return self; } -- (OWSSignalServiceProtosDataMessageContactAvatarBuilder*) clearIsProfile { +- (SSKProtoDataMessageContactAvatarBuilder*) clearIsProfile { resultAvatar.hasIsProfile = NO; resultAvatar.isProfile = NO; return self; } @end -@interface OWSSignalServiceProtosDataMessageContactBuilder() -@property (strong) OWSSignalServiceProtosDataMessageContact* resultContact; +@interface SSKProtoDataMessageContactBuilder() +@property (strong) SSKProtoDataMessageContact* resultContact; @end -@implementation OWSSignalServiceProtosDataMessageContactBuilder +@implementation SSKProtoDataMessageContactBuilder @synthesize resultContact; - (instancetype) init { if ((self = [super init])) { - self.resultContact = [[OWSSignalServiceProtosDataMessageContact alloc] init]; + self.resultContact = [[SSKProtoDataMessageContact alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultContact; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) clear { - self.resultContact = [[OWSSignalServiceProtosDataMessageContact alloc] init]; +- (SSKProtoDataMessageContactBuilder*) clear { + self.resultContact = [[SSKProtoDataMessageContact alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) clone { - return [OWSSignalServiceProtosDataMessageContact builderWithPrototype:resultContact]; +- (SSKProtoDataMessageContactBuilder*) clone { + return [SSKProtoDataMessageContact builderWithPrototype:resultContact]; } -- (OWSSignalServiceProtosDataMessageContact*) defaultInstance { - return [OWSSignalServiceProtosDataMessageContact defaultInstance]; +- (SSKProtoDataMessageContact*) defaultInstance { + return [SSKProtoDataMessageContact defaultInstance]; } -- (OWSSignalServiceProtosDataMessageContact*) build { +- (SSKProtoDataMessageContact*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessageContact*) buildPartial { - OWSSignalServiceProtosDataMessageContact* returnMe = resultContact; +- (SSKProtoDataMessageContact*) buildPartial { + SSKProtoDataMessageContact* returnMe = resultContact; self.resultContact = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessageContact*) other { - if (other == [OWSSignalServiceProtosDataMessageContact defaultInstance]) { +- (SSKProtoDataMessageContactBuilder*) mergeFrom:(SSKProtoDataMessageContact*) other { + if (other == [SSKProtoDataMessageContact defaultInstance]) { return self; } if (other.hasName) { @@ -6417,10 +6420,10 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageContactBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -6436,7 +6439,7 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 10: { - OWSSignalServiceProtosDataMessageContactNameBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContactName builder]; + SSKProtoDataMessageContactNameBuilder* subBuilder = [SSKProtoDataMessageContactName builder]; if (self.hasName) { [subBuilder mergeFrom:self.name]; } @@ -6445,25 +6448,25 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 26: { - OWSSignalServiceProtosDataMessageContactPhoneBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContactPhone builder]; + SSKProtoDataMessageContactPhoneBuilder* subBuilder = [SSKProtoDataMessageContactPhone builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addNumber:[subBuilder buildPartial]]; break; } case 34: { - OWSSignalServiceProtosDataMessageContactEmailBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContactEmail builder]; + SSKProtoDataMessageContactEmailBuilder* subBuilder = [SSKProtoDataMessageContactEmail builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addEmail:[subBuilder buildPartial]]; break; } case 42: { - OWSSignalServiceProtosDataMessageContactPostalAddressBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContactPostalAddress builder]; + SSKProtoDataMessageContactPostalAddressBuilder* subBuilder = [SSKProtoDataMessageContactPostalAddress builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addAddress:[subBuilder buildPartial]]; break; } case 50: { - OWSSignalServiceProtosDataMessageContactAvatarBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContactAvatar builder]; + SSKProtoDataMessageContactAvatarBuilder* subBuilder = [SSKProtoDataMessageContactAvatar builder]; if (self.hasAvatar) { [subBuilder mergeFrom:self.avatar]; } @@ -6481,124 +6484,124 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (BOOL) hasName { return resultContact.hasName; } -- (OWSSignalServiceProtosDataMessageContactName*) name { +- (SSKProtoDataMessageContactName*) name { return resultContact.name; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) setName:(OWSSignalServiceProtosDataMessageContactName*) value { +- (SSKProtoDataMessageContactBuilder*) setName:(SSKProtoDataMessageContactName*) value { resultContact.hasName = YES; resultContact.name = value; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) setNameBuilder:(OWSSignalServiceProtosDataMessageContactNameBuilder*) builderForValue { +- (SSKProtoDataMessageContactBuilder*) setNameBuilder:(SSKProtoDataMessageContactNameBuilder*) builderForValue { return [self setName:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeName:(OWSSignalServiceProtosDataMessageContactName*) value { +- (SSKProtoDataMessageContactBuilder*) mergeName:(SSKProtoDataMessageContactName*) value { if (resultContact.hasName && - resultContact.name != [OWSSignalServiceProtosDataMessageContactName defaultInstance]) { + resultContact.name != [SSKProtoDataMessageContactName defaultInstance]) { resultContact.name = - [[[OWSSignalServiceProtosDataMessageContactName builderWithPrototype:resultContact.name] mergeFrom:value] buildPartial]; + [[[SSKProtoDataMessageContactName builderWithPrototype:resultContact.name] mergeFrom:value] buildPartial]; } else { resultContact.name = value; } resultContact.hasName = YES; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearName { +- (SSKProtoDataMessageContactBuilder*) clearName { resultContact.hasName = NO; - resultContact.name = [OWSSignalServiceProtosDataMessageContactName defaultInstance]; + resultContact.name = [SSKProtoDataMessageContactName defaultInstance]; return self; } -- (NSMutableArray *)number { +- (NSMutableArray *)number { return resultContact.numberArray; } -- (OWSSignalServiceProtosDataMessageContactPhone*)numberAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactPhone*)numberAtIndex:(NSUInteger)index { return [resultContact numberAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)addNumber:(OWSSignalServiceProtosDataMessageContactPhone*)value { +- (SSKProtoDataMessageContactBuilder *)addNumber:(SSKProtoDataMessageContactPhone*)value { if (resultContact.numberArray == nil) { resultContact.numberArray = [[NSMutableArray alloc]init]; } [resultContact.numberArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)setNumberArray:(NSArray *)array { +- (SSKProtoDataMessageContactBuilder *)setNumberArray:(NSArray *)array { resultContact.numberArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearNumber { +- (SSKProtoDataMessageContactBuilder *)clearNumber { resultContact.numberArray = nil; return self; } -- (NSMutableArray *)email { +- (NSMutableArray *)email { return resultContact.emailArray; } -- (OWSSignalServiceProtosDataMessageContactEmail*)emailAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactEmail*)emailAtIndex:(NSUInteger)index { return [resultContact emailAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)addEmail:(OWSSignalServiceProtosDataMessageContactEmail*)value { +- (SSKProtoDataMessageContactBuilder *)addEmail:(SSKProtoDataMessageContactEmail*)value { if (resultContact.emailArray == nil) { resultContact.emailArray = [[NSMutableArray alloc]init]; } [resultContact.emailArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)setEmailArray:(NSArray *)array { +- (SSKProtoDataMessageContactBuilder *)setEmailArray:(NSArray *)array { resultContact.emailArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearEmail { +- (SSKProtoDataMessageContactBuilder *)clearEmail { resultContact.emailArray = nil; return self; } -- (NSMutableArray *)address { +- (NSMutableArray *)address { return resultContact.addressArray; } -- (OWSSignalServiceProtosDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContactPostalAddress*)addressAtIndex:(NSUInteger)index { return [resultContact addressAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)addAddress:(OWSSignalServiceProtosDataMessageContactPostalAddress*)value { +- (SSKProtoDataMessageContactBuilder *)addAddress:(SSKProtoDataMessageContactPostalAddress*)value { if (resultContact.addressArray == nil) { resultContact.addressArray = [[NSMutableArray alloc]init]; } [resultContact.addressArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)setAddressArray:(NSArray *)array { +- (SSKProtoDataMessageContactBuilder *)setAddressArray:(NSArray *)array { resultContact.addressArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder *)clearAddress { +- (SSKProtoDataMessageContactBuilder *)clearAddress { resultContact.addressArray = nil; return self; } - (BOOL) hasAvatar { return resultContact.hasAvatar; } -- (OWSSignalServiceProtosDataMessageContactAvatar*) avatar { +- (SSKProtoDataMessageContactAvatar*) avatar { return resultContact.avatar; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) setAvatar:(OWSSignalServiceProtosDataMessageContactAvatar*) value { +- (SSKProtoDataMessageContactBuilder*) setAvatar:(SSKProtoDataMessageContactAvatar*) value { resultContact.hasAvatar = YES; resultContact.avatar = value; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) setAvatarBuilder:(OWSSignalServiceProtosDataMessageContactAvatarBuilder*) builderForValue { +- (SSKProtoDataMessageContactBuilder*) setAvatarBuilder:(SSKProtoDataMessageContactAvatarBuilder*) builderForValue { return [self setAvatar:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) mergeAvatar:(OWSSignalServiceProtosDataMessageContactAvatar*) value { +- (SSKProtoDataMessageContactBuilder*) mergeAvatar:(SSKProtoDataMessageContactAvatar*) value { if (resultContact.hasAvatar && - resultContact.avatar != [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance]) { + resultContact.avatar != [SSKProtoDataMessageContactAvatar defaultInstance]) { resultContact.avatar = - [[[OWSSignalServiceProtosDataMessageContactAvatar builderWithPrototype:resultContact.avatar] mergeFrom:value] buildPartial]; + [[[SSKProtoDataMessageContactAvatar builderWithPrototype:resultContact.avatar] mergeFrom:value] buildPartial]; } else { resultContact.avatar = value; } resultContact.hasAvatar = YES; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearAvatar { +- (SSKProtoDataMessageContactBuilder*) clearAvatar { resultContact.hasAvatar = NO; - resultContact.avatar = [OWSSignalServiceProtosDataMessageContactAvatar defaultInstance]; + resultContact.avatar = [SSKProtoDataMessageContactAvatar defaultInstance]; return self; } - (BOOL) hasOrganization { @@ -6607,54 +6610,54 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (NSString*) organization { return resultContact.organization; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) setOrganization:(NSString*) value { +- (SSKProtoDataMessageContactBuilder*) setOrganization:(NSString*) value { resultContact.hasOrganization = YES; resultContact.organization = value; return self; } -- (OWSSignalServiceProtosDataMessageContactBuilder*) clearOrganization { +- (SSKProtoDataMessageContactBuilder*) clearOrganization { resultContact.hasOrganization = NO; resultContact.organization = @""; return self; } @end -@interface OWSSignalServiceProtosDataMessageBuilder() -@property (strong) OWSSignalServiceProtosDataMessage* resultDataMessage; +@interface SSKProtoDataMessageBuilder() +@property (strong) SSKProtoDataMessage* resultDataMessage; @end -@implementation OWSSignalServiceProtosDataMessageBuilder +@implementation SSKProtoDataMessageBuilder @synthesize resultDataMessage; - (instancetype) init { if ((self = [super init])) { - self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; + self.resultDataMessage = [[SSKProtoDataMessage alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultDataMessage; } -- (OWSSignalServiceProtosDataMessageBuilder*) clear { - self.resultDataMessage = [[OWSSignalServiceProtosDataMessage alloc] init]; +- (SSKProtoDataMessageBuilder*) clear { + self.resultDataMessage = [[SSKProtoDataMessage alloc] init]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clone { - return [OWSSignalServiceProtosDataMessage builderWithPrototype:resultDataMessage]; +- (SSKProtoDataMessageBuilder*) clone { + return [SSKProtoDataMessage builderWithPrototype:resultDataMessage]; } -- (OWSSignalServiceProtosDataMessage*) defaultInstance { - return [OWSSignalServiceProtosDataMessage defaultInstance]; +- (SSKProtoDataMessage*) defaultInstance { + return [SSKProtoDataMessage defaultInstance]; } -- (OWSSignalServiceProtosDataMessage*) build { +- (SSKProtoDataMessage*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosDataMessage*) buildPartial { - OWSSignalServiceProtosDataMessage* returnMe = resultDataMessage; +- (SSKProtoDataMessage*) buildPartial { + SSKProtoDataMessage* returnMe = resultDataMessage; self.resultDataMessage = nil; return returnMe; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFrom:(OWSSignalServiceProtosDataMessage*) other { - if (other == [OWSSignalServiceProtosDataMessage defaultInstance]) { +- (SSKProtoDataMessageBuilder*) mergeFrom:(SSKProtoDataMessage*) other { + if (other == [SSKProtoDataMessage defaultInstance]) { return self; } if (other.hasBody) { @@ -6695,10 +6698,10 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoDataMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -6718,13 +6721,13 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 18: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addAttachments:[subBuilder buildPartial]]; break; } case 26: { - OWSSignalServiceProtosGroupContextBuilder* subBuilder = [OWSSignalServiceProtosGroupContext builder]; + SSKProtoGroupContextBuilder* subBuilder = [SSKProtoGroupContext builder]; if (self.hasGroup) { [subBuilder mergeFrom:self.group]; } @@ -6749,7 +6752,7 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 66: { - OWSSignalServiceProtosDataMessageQuoteBuilder* subBuilder = [OWSSignalServiceProtosDataMessageQuote builder]; + SSKProtoDataMessageQuoteBuilder* subBuilder = [SSKProtoDataMessageQuote builder]; if (self.hasQuote) { [subBuilder mergeFrom:self.quote]; } @@ -6758,7 +6761,7 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr break; } case 74: { - OWSSignalServiceProtosDataMessageContactBuilder* subBuilder = [OWSSignalServiceProtosDataMessageContact builder]; + SSKProtoDataMessageContactBuilder* subBuilder = [SSKProtoDataMessageContact builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addContact:[subBuilder buildPartial]]; break; @@ -6772,65 +6775,65 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (NSString*) body { return resultDataMessage.body; } -- (OWSSignalServiceProtosDataMessageBuilder*) setBody:(NSString*) value { +- (SSKProtoDataMessageBuilder*) setBody:(NSString*) value { resultDataMessage.hasBody = YES; resultDataMessage.body = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearBody { +- (SSKProtoDataMessageBuilder*) clearBody { resultDataMessage.hasBody = NO; resultDataMessage.body = @""; return self; } -- (NSMutableArray *)attachments { +- (NSMutableArray *)attachments { return resultDataMessage.attachmentsArray; } -- (OWSSignalServiceProtosAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { +- (SSKProtoAttachmentPointer*)attachmentsAtIndex:(NSUInteger)index { return [resultDataMessage attachmentsAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageBuilder *)addAttachments:(OWSSignalServiceProtosAttachmentPointer*)value { +- (SSKProtoDataMessageBuilder *)addAttachments:(SSKProtoAttachmentPointer*)value { if (resultDataMessage.attachmentsArray == nil) { resultDataMessage.attachmentsArray = [[NSMutableArray alloc]init]; } [resultDataMessage.attachmentsArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder *)setAttachmentsArray:(NSArray *)array { +- (SSKProtoDataMessageBuilder *)setAttachmentsArray:(NSArray *)array { resultDataMessage.attachmentsArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder *)clearAttachments { +- (SSKProtoDataMessageBuilder *)clearAttachments { resultDataMessage.attachmentsArray = nil; return self; } - (BOOL) hasGroup { return resultDataMessage.hasGroup; } -- (OWSSignalServiceProtosGroupContext*) group { +- (SSKProtoGroupContext*) group { return resultDataMessage.group; } -- (OWSSignalServiceProtosDataMessageBuilder*) setGroup:(OWSSignalServiceProtosGroupContext*) value { +- (SSKProtoDataMessageBuilder*) setGroup:(SSKProtoGroupContext*) value { resultDataMessage.hasGroup = YES; resultDataMessage.group = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) setGroupBuilder:(OWSSignalServiceProtosGroupContextBuilder*) builderForValue { +- (SSKProtoDataMessageBuilder*) setGroupBuilder:(SSKProtoGroupContextBuilder*) builderForValue { return [self setGroup:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeGroup:(OWSSignalServiceProtosGroupContext*) value { +- (SSKProtoDataMessageBuilder*) mergeGroup:(SSKProtoGroupContext*) value { if (resultDataMessage.hasGroup && - resultDataMessage.group != [OWSSignalServiceProtosGroupContext defaultInstance]) { + resultDataMessage.group != [SSKProtoGroupContext defaultInstance]) { resultDataMessage.group = - [[[OWSSignalServiceProtosGroupContext builderWithPrototype:resultDataMessage.group] mergeFrom:value] buildPartial]; + [[[SSKProtoGroupContext builderWithPrototype:resultDataMessage.group] mergeFrom:value] buildPartial]; } else { resultDataMessage.group = value; } resultDataMessage.hasGroup = YES; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearGroup { +- (SSKProtoDataMessageBuilder*) clearGroup { resultDataMessage.hasGroup = NO; - resultDataMessage.group = [OWSSignalServiceProtosGroupContext defaultInstance]; + resultDataMessage.group = [SSKProtoGroupContext defaultInstance]; return self; } - (BOOL) hasFlags { @@ -6839,12 +6842,12 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (UInt32) flags { return resultDataMessage.flags; } -- (OWSSignalServiceProtosDataMessageBuilder*) setFlags:(UInt32) value { +- (SSKProtoDataMessageBuilder*) setFlags:(UInt32) value { resultDataMessage.hasFlags = YES; resultDataMessage.flags = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearFlags { +- (SSKProtoDataMessageBuilder*) clearFlags { resultDataMessage.hasFlags = NO; resultDataMessage.flags = 0; return self; @@ -6855,12 +6858,12 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (UInt32) expireTimer { return resultDataMessage.expireTimer; } -- (OWSSignalServiceProtosDataMessageBuilder*) setExpireTimer:(UInt32) value { +- (SSKProtoDataMessageBuilder*) setExpireTimer:(UInt32) value { resultDataMessage.hasExpireTimer = YES; resultDataMessage.expireTimer = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearExpireTimer { +- (SSKProtoDataMessageBuilder*) clearExpireTimer { resultDataMessage.hasExpireTimer = NO; resultDataMessage.expireTimer = 0; return self; @@ -6871,12 +6874,12 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (NSData*) profileKey { return resultDataMessage.profileKey; } -- (OWSSignalServiceProtosDataMessageBuilder*) setProfileKey:(NSData*) value { +- (SSKProtoDataMessageBuilder*) setProfileKey:(NSData*) value { resultDataMessage.hasProfileKey = YES; resultDataMessage.profileKey = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearProfileKey { +- (SSKProtoDataMessageBuilder*) clearProfileKey { resultDataMessage.hasProfileKey = NO; resultDataMessage.profileKey = [NSData data]; return self; @@ -6887,12 +6890,12 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (UInt64) timestamp { return resultDataMessage.timestamp; } -- (OWSSignalServiceProtosDataMessageBuilder*) setTimestamp:(UInt64) value { +- (SSKProtoDataMessageBuilder*) setTimestamp:(UInt64) value { resultDataMessage.hasTimestamp = YES; resultDataMessage.timestamp = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearTimestamp { +- (SSKProtoDataMessageBuilder*) clearTimestamp { resultDataMessage.hasTimestamp = NO; resultDataMessage.timestamp = 0L; return self; @@ -6900,61 +6903,61 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr - (BOOL) hasQuote { return resultDataMessage.hasQuote; } -- (OWSSignalServiceProtosDataMessageQuote*) quote { +- (SSKProtoDataMessageQuote*) quote { return resultDataMessage.quote; } -- (OWSSignalServiceProtosDataMessageBuilder*) setQuote:(OWSSignalServiceProtosDataMessageQuote*) value { +- (SSKProtoDataMessageBuilder*) setQuote:(SSKProtoDataMessageQuote*) value { resultDataMessage.hasQuote = YES; resultDataMessage.quote = value; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) setQuoteBuilder:(OWSSignalServiceProtosDataMessageQuoteBuilder*) builderForValue { +- (SSKProtoDataMessageBuilder*) setQuoteBuilder:(SSKProtoDataMessageQuoteBuilder*) builderForValue { return [self setQuote:[builderForValue build]]; } -- (OWSSignalServiceProtosDataMessageBuilder*) mergeQuote:(OWSSignalServiceProtosDataMessageQuote*) value { +- (SSKProtoDataMessageBuilder*) mergeQuote:(SSKProtoDataMessageQuote*) value { if (resultDataMessage.hasQuote && - resultDataMessage.quote != [OWSSignalServiceProtosDataMessageQuote defaultInstance]) { + resultDataMessage.quote != [SSKProtoDataMessageQuote defaultInstance]) { resultDataMessage.quote = - [[[OWSSignalServiceProtosDataMessageQuote builderWithPrototype:resultDataMessage.quote] mergeFrom:value] buildPartial]; + [[[SSKProtoDataMessageQuote builderWithPrototype:resultDataMessage.quote] mergeFrom:value] buildPartial]; } else { resultDataMessage.quote = value; } resultDataMessage.hasQuote = YES; return self; } -- (OWSSignalServiceProtosDataMessageBuilder*) clearQuote { +- (SSKProtoDataMessageBuilder*) clearQuote { resultDataMessage.hasQuote = NO; - resultDataMessage.quote = [OWSSignalServiceProtosDataMessageQuote defaultInstance]; + resultDataMessage.quote = [SSKProtoDataMessageQuote defaultInstance]; return self; } -- (NSMutableArray *)contact { +- (NSMutableArray *)contact { return resultDataMessage.contactArray; } -- (OWSSignalServiceProtosDataMessageContact*)contactAtIndex:(NSUInteger)index { +- (SSKProtoDataMessageContact*)contactAtIndex:(NSUInteger)index { return [resultDataMessage contactAtIndex:index]; } -- (OWSSignalServiceProtosDataMessageBuilder *)addContact:(OWSSignalServiceProtosDataMessageContact*)value { +- (SSKProtoDataMessageBuilder *)addContact:(SSKProtoDataMessageContact*)value { if (resultDataMessage.contactArray == nil) { resultDataMessage.contactArray = [[NSMutableArray alloc]init]; } [resultDataMessage.contactArray addObject:value]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder *)setContactArray:(NSArray *)array { +- (SSKProtoDataMessageBuilder *)setContactArray:(NSArray *)array { resultDataMessage.contactArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosDataMessageBuilder *)clearContact { +- (SSKProtoDataMessageBuilder *)clearContact { resultDataMessage.contactArray = nil; return self; } @end -@interface OWSSignalServiceProtosNullMessage () +@interface SSKProtoNullMessage () @property (strong) NSData* padding; @end -@implementation OWSSignalServiceProtosNullMessage +@implementation SSKProtoNullMessage - (BOOL) hasPadding { return !!hasPadding_; @@ -6969,17 +6972,17 @@ static OWSSignalServiceProtosDataMessageContactAvatar* defaultOWSSignalServicePr } return self; } -static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessageInstance = nil; +static SSKProtoNullMessage* defaultSSKProtoNullMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosNullMessage class]) { - defaultOWSSignalServiceProtosNullMessageInstance = [[OWSSignalServiceProtosNullMessage alloc] init]; + if (self == [SSKProtoNullMessage class]) { + defaultSSKProtoNullMessageInstance = [[SSKProtoNullMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosNullMessageInstance; + return defaultSSKProtoNullMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosNullMessageInstance; + return defaultSSKProtoNullMessageInstance; } - (BOOL) isInitialized { return YES; @@ -7004,35 +7007,35 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data] build]; ++ (SSKProtoNullMessage*) parseFromData:(NSData*) data { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoNullMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input] build]; ++ (SSKProtoNullMessage*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoNullMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosNullMessage*)[[[OWSSignalServiceProtosNullMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoNullMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoNullMessage*)[[[SSKProtoNullMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosNullMessageBuilder*) builder { - return [[OWSSignalServiceProtosNullMessageBuilder alloc] init]; ++ (SSKProtoNullMessageBuilder*) builder { + return [[SSKProtoNullMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosNullMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosNullMessage*) prototype { - return [[OWSSignalServiceProtosNullMessage builder] mergeFrom:prototype]; ++ (SSKProtoNullMessageBuilder*) builderWithPrototype:(SSKProtoNullMessage*) prototype { + return [[SSKProtoNullMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosNullMessageBuilder*) builder { - return [OWSSignalServiceProtosNullMessage builder]; +- (SSKProtoNullMessageBuilder*) builder { + return [SSKProtoNullMessage builder]; } -- (OWSSignalServiceProtosNullMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosNullMessage builderWithPrototype:self]; +- (SSKProtoNullMessageBuilder*) toBuilder { + return [SSKProtoNullMessage builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasPadding) { @@ -7050,10 +7053,10 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosNullMessage class]]) { + if (![other isKindOfClass:[SSKProtoNullMessage class]]) { return NO; } - OWSSignalServiceProtosNullMessage *otherMessage = other; + SSKProtoNullMessage *otherMessage = other; return self.hasPadding == otherMessage.hasPadding && (!self.hasPadding || [self.padding isEqual:otherMessage.padding]) && @@ -7069,42 +7072,42 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa } @end -@interface OWSSignalServiceProtosNullMessageBuilder() -@property (strong) OWSSignalServiceProtosNullMessage* resultNullMessage; +@interface SSKProtoNullMessageBuilder() +@property (strong) SSKProtoNullMessage* resultNullMessage; @end -@implementation OWSSignalServiceProtosNullMessageBuilder +@implementation SSKProtoNullMessageBuilder @synthesize resultNullMessage; - (instancetype) init { if ((self = [super init])) { - self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; + self.resultNullMessage = [[SSKProtoNullMessage alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultNullMessage; } -- (OWSSignalServiceProtosNullMessageBuilder*) clear { - self.resultNullMessage = [[OWSSignalServiceProtosNullMessage alloc] init]; +- (SSKProtoNullMessageBuilder*) clear { + self.resultNullMessage = [[SSKProtoNullMessage alloc] init]; return self; } -- (OWSSignalServiceProtosNullMessageBuilder*) clone { - return [OWSSignalServiceProtosNullMessage builderWithPrototype:resultNullMessage]; +- (SSKProtoNullMessageBuilder*) clone { + return [SSKProtoNullMessage builderWithPrototype:resultNullMessage]; } -- (OWSSignalServiceProtosNullMessage*) defaultInstance { - return [OWSSignalServiceProtosNullMessage defaultInstance]; +- (SSKProtoNullMessage*) defaultInstance { + return [SSKProtoNullMessage defaultInstance]; } -- (OWSSignalServiceProtosNullMessage*) build { +- (SSKProtoNullMessage*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosNullMessage*) buildPartial { - OWSSignalServiceProtosNullMessage* returnMe = resultNullMessage; +- (SSKProtoNullMessage*) buildPartial { + SSKProtoNullMessage* returnMe = resultNullMessage; self.resultNullMessage = nil; return returnMe; } -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFrom:(OWSSignalServiceProtosNullMessage*) other { - if (other == [OWSSignalServiceProtosNullMessage defaultInstance]) { +- (SSKProtoNullMessageBuilder*) mergeFrom:(SSKProtoNullMessage*) other { + if (other == [SSKProtoNullMessage defaultInstance]) { return self; } if (other.hasPadding) { @@ -7113,10 +7116,10 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoNullMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -7144,24 +7147,24 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa - (NSData*) padding { return resultNullMessage.padding; } -- (OWSSignalServiceProtosNullMessageBuilder*) setPadding:(NSData*) value { +- (SSKProtoNullMessageBuilder*) setPadding:(NSData*) value { resultNullMessage.hasPadding = YES; resultNullMessage.padding = value; return self; } -- (OWSSignalServiceProtosNullMessageBuilder*) clearPadding { +- (SSKProtoNullMessageBuilder*) clearPadding { resultNullMessage.hasPadding = NO; resultNullMessage.padding = [NSData data]; return self; } @end -@interface OWSSignalServiceProtosReceiptMessage () -@property OWSSignalServiceProtosReceiptMessageType type; +@interface SSKProtoReceiptMessage () +@property SSKProtoReceiptMessageType type; @property (strong) PBAppendableArray * timestampArray; @end -@implementation OWSSignalServiceProtosReceiptMessage +@implementation SSKProtoReceiptMessage - (BOOL) hasType { return !!hasType_; @@ -7174,21 +7177,21 @@ static OWSSignalServiceProtosNullMessage* defaultOWSSignalServiceProtosNullMessa @dynamic timestamp; - (instancetype) init { if ((self = [super init])) { - self.type = OWSSignalServiceProtosReceiptMessageTypeDelivery; + self.type = SSKProtoReceiptMessageTypeDelivery; } return self; } -static OWSSignalServiceProtosReceiptMessage* defaultOWSSignalServiceProtosReceiptMessageInstance = nil; +static SSKProtoReceiptMessage* defaultSSKProtoReceiptMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosReceiptMessage class]) { - defaultOWSSignalServiceProtosReceiptMessageInstance = [[OWSSignalServiceProtosReceiptMessage alloc] init]; + if (self == [SSKProtoReceiptMessage class]) { + defaultSSKProtoReceiptMessageInstance = [[SSKProtoReceiptMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosReceiptMessageInstance; + return defaultSSKProtoReceiptMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosReceiptMessageInstance; + return defaultSSKProtoReceiptMessageInstance; } - (PBArray *)timestamp { return timestampArray; @@ -7236,39 +7239,39 @@ static OWSSignalServiceProtosReceiptMessage* defaultOWSSignalServiceProtosReceip memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromData:data] build]; ++ (SSKProtoReceiptMessage*) parseFromData:(NSData*) data { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoReceiptMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromInputStream:input] build]; ++ (SSKProtoReceiptMessage*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoReceiptMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosReceiptMessage*)[[[OWSSignalServiceProtosReceiptMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoReceiptMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoReceiptMessage*)[[[SSKProtoReceiptMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosReceiptMessageBuilder*) builder { - return [[OWSSignalServiceProtosReceiptMessageBuilder alloc] init]; ++ (SSKProtoReceiptMessageBuilder*) builder { + return [[SSKProtoReceiptMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosReceiptMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosReceiptMessage*) prototype { - return [[OWSSignalServiceProtosReceiptMessage builder] mergeFrom:prototype]; ++ (SSKProtoReceiptMessageBuilder*) builderWithPrototype:(SSKProtoReceiptMessage*) prototype { + return [[SSKProtoReceiptMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) builder { - return [OWSSignalServiceProtosReceiptMessage builder]; +- (SSKProtoReceiptMessageBuilder*) builder { + return [SSKProtoReceiptMessage builder]; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosReceiptMessage builderWithPrototype:self]; +- (SSKProtoReceiptMessageBuilder*) toBuilder { + return [SSKProtoReceiptMessage builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosReceiptMessageType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoReceiptMessageType(self.type)]; } [self.timestampArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@: %@\n", indent, @"timestamp", obj]; @@ -7291,10 +7294,10 @@ static OWSSignalServiceProtosReceiptMessage* defaultOWSSignalServiceProtosReceip if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosReceiptMessage class]]) { + if (![other isKindOfClass:[SSKProtoReceiptMessage class]]) { return NO; } - OWSSignalServiceProtosReceiptMessage *otherMessage = other; + SSKProtoReceiptMessage *otherMessage = other; return self.hasType == otherMessage.hasType && (!self.hasType || self.type == otherMessage.type) && @@ -7314,62 +7317,62 @@ static OWSSignalServiceProtosReceiptMessage* defaultOWSSignalServiceProtosReceip } @end -BOOL OWSSignalServiceProtosReceiptMessageTypeIsValidValue(OWSSignalServiceProtosReceiptMessageType value) { +BOOL SSKProtoReceiptMessageTypeIsValidValue(SSKProtoReceiptMessageType value) { switch (value) { - case OWSSignalServiceProtosReceiptMessageTypeDelivery: - case OWSSignalServiceProtosReceiptMessageTypeRead: + case SSKProtoReceiptMessageTypeDelivery: + case SSKProtoReceiptMessageTypeRead: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceProtosReceiptMessageType value) { +NSString *NSStringFromSSKProtoReceiptMessageType(SSKProtoReceiptMessageType value) { switch (value) { - case OWSSignalServiceProtosReceiptMessageTypeDelivery: - return @"OWSSignalServiceProtosReceiptMessageTypeDelivery"; - case OWSSignalServiceProtosReceiptMessageTypeRead: - return @"OWSSignalServiceProtosReceiptMessageTypeRead"; + case SSKProtoReceiptMessageTypeDelivery: + return @"SSKProtoReceiptMessageTypeDelivery"; + case SSKProtoReceiptMessageTypeRead: + return @"SSKProtoReceiptMessageTypeRead"; default: return nil; } } -@interface OWSSignalServiceProtosReceiptMessageBuilder() -@property (strong) OWSSignalServiceProtosReceiptMessage* resultReceiptMessage; +@interface SSKProtoReceiptMessageBuilder() +@property (strong) SSKProtoReceiptMessage* resultReceiptMessage; @end -@implementation OWSSignalServiceProtosReceiptMessageBuilder +@implementation SSKProtoReceiptMessageBuilder @synthesize resultReceiptMessage; - (instancetype) init { if ((self = [super init])) { - self.resultReceiptMessage = [[OWSSignalServiceProtosReceiptMessage alloc] init]; + self.resultReceiptMessage = [[SSKProtoReceiptMessage alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultReceiptMessage; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) clear { - self.resultReceiptMessage = [[OWSSignalServiceProtosReceiptMessage alloc] init]; +- (SSKProtoReceiptMessageBuilder*) clear { + self.resultReceiptMessage = [[SSKProtoReceiptMessage alloc] init]; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) clone { - return [OWSSignalServiceProtosReceiptMessage builderWithPrototype:resultReceiptMessage]; +- (SSKProtoReceiptMessageBuilder*) clone { + return [SSKProtoReceiptMessage builderWithPrototype:resultReceiptMessage]; } -- (OWSSignalServiceProtosReceiptMessage*) defaultInstance { - return [OWSSignalServiceProtosReceiptMessage defaultInstance]; +- (SSKProtoReceiptMessage*) defaultInstance { + return [SSKProtoReceiptMessage defaultInstance]; } -- (OWSSignalServiceProtosReceiptMessage*) build { +- (SSKProtoReceiptMessage*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosReceiptMessage*) buildPartial { - OWSSignalServiceProtosReceiptMessage* returnMe = resultReceiptMessage; +- (SSKProtoReceiptMessage*) buildPartial { + SSKProtoReceiptMessage* returnMe = resultReceiptMessage; self.resultReceiptMessage = nil; return returnMe; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFrom:(OWSSignalServiceProtosReceiptMessage*) other { - if (other == [OWSSignalServiceProtosReceiptMessage defaultInstance]) { +- (SSKProtoReceiptMessageBuilder*) mergeFrom:(SSKProtoReceiptMessage*) other { + if (other == [SSKProtoReceiptMessage defaultInstance]) { return self; } if (other.hasType) { @@ -7385,10 +7388,10 @@ NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceP [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoReceiptMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -7404,8 +7407,8 @@ NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceP break; } case 8: { - OWSSignalServiceProtosReceiptMessageType value = (OWSSignalServiceProtosReceiptMessageType)[input readEnum]; - if (OWSSignalServiceProtosReceiptMessageTypeIsValidValue(value)) { + SSKProtoReceiptMessageType value = (SSKProtoReceiptMessageType)[input readEnum]; + if (SSKProtoReceiptMessageTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:1 value:value]; @@ -7422,17 +7425,17 @@ NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceP - (BOOL) hasType { return resultReceiptMessage.hasType; } -- (OWSSignalServiceProtosReceiptMessageType) type { +- (SSKProtoReceiptMessageType) type { return resultReceiptMessage.type; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) setType:(OWSSignalServiceProtosReceiptMessageType) value { +- (SSKProtoReceiptMessageBuilder*) setType:(SSKProtoReceiptMessageType) value { resultReceiptMessage.hasType = YES; resultReceiptMessage.type = value; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder*) clearType { +- (SSKProtoReceiptMessageBuilder*) clearType { resultReceiptMessage.hasType = NO; - resultReceiptMessage.type = OWSSignalServiceProtosReceiptMessageTypeDelivery; + resultReceiptMessage.type = SSKProtoReceiptMessageTypeDelivery; return self; } - (PBAppendableArray *)timestamp { @@ -7441,35 +7444,35 @@ NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceP - (UInt64)timestampAtIndex:(NSUInteger)index { return [resultReceiptMessage timestampAtIndex:index]; } -- (OWSSignalServiceProtosReceiptMessageBuilder *)addTimestamp:(UInt64)value { +- (SSKProtoReceiptMessageBuilder *)addTimestamp:(UInt64)value { if (resultReceiptMessage.timestampArray == nil) { resultReceiptMessage.timestampArray = [PBAppendableArray arrayWithValueType:PBArrayValueTypeUInt64]; } [resultReceiptMessage.timestampArray addUint64:value]; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder *)setTimestampArray:(NSArray *)array { +- (SSKProtoReceiptMessageBuilder *)setTimestampArray:(NSArray *)array { resultReceiptMessage.timestampArray = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeUInt64]; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder *)setTimestampValues:(const UInt64 *)values count:(NSUInteger)count { +- (SSKProtoReceiptMessageBuilder *)setTimestampValues:(const UInt64 *)values count:(NSUInteger)count { resultReceiptMessage.timestampArray = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeUInt64]; return self; } -- (OWSSignalServiceProtosReceiptMessageBuilder *)clearTimestamp { +- (SSKProtoReceiptMessageBuilder *)clearTimestamp { resultReceiptMessage.timestampArray = nil; return self; } @end -@interface OWSSignalServiceProtosVerified () +@interface SSKProtoVerified () @property (strong) NSString* destination; @property (strong) NSData* identityKey; -@property OWSSignalServiceProtosVerifiedState state; +@property SSKProtoVerifiedState state; @property (strong) NSData* nullMessage; @end -@implementation OWSSignalServiceProtosVerified +@implementation SSKProtoVerified - (BOOL) hasDestination { return !!hasDestination_; @@ -7503,22 +7506,22 @@ NSString *NSStringFromOWSSignalServiceProtosReceiptMessageType(OWSSignalServiceP if ((self = [super init])) { self.destination = @""; self.identityKey = [NSData data]; - self.state = OWSSignalServiceProtosVerifiedStateDefault; + self.state = SSKProtoVerifiedStateDefault; self.nullMessage = [NSData data]; } return self; } -static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInstance = nil; +static SSKProtoVerified* defaultSSKProtoVerifiedInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosVerified class]) { - defaultOWSSignalServiceProtosVerifiedInstance = [[OWSSignalServiceProtosVerified alloc] init]; + if (self == [SSKProtoVerified class]) { + defaultSSKProtoVerifiedInstance = [[SSKProtoVerified alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosVerifiedInstance; + return defaultSSKProtoVerifiedInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosVerifiedInstance; + return defaultSSKProtoVerifiedInstance; } - (BOOL) isInitialized { return YES; @@ -7561,35 +7564,35 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data] build]; ++ (SSKProtoVerified*) parseFromData:(NSData*) data { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoVerified*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input] build]; ++ (SSKProtoVerified*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoVerified*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosVerified*)[[[OWSSignalServiceProtosVerified builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoVerified*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoVerified*)[[[SSKProtoVerified builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosVerifiedBuilder*) builder { - return [[OWSSignalServiceProtosVerifiedBuilder alloc] init]; ++ (SSKProtoVerifiedBuilder*) builder { + return [[SSKProtoVerifiedBuilder alloc] init]; } -+ (OWSSignalServiceProtosVerifiedBuilder*) builderWithPrototype:(OWSSignalServiceProtosVerified*) prototype { - return [[OWSSignalServiceProtosVerified builder] mergeFrom:prototype]; ++ (SSKProtoVerifiedBuilder*) builderWithPrototype:(SSKProtoVerified*) prototype { + return [[SSKProtoVerified builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosVerifiedBuilder*) builder { - return [OWSSignalServiceProtosVerified builder]; +- (SSKProtoVerifiedBuilder*) builder { + return [SSKProtoVerified builder]; } -- (OWSSignalServiceProtosVerifiedBuilder*) toBuilder { - return [OWSSignalServiceProtosVerified builderWithPrototype:self]; +- (SSKProtoVerifiedBuilder*) toBuilder { + return [SSKProtoVerified builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasDestination) { @@ -7599,7 +7602,7 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst [output appendFormat:@"%@%@: %@\n", indent, @"identityKey", self.identityKey]; } if (self.hasState) { - [output appendFormat:@"%@%@: %@\n", indent, @"state", NSStringFromOWSSignalServiceProtosVerifiedState(self.state)]; + [output appendFormat:@"%@%@: %@\n", indent, @"state", NSStringFromSSKProtoVerifiedState(self.state)]; } if (self.hasNullMessage) { [output appendFormat:@"%@%@: %@\n", indent, @"nullMessage", self.nullMessage]; @@ -7625,10 +7628,10 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosVerified class]]) { + if (![other isKindOfClass:[SSKProtoVerified class]]) { return NO; } - OWSSignalServiceProtosVerified *otherMessage = other; + SSKProtoVerified *otherMessage = other; return self.hasDestination == otherMessage.hasDestination && (!self.hasDestination || [self.destination isEqual:otherMessage.destination]) && @@ -7659,65 +7662,65 @@ static OWSSignalServiceProtosVerified* defaultOWSSignalServiceProtosVerifiedInst } @end -BOOL OWSSignalServiceProtosVerifiedStateIsValidValue(OWSSignalServiceProtosVerifiedState value) { +BOOL SSKProtoVerifiedStateIsValidValue(SSKProtoVerifiedState value) { switch (value) { - case OWSSignalServiceProtosVerifiedStateDefault: - case OWSSignalServiceProtosVerifiedStateVerified: - case OWSSignalServiceProtosVerifiedStateUnverified: + case SSKProtoVerifiedStateDefault: + case SSKProtoVerifiedStateVerified: + case SSKProtoVerifiedStateUnverified: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtosVerifiedState value) { +NSString *NSStringFromSSKProtoVerifiedState(SSKProtoVerifiedState value) { switch (value) { - case OWSSignalServiceProtosVerifiedStateDefault: - return @"OWSSignalServiceProtosVerifiedStateDefault"; - case OWSSignalServiceProtosVerifiedStateVerified: - return @"OWSSignalServiceProtosVerifiedStateVerified"; - case OWSSignalServiceProtosVerifiedStateUnverified: - return @"OWSSignalServiceProtosVerifiedStateUnverified"; + case SSKProtoVerifiedStateDefault: + return @"SSKProtoVerifiedStateDefault"; + case SSKProtoVerifiedStateVerified: + return @"SSKProtoVerifiedStateVerified"; + case SSKProtoVerifiedStateUnverified: + return @"SSKProtoVerifiedStateUnverified"; default: return nil; } } -@interface OWSSignalServiceProtosVerifiedBuilder() -@property (strong) OWSSignalServiceProtosVerified* resultVerified; +@interface SSKProtoVerifiedBuilder() +@property (strong) SSKProtoVerified* resultVerified; @end -@implementation OWSSignalServiceProtosVerifiedBuilder +@implementation SSKProtoVerifiedBuilder @synthesize resultVerified; - (instancetype) init { if ((self = [super init])) { - self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; + self.resultVerified = [[SSKProtoVerified alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultVerified; } -- (OWSSignalServiceProtosVerifiedBuilder*) clear { - self.resultVerified = [[OWSSignalServiceProtosVerified alloc] init]; +- (SSKProtoVerifiedBuilder*) clear { + self.resultVerified = [[SSKProtoVerified alloc] init]; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clone { - return [OWSSignalServiceProtosVerified builderWithPrototype:resultVerified]; +- (SSKProtoVerifiedBuilder*) clone { + return [SSKProtoVerified builderWithPrototype:resultVerified]; } -- (OWSSignalServiceProtosVerified*) defaultInstance { - return [OWSSignalServiceProtosVerified defaultInstance]; +- (SSKProtoVerified*) defaultInstance { + return [SSKProtoVerified defaultInstance]; } -- (OWSSignalServiceProtosVerified*) build { +- (SSKProtoVerified*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosVerified*) buildPartial { - OWSSignalServiceProtosVerified* returnMe = resultVerified; +- (SSKProtoVerified*) buildPartial { + SSKProtoVerified* returnMe = resultVerified; self.resultVerified = nil; return returnMe; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFrom:(OWSSignalServiceProtosVerified*) other { - if (other == [OWSSignalServiceProtosVerified defaultInstance]) { +- (SSKProtoVerifiedBuilder*) mergeFrom:(SSKProtoVerified*) other { + if (other == [SSKProtoVerified defaultInstance]) { return self; } if (other.hasDestination) { @@ -7735,10 +7738,10 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoVerifiedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -7762,8 +7765,8 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos break; } case 24: { - OWSSignalServiceProtosVerifiedState value = (OWSSignalServiceProtosVerifiedState)[input readEnum]; - if (OWSSignalServiceProtosVerifiedStateIsValidValue(value)) { + SSKProtoVerifiedState value = (SSKProtoVerifiedState)[input readEnum]; + if (SSKProtoVerifiedStateIsValidValue(value)) { [self setState:value]; } else { [unknownFields mergeVarintField:3 value:value]; @@ -7783,12 +7786,12 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos - (NSString*) destination { return resultVerified.destination; } -- (OWSSignalServiceProtosVerifiedBuilder*) setDestination:(NSString*) value { +- (SSKProtoVerifiedBuilder*) setDestination:(NSString*) value { resultVerified.hasDestination = YES; resultVerified.destination = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearDestination { +- (SSKProtoVerifiedBuilder*) clearDestination { resultVerified.hasDestination = NO; resultVerified.destination = @""; return self; @@ -7799,12 +7802,12 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos - (NSData*) identityKey { return resultVerified.identityKey; } -- (OWSSignalServiceProtosVerifiedBuilder*) setIdentityKey:(NSData*) value { +- (SSKProtoVerifiedBuilder*) setIdentityKey:(NSData*) value { resultVerified.hasIdentityKey = YES; resultVerified.identityKey = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearIdentityKey { +- (SSKProtoVerifiedBuilder*) clearIdentityKey { resultVerified.hasIdentityKey = NO; resultVerified.identityKey = [NSData data]; return self; @@ -7812,17 +7815,17 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos - (BOOL) hasState { return resultVerified.hasState; } -- (OWSSignalServiceProtosVerifiedState) state { +- (SSKProtoVerifiedState) state { return resultVerified.state; } -- (OWSSignalServiceProtosVerifiedBuilder*) setState:(OWSSignalServiceProtosVerifiedState) value { +- (SSKProtoVerifiedBuilder*) setState:(SSKProtoVerifiedState) value { resultVerified.hasState = YES; resultVerified.state = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearState { +- (SSKProtoVerifiedBuilder*) clearState { resultVerified.hasState = NO; - resultVerified.state = OWSSignalServiceProtosVerifiedStateDefault; + resultVerified.state = SSKProtoVerifiedStateDefault; return self; } - (BOOL) hasNullMessage { @@ -7831,31 +7834,31 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos - (NSData*) nullMessage { return resultVerified.nullMessage; } -- (OWSSignalServiceProtosVerifiedBuilder*) setNullMessage:(NSData*) value { +- (SSKProtoVerifiedBuilder*) setNullMessage:(NSData*) value { resultVerified.hasNullMessage = YES; resultVerified.nullMessage = value; return self; } -- (OWSSignalServiceProtosVerifiedBuilder*) clearNullMessage { +- (SSKProtoVerifiedBuilder*) clearNullMessage { resultVerified.hasNullMessage = NO; resultVerified.nullMessage = [NSData data]; return self; } @end -@interface OWSSignalServiceProtosSyncMessage () -@property (strong) OWSSignalServiceProtosSyncMessageSent* sent; -@property (strong) OWSSignalServiceProtosSyncMessageContacts* contacts; -@property (strong) OWSSignalServiceProtosSyncMessageGroups* groups; -@property (strong) OWSSignalServiceProtosSyncMessageRequest* request; -@property (strong) NSMutableArray * readArray; -@property (strong) OWSSignalServiceProtosSyncMessageBlocked* blocked; -@property (strong) OWSSignalServiceProtosVerified* verified; -@property (strong) OWSSignalServiceProtosSyncMessageConfiguration* configuration; +@interface SSKProtoSyncMessage () +@property (strong) SSKProtoSyncMessageSent* sent; +@property (strong) SSKProtoSyncMessageContacts* contacts; +@property (strong) SSKProtoSyncMessageGroups* groups; +@property (strong) SSKProtoSyncMessageRequest* request; +@property (strong) NSMutableArray * readArray; +@property (strong) SSKProtoSyncMessageBlocked* blocked; +@property (strong) SSKProtoVerified* verified; +@property (strong) SSKProtoSyncMessageConfiguration* configuration; @property (strong) NSData* padding; @end -@implementation OWSSignalServiceProtosSyncMessage +@implementation SSKProtoSyncMessage - (BOOL) hasSent { return !!hasSent_; @@ -7917,33 +7920,33 @@ NSString *NSStringFromOWSSignalServiceProtosVerifiedState(OWSSignalServiceProtos @synthesize padding; - (instancetype) init { if ((self = [super init])) { - self.sent = [OWSSignalServiceProtosSyncMessageSent defaultInstance]; - self.contacts = [OWSSignalServiceProtosSyncMessageContacts defaultInstance]; - self.groups = [OWSSignalServiceProtosSyncMessageGroups defaultInstance]; - self.request = [OWSSignalServiceProtosSyncMessageRequest defaultInstance]; - self.blocked = [OWSSignalServiceProtosSyncMessageBlocked defaultInstance]; - self.verified = [OWSSignalServiceProtosVerified defaultInstance]; - self.configuration = [OWSSignalServiceProtosSyncMessageConfiguration defaultInstance]; + self.sent = [SSKProtoSyncMessageSent defaultInstance]; + self.contacts = [SSKProtoSyncMessageContacts defaultInstance]; + self.groups = [SSKProtoSyncMessageGroups defaultInstance]; + self.request = [SSKProtoSyncMessageRequest defaultInstance]; + self.blocked = [SSKProtoSyncMessageBlocked defaultInstance]; + self.verified = [SSKProtoVerified defaultInstance]; + self.configuration = [SSKProtoSyncMessageConfiguration defaultInstance]; self.padding = [NSData data]; } return self; } -static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessageInstance = nil; +static SSKProtoSyncMessage* defaultSSKProtoSyncMessageInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessage class]) { - defaultOWSSignalServiceProtosSyncMessageInstance = [[OWSSignalServiceProtosSyncMessage alloc] init]; + if (self == [SSKProtoSyncMessage class]) { + defaultSSKProtoSyncMessageInstance = [[SSKProtoSyncMessage alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageInstance; + return defaultSSKProtoSyncMessageInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageInstance; + return defaultSSKProtoSyncMessageInstance; } -- (NSArray *)read { +- (NSArray *)read { return readArray; } -- (OWSSignalServiceProtosSyncMessageRead*)readAtIndex:(NSUInteger)index { +- (SSKProtoSyncMessageRead*)readAtIndex:(NSUInteger)index { return [readArray objectAtIndex:index]; } - (BOOL) isInitialized { @@ -7962,7 +7965,7 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa if (self.hasRequest) { [output writeMessage:4 value:self.request]; } - [self.readArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosSyncMessageRead *element, NSUInteger idx, BOOL *stop) { + [self.readArray enumerateObjectsUsingBlock:^(SSKProtoSyncMessageRead *element, NSUInteger idx, BOOL *stop) { [output writeMessage:5 value:element]; }]; if (self.hasBlocked) { @@ -7998,7 +8001,7 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa if (self.hasRequest) { size_ += computeMessageSize(4, self.request); } - [self.readArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosSyncMessageRead *element, NSUInteger idx, BOOL *stop) { + [self.readArray enumerateObjectsUsingBlock:^(SSKProtoSyncMessageRead *element, NSUInteger idx, BOOL *stop) { size_ += computeMessageSize(5, element); }]; if (self.hasBlocked) { @@ -8017,35 +8020,35 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessage*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessage*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessage*)[[[OWSSignalServiceProtosSyncMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessage*)[[[SSKProtoSyncMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageBuilder alloc] init]; ++ (SSKProtoSyncMessageBuilder*) builder { + return [[SSKProtoSyncMessageBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessage*) prototype { - return [[OWSSignalServiceProtosSyncMessage builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageBuilder*) builderWithPrototype:(SSKProtoSyncMessage*) prototype { + return [[SSKProtoSyncMessage builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) builder { - return [OWSSignalServiceProtosSyncMessage builder]; +- (SSKProtoSyncMessageBuilder*) builder { + return [SSKProtoSyncMessage builder]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessage builderWithPrototype:self]; +- (SSKProtoSyncMessageBuilder*) toBuilder { + return [SSKProtoSyncMessage builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasSent) { @@ -8072,7 +8075,7 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa withIndent:[NSString stringWithFormat:@"%@ ", indent]]; [output appendFormat:@"%@}\n", indent]; } - [self.readArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosSyncMessageRead *element, NSUInteger idx, BOOL *stop) { + [self.readArray enumerateObjectsUsingBlock:^(SSKProtoSyncMessageRead *element, NSUInteger idx, BOOL *stop) { [output appendFormat:@"%@%@ {\n", indent, @"read"]; [element writeDescriptionTo:output withIndent:[NSString stringWithFormat:@"%@ ", indent]]; @@ -8122,7 +8125,7 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa [self.request storeInDictionary:messageDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:messageDictionary] forKey:@"request"]; } - for (OWSSignalServiceProtosSyncMessageRead* element in self.readArray) { + for (SSKProtoSyncMessageRead* element in self.readArray) { NSMutableDictionary *elementDictionary = [NSMutableDictionary dictionary]; [element storeInDictionary:elementDictionary]; [dictionary setObject:[NSDictionary dictionaryWithDictionary:elementDictionary] forKey:@"read"]; @@ -8151,10 +8154,10 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessage class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessage class]]) { return NO; } - OWSSignalServiceProtosSyncMessage *otherMessage = other; + SSKProtoSyncMessage *otherMessage = other; return self.hasSent == otherMessage.hasSent && (!self.hasSent || [self.sent isEqual:otherMessage.sent]) && @@ -8189,7 +8192,7 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa if (self.hasRequest) { hashCode = hashCode * 31 + [self.request hash]; } - [self.readArray enumerateObjectsUsingBlock:^(OWSSignalServiceProtosSyncMessageRead *element, NSUInteger idx, BOOL *stop) { + [self.readArray enumerateObjectsUsingBlock:^(SSKProtoSyncMessageRead *element, NSUInteger idx, BOOL *stop) { hashCode = hashCode * 31 + [element hash]; }]; if (self.hasBlocked) { @@ -8209,14 +8212,14 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa } @end -@interface OWSSignalServiceProtosSyncMessageSent () +@interface SSKProtoSyncMessageSent () @property (strong) NSString* destination; @property UInt64 timestamp; -@property (strong) OWSSignalServiceProtosDataMessage* message; +@property (strong) SSKProtoDataMessage* message; @property UInt64 expirationStartTimestamp; @end -@implementation OWSSignalServiceProtosSyncMessageSent +@implementation SSKProtoSyncMessageSent - (BOOL) hasDestination { return !!hasDestination_; @@ -8250,22 +8253,22 @@ static OWSSignalServiceProtosSyncMessage* defaultOWSSignalServiceProtosSyncMessa if ((self = [super init])) { self.destination = @""; self.timestamp = 0L; - self.message = [OWSSignalServiceProtosDataMessage defaultInstance]; + self.message = [SSKProtoDataMessage defaultInstance]; self.expirationStartTimestamp = 0L; } return self; } -static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncMessageSentInstance = nil; +static SSKProtoSyncMessageSent* defaultSSKProtoSyncMessageSentInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageSent class]) { - defaultOWSSignalServiceProtosSyncMessageSentInstance = [[OWSSignalServiceProtosSyncMessageSent alloc] init]; + if (self == [SSKProtoSyncMessageSent class]) { + defaultSSKProtoSyncMessageSentInstance = [[SSKProtoSyncMessageSent alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageSentInstance; + return defaultSSKProtoSyncMessageSentInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageSentInstance; + return defaultSSKProtoSyncMessageSentInstance; } - (BOOL) isInitialized { return YES; @@ -8308,35 +8311,35 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageSent*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageSent*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageSent*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageSent*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageSent*)[[[OWSSignalServiceProtosSyncMessageSent builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageSent*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageSent*)[[[SSKProtoSyncMessageSent builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageSentBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageSentBuilder alloc] init]; ++ (SSKProtoSyncMessageSentBuilder*) builder { + return [[SSKProtoSyncMessageSentBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageSentBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageSent*) prototype { - return [[OWSSignalServiceProtosSyncMessageSent builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageSentBuilder*) builderWithPrototype:(SSKProtoSyncMessageSent*) prototype { + return [[SSKProtoSyncMessageSent builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageSent builder]; +- (SSKProtoSyncMessageSentBuilder*) builder { + return [SSKProtoSyncMessageSent builder]; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageSent builderWithPrototype:self]; +- (SSKProtoSyncMessageSentBuilder*) toBuilder { + return [SSKProtoSyncMessageSent builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasDestination) { @@ -8377,10 +8380,10 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageSent class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageSent class]]) { return NO; } - OWSSignalServiceProtosSyncMessageSent *otherMessage = other; + SSKProtoSyncMessageSent *otherMessage = other; return self.hasDestination == otherMessage.hasDestination && (!self.hasDestination || [self.destination isEqual:otherMessage.destination]) && @@ -8411,42 +8414,42 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM } @end -@interface OWSSignalServiceProtosSyncMessageSentBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageSent* resultSent; +@interface SSKProtoSyncMessageSentBuilder() +@property (strong) SSKProtoSyncMessageSent* resultSent; @end -@implementation OWSSignalServiceProtosSyncMessageSentBuilder +@implementation SSKProtoSyncMessageSentBuilder @synthesize resultSent; - (instancetype) init { if ((self = [super init])) { - self.resultSent = [[OWSSignalServiceProtosSyncMessageSent alloc] init]; + self.resultSent = [[SSKProtoSyncMessageSent alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultSent; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clear { - self.resultSent = [[OWSSignalServiceProtosSyncMessageSent alloc] init]; +- (SSKProtoSyncMessageSentBuilder*) clear { + self.resultSent = [[SSKProtoSyncMessageSent alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageSent builderWithPrototype:resultSent]; +- (SSKProtoSyncMessageSentBuilder*) clone { + return [SSKProtoSyncMessageSent builderWithPrototype:resultSent]; } -- (OWSSignalServiceProtosSyncMessageSent*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageSent defaultInstance]; +- (SSKProtoSyncMessageSent*) defaultInstance { + return [SSKProtoSyncMessageSent defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageSent*) build { +- (SSKProtoSyncMessageSent*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageSent*) buildPartial { - OWSSignalServiceProtosSyncMessageSent* returnMe = resultSent; +- (SSKProtoSyncMessageSent*) buildPartial { + SSKProtoSyncMessageSent* returnMe = resultSent; self.resultSent = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageSent*) other { - if (other == [OWSSignalServiceProtosSyncMessageSent defaultInstance]) { +- (SSKProtoSyncMessageSentBuilder*) mergeFrom:(SSKProtoSyncMessageSent*) other { + if (other == [SSKProtoSyncMessageSent defaultInstance]) { return self; } if (other.hasDestination) { @@ -8464,10 +8467,10 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageSentBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -8491,7 +8494,7 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM break; } case 26: { - OWSSignalServiceProtosDataMessageBuilder* subBuilder = [OWSSignalServiceProtosDataMessage builder]; + SSKProtoDataMessageBuilder* subBuilder = [SSKProtoDataMessage builder]; if (self.hasMessage) { [subBuilder mergeFrom:self.message]; } @@ -8512,12 +8515,12 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM - (NSString*) destination { return resultSent.destination; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setDestination:(NSString*) value { +- (SSKProtoSyncMessageSentBuilder*) setDestination:(NSString*) value { resultSent.hasDestination = YES; resultSent.destination = value; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearDestination { +- (SSKProtoSyncMessageSentBuilder*) clearDestination { resultSent.hasDestination = NO; resultSent.destination = @""; return self; @@ -8528,12 +8531,12 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM - (UInt64) timestamp { return resultSent.timestamp; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setTimestamp:(UInt64) value { +- (SSKProtoSyncMessageSentBuilder*) setTimestamp:(UInt64) value { resultSent.hasTimestamp = YES; resultSent.timestamp = value; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearTimestamp { +- (SSKProtoSyncMessageSentBuilder*) clearTimestamp { resultSent.hasTimestamp = NO; resultSent.timestamp = 0L; return self; @@ -8541,31 +8544,31 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM - (BOOL) hasMessage { return resultSent.hasMessage; } -- (OWSSignalServiceProtosDataMessage*) message { +- (SSKProtoDataMessage*) message { return resultSent.message; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setMessage:(OWSSignalServiceProtosDataMessage*) value { +- (SSKProtoSyncMessageSentBuilder*) setMessage:(SSKProtoDataMessage*) value { resultSent.hasMessage = YES; resultSent.message = value; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setMessageBuilder:(OWSSignalServiceProtosDataMessageBuilder*) builderForValue { +- (SSKProtoSyncMessageSentBuilder*) setMessageBuilder:(SSKProtoDataMessageBuilder*) builderForValue { return [self setMessage:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) mergeMessage:(OWSSignalServiceProtosDataMessage*) value { +- (SSKProtoSyncMessageSentBuilder*) mergeMessage:(SSKProtoDataMessage*) value { if (resultSent.hasMessage && - resultSent.message != [OWSSignalServiceProtosDataMessage defaultInstance]) { + resultSent.message != [SSKProtoDataMessage defaultInstance]) { resultSent.message = - [[[OWSSignalServiceProtosDataMessage builderWithPrototype:resultSent.message] mergeFrom:value] buildPartial]; + [[[SSKProtoDataMessage builderWithPrototype:resultSent.message] mergeFrom:value] buildPartial]; } else { resultSent.message = value; } resultSent.hasMessage = YES; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearMessage { +- (SSKProtoSyncMessageSentBuilder*) clearMessage { resultSent.hasMessage = NO; - resultSent.message = [OWSSignalServiceProtosDataMessage defaultInstance]; + resultSent.message = [SSKProtoDataMessage defaultInstance]; return self; } - (BOOL) hasExpirationStartTimestamp { @@ -8574,24 +8577,24 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM - (UInt64) expirationStartTimestamp { return resultSent.expirationStartTimestamp; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) setExpirationStartTimestamp:(UInt64) value { +- (SSKProtoSyncMessageSentBuilder*) setExpirationStartTimestamp:(UInt64) value { resultSent.hasExpirationStartTimestamp = YES; resultSent.expirationStartTimestamp = value; return self; } -- (OWSSignalServiceProtosSyncMessageSentBuilder*) clearExpirationStartTimestamp { +- (SSKProtoSyncMessageSentBuilder*) clearExpirationStartTimestamp { resultSent.hasExpirationStartTimestamp = NO; resultSent.expirationStartTimestamp = 0L; return self; } @end -@interface OWSSignalServiceProtosSyncMessageContacts () -@property (strong) OWSSignalServiceProtosAttachmentPointer* blob; +@interface SSKProtoSyncMessageContacts () +@property (strong) SSKProtoAttachmentPointer* blob; @property BOOL isComplete; @end -@implementation OWSSignalServiceProtosSyncMessageContacts +@implementation SSKProtoSyncMessageContacts - (BOOL) hasBlob { return !!hasBlob_; @@ -8614,22 +8617,22 @@ static OWSSignalServiceProtosSyncMessageSent* defaultOWSSignalServiceProtosSyncM } - (instancetype) init { if ((self = [super init])) { - self.blob = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + self.blob = [SSKProtoAttachmentPointer defaultInstance]; self.isComplete = NO; } return self; } -static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosSyncMessageContactsInstance = nil; +static SSKProtoSyncMessageContacts* defaultSSKProtoSyncMessageContactsInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageContacts class]) { - defaultOWSSignalServiceProtosSyncMessageContactsInstance = [[OWSSignalServiceProtosSyncMessageContacts alloc] init]; + if (self == [SSKProtoSyncMessageContacts class]) { + defaultSSKProtoSyncMessageContactsInstance = [[SSKProtoSyncMessageContacts alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageContactsInstance; + return defaultSSKProtoSyncMessageContactsInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageContactsInstance; + return defaultSSKProtoSyncMessageContactsInstance; } - (BOOL) isInitialized { return YES; @@ -8660,35 +8663,35 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageContacts*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageContacts*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageContacts*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageContacts*)[[[OWSSignalServiceProtosSyncMessageContacts builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageContacts*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageContacts*)[[[SSKProtoSyncMessageContacts builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageContactsBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageContactsBuilder alloc] init]; ++ (SSKProtoSyncMessageContactsBuilder*) builder { + return [[SSKProtoSyncMessageContactsBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageContactsBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageContacts*) prototype { - return [[OWSSignalServiceProtosSyncMessageContacts builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageContactsBuilder*) builderWithPrototype:(SSKProtoSyncMessageContacts*) prototype { + return [[SSKProtoSyncMessageContacts builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageContacts builder]; +- (SSKProtoSyncMessageContactsBuilder*) builder { + return [SSKProtoSyncMessageContacts builder]; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageContacts builderWithPrototype:self]; +- (SSKProtoSyncMessageContactsBuilder*) toBuilder { + return [SSKProtoSyncMessageContacts builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasBlob) { @@ -8717,10 +8720,10 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageContacts class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageContacts class]]) { return NO; } - OWSSignalServiceProtosSyncMessageContacts *otherMessage = other; + SSKProtoSyncMessageContacts *otherMessage = other; return self.hasBlob == otherMessage.hasBlob && (!self.hasBlob || [self.blob isEqual:otherMessage.blob]) && @@ -8741,42 +8744,42 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS } @end -@interface OWSSignalServiceProtosSyncMessageContactsBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageContacts* resultContacts; +@interface SSKProtoSyncMessageContactsBuilder() +@property (strong) SSKProtoSyncMessageContacts* resultContacts; @end -@implementation OWSSignalServiceProtosSyncMessageContactsBuilder +@implementation SSKProtoSyncMessageContactsBuilder @synthesize resultContacts; - (instancetype) init { if ((self = [super init])) { - self.resultContacts = [[OWSSignalServiceProtosSyncMessageContacts alloc] init]; + self.resultContacts = [[SSKProtoSyncMessageContacts alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultContacts; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clear { - self.resultContacts = [[OWSSignalServiceProtosSyncMessageContacts alloc] init]; +- (SSKProtoSyncMessageContactsBuilder*) clear { + self.resultContacts = [[SSKProtoSyncMessageContacts alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageContacts builderWithPrototype:resultContacts]; +- (SSKProtoSyncMessageContactsBuilder*) clone { + return [SSKProtoSyncMessageContacts builderWithPrototype:resultContacts]; } -- (OWSSignalServiceProtosSyncMessageContacts*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageContacts defaultInstance]; +- (SSKProtoSyncMessageContacts*) defaultInstance { + return [SSKProtoSyncMessageContacts defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageContacts*) build { +- (SSKProtoSyncMessageContacts*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageContacts*) buildPartial { - OWSSignalServiceProtosSyncMessageContacts* returnMe = resultContacts; +- (SSKProtoSyncMessageContacts*) buildPartial { + SSKProtoSyncMessageContacts* returnMe = resultContacts; self.resultContacts = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageContacts*) other { - if (other == [OWSSignalServiceProtosSyncMessageContacts defaultInstance]) { +- (SSKProtoSyncMessageContactsBuilder*) mergeFrom:(SSKProtoSyncMessageContacts*) other { + if (other == [SSKProtoSyncMessageContacts defaultInstance]) { return self; } if (other.hasBlob) { @@ -8788,10 +8791,10 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageContactsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -8807,7 +8810,7 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS break; } case 10: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; if (self.hasBlob) { [subBuilder mergeFrom:self.blob]; } @@ -8825,31 +8828,31 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS - (BOOL) hasBlob { return resultContacts.hasBlob; } -- (OWSSignalServiceProtosAttachmentPointer*) blob { +- (SSKProtoAttachmentPointer*) blob { return resultContacts.blob; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setBlob:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoSyncMessageContactsBuilder*) setBlob:(SSKProtoAttachmentPointer*) value { resultContacts.hasBlob = YES; resultContacts.blob = value; return self; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setBlobBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue { +- (SSKProtoSyncMessageContactsBuilder*) setBlobBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue { return [self setBlob:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) mergeBlob:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoSyncMessageContactsBuilder*) mergeBlob:(SSKProtoAttachmentPointer*) value { if (resultContacts.hasBlob && - resultContacts.blob != [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { + resultContacts.blob != [SSKProtoAttachmentPointer defaultInstance]) { resultContacts.blob = - [[[OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultContacts.blob] mergeFrom:value] buildPartial]; + [[[SSKProtoAttachmentPointer builderWithPrototype:resultContacts.blob] mergeFrom:value] buildPartial]; } else { resultContacts.blob = value; } resultContacts.hasBlob = YES; return self; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clearBlob { +- (SSKProtoSyncMessageContactsBuilder*) clearBlob { resultContacts.hasBlob = NO; - resultContacts.blob = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + resultContacts.blob = [SSKProtoAttachmentPointer defaultInstance]; return self; } - (BOOL) hasIsComplete { @@ -8858,23 +8861,23 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS - (BOOL) isComplete { return resultContacts.isComplete; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) setIsComplete:(BOOL) value { +- (SSKProtoSyncMessageContactsBuilder*) setIsComplete:(BOOL) value { resultContacts.hasIsComplete = YES; resultContacts.isComplete = value; return self; } -- (OWSSignalServiceProtosSyncMessageContactsBuilder*) clearIsComplete { +- (SSKProtoSyncMessageContactsBuilder*) clearIsComplete { resultContacts.hasIsComplete = NO; resultContacts.isComplete = NO; return self; } @end -@interface OWSSignalServiceProtosSyncMessageGroups () -@property (strong) OWSSignalServiceProtosAttachmentPointer* blob; +@interface SSKProtoSyncMessageGroups () +@property (strong) SSKProtoAttachmentPointer* blob; @end -@implementation OWSSignalServiceProtosSyncMessageGroups +@implementation SSKProtoSyncMessageGroups - (BOOL) hasBlob { return !!hasBlob_; @@ -8885,21 +8888,21 @@ static OWSSignalServiceProtosSyncMessageContacts* defaultOWSSignalServiceProtosS @synthesize blob; - (instancetype) init { if ((self = [super init])) { - self.blob = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + self.blob = [SSKProtoAttachmentPointer defaultInstance]; } return self; } -static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyncMessageGroupsInstance = nil; +static SSKProtoSyncMessageGroups* defaultSSKProtoSyncMessageGroupsInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageGroups class]) { - defaultOWSSignalServiceProtosSyncMessageGroupsInstance = [[OWSSignalServiceProtosSyncMessageGroups alloc] init]; + if (self == [SSKProtoSyncMessageGroups class]) { + defaultSSKProtoSyncMessageGroupsInstance = [[SSKProtoSyncMessageGroups alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageGroupsInstance; + return defaultSSKProtoSyncMessageGroupsInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageGroupsInstance; + return defaultSSKProtoSyncMessageGroupsInstance; } - (BOOL) isInitialized { return YES; @@ -8924,35 +8927,35 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageGroups*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageGroups*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageGroups*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageGroups*)[[[OWSSignalServiceProtosSyncMessageGroups builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageGroups*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageGroups*)[[[SSKProtoSyncMessageGroups builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageGroupsBuilder alloc] init]; ++ (SSKProtoSyncMessageGroupsBuilder*) builder { + return [[SSKProtoSyncMessageGroupsBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageGroups*) prototype { - return [[OWSSignalServiceProtosSyncMessageGroups builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageGroupsBuilder*) builderWithPrototype:(SSKProtoSyncMessageGroups*) prototype { + return [[SSKProtoSyncMessageGroups builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageGroups builder]; +- (SSKProtoSyncMessageGroupsBuilder*) builder { + return [SSKProtoSyncMessageGroups builder]; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageGroups builderWithPrototype:self]; +- (SSKProtoSyncMessageGroupsBuilder*) toBuilder { + return [SSKProtoSyncMessageGroups builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasBlob) { @@ -8975,10 +8978,10 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageGroups class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageGroups class]]) { return NO; } - OWSSignalServiceProtosSyncMessageGroups *otherMessage = other; + SSKProtoSyncMessageGroups *otherMessage = other; return self.hasBlob == otherMessage.hasBlob && (!self.hasBlob || [self.blob isEqual:otherMessage.blob]) && @@ -8994,42 +8997,42 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn } @end -@interface OWSSignalServiceProtosSyncMessageGroupsBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageGroups* resultGroups; +@interface SSKProtoSyncMessageGroupsBuilder() +@property (strong) SSKProtoSyncMessageGroups* resultGroups; @end -@implementation OWSSignalServiceProtosSyncMessageGroupsBuilder +@implementation SSKProtoSyncMessageGroupsBuilder @synthesize resultGroups; - (instancetype) init { if ((self = [super init])) { - self.resultGroups = [[OWSSignalServiceProtosSyncMessageGroups alloc] init]; + self.resultGroups = [[SSKProtoSyncMessageGroups alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultGroups; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clear { - self.resultGroups = [[OWSSignalServiceProtosSyncMessageGroups alloc] init]; +- (SSKProtoSyncMessageGroupsBuilder*) clear { + self.resultGroups = [[SSKProtoSyncMessageGroups alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageGroups builderWithPrototype:resultGroups]; +- (SSKProtoSyncMessageGroupsBuilder*) clone { + return [SSKProtoSyncMessageGroups builderWithPrototype:resultGroups]; } -- (OWSSignalServiceProtosSyncMessageGroups*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageGroups defaultInstance]; +- (SSKProtoSyncMessageGroups*) defaultInstance { + return [SSKProtoSyncMessageGroups defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageGroups*) build { +- (SSKProtoSyncMessageGroups*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageGroups*) buildPartial { - OWSSignalServiceProtosSyncMessageGroups* returnMe = resultGroups; +- (SSKProtoSyncMessageGroups*) buildPartial { + SSKProtoSyncMessageGroups* returnMe = resultGroups; self.resultGroups = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageGroups*) other { - if (other == [OWSSignalServiceProtosSyncMessageGroups defaultInstance]) { +- (SSKProtoSyncMessageGroupsBuilder*) mergeFrom:(SSKProtoSyncMessageGroups*) other { + if (other == [SSKProtoSyncMessageGroups defaultInstance]) { return self; } if (other.hasBlob) { @@ -9038,10 +9041,10 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageGroupsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -9057,7 +9060,7 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn break; } case 10: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; if (self.hasBlob) { [subBuilder mergeFrom:self.blob]; } @@ -9071,40 +9074,40 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn - (BOOL) hasBlob { return resultGroups.hasBlob; } -- (OWSSignalServiceProtosAttachmentPointer*) blob { +- (SSKProtoAttachmentPointer*) blob { return resultGroups.blob; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) setBlob:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoSyncMessageGroupsBuilder*) setBlob:(SSKProtoAttachmentPointer*) value { resultGroups.hasBlob = YES; resultGroups.blob = value; return self; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) setBlobBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue { +- (SSKProtoSyncMessageGroupsBuilder*) setBlobBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue { return [self setBlob:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) mergeBlob:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoSyncMessageGroupsBuilder*) mergeBlob:(SSKProtoAttachmentPointer*) value { if (resultGroups.hasBlob && - resultGroups.blob != [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { + resultGroups.blob != [SSKProtoAttachmentPointer defaultInstance]) { resultGroups.blob = - [[[OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultGroups.blob] mergeFrom:value] buildPartial]; + [[[SSKProtoAttachmentPointer builderWithPrototype:resultGroups.blob] mergeFrom:value] buildPartial]; } else { resultGroups.blob = value; } resultGroups.hasBlob = YES; return self; } -- (OWSSignalServiceProtosSyncMessageGroupsBuilder*) clearBlob { +- (SSKProtoSyncMessageGroupsBuilder*) clearBlob { resultGroups.hasBlob = NO; - resultGroups.blob = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + resultGroups.blob = [SSKProtoAttachmentPointer defaultInstance]; return self; } @end -@interface OWSSignalServiceProtosSyncMessageBlocked () +@interface SSKProtoSyncMessageBlocked () @property (strong) NSMutableArray * numbersArray; @end -@implementation OWSSignalServiceProtosSyncMessageBlocked +@implementation SSKProtoSyncMessageBlocked @synthesize numbersArray; @dynamic numbers; @@ -9113,17 +9116,17 @@ static OWSSignalServiceProtosSyncMessageGroups* defaultOWSSignalServiceProtosSyn } return self; } -static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSyncMessageBlockedInstance = nil; +static SSKProtoSyncMessageBlocked* defaultSSKProtoSyncMessageBlockedInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageBlocked class]) { - defaultOWSSignalServiceProtosSyncMessageBlockedInstance = [[OWSSignalServiceProtosSyncMessageBlocked alloc] init]; + if (self == [SSKProtoSyncMessageBlocked class]) { + defaultSSKProtoSyncMessageBlockedInstance = [[SSKProtoSyncMessageBlocked alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageBlockedInstance; + return defaultSSKProtoSyncMessageBlockedInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageBlockedInstance; + return defaultSSKProtoSyncMessageBlockedInstance; } - (NSArray *)numbers { return numbersArray; @@ -9160,35 +9163,35 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageBlocked*)[[[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageBlocked*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageBlocked*)[[[SSKProtoSyncMessageBlocked builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageBlockedBuilder alloc] init]; ++ (SSKProtoSyncMessageBlockedBuilder*) builder { + return [[SSKProtoSyncMessageBlockedBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageBlocked*) prototype { - return [[OWSSignalServiceProtosSyncMessageBlocked builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageBlockedBuilder*) builderWithPrototype:(SSKProtoSyncMessageBlocked*) prototype { + return [[SSKProtoSyncMessageBlocked builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageBlocked builder]; +- (SSKProtoSyncMessageBlockedBuilder*) builder { + return [SSKProtoSyncMessageBlocked builder]; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageBlocked builderWithPrototype:self]; +- (SSKProtoSyncMessageBlockedBuilder*) toBuilder { + return [SSKProtoSyncMessageBlocked builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { [self.numbersArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { @@ -9204,10 +9207,10 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageBlocked class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageBlocked class]]) { return NO; } - OWSSignalServiceProtosSyncMessageBlocked *otherMessage = other; + SSKProtoSyncMessageBlocked *otherMessage = other; return [self.numbersArray isEqualToArray:otherMessage.numbersArray] && (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); @@ -9222,42 +9225,42 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy } @end -@interface OWSSignalServiceProtosSyncMessageBlockedBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageBlocked* resultBlocked; +@interface SSKProtoSyncMessageBlockedBuilder() +@property (strong) SSKProtoSyncMessageBlocked* resultBlocked; @end -@implementation OWSSignalServiceProtosSyncMessageBlockedBuilder +@implementation SSKProtoSyncMessageBlockedBuilder @synthesize resultBlocked; - (instancetype) init { if ((self = [super init])) { - self.resultBlocked = [[OWSSignalServiceProtosSyncMessageBlocked alloc] init]; + self.resultBlocked = [[SSKProtoSyncMessageBlocked alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultBlocked; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) clear { - self.resultBlocked = [[OWSSignalServiceProtosSyncMessageBlocked alloc] init]; +- (SSKProtoSyncMessageBlockedBuilder*) clear { + self.resultBlocked = [[SSKProtoSyncMessageBlocked alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageBlocked builderWithPrototype:resultBlocked]; +- (SSKProtoSyncMessageBlockedBuilder*) clone { + return [SSKProtoSyncMessageBlocked builderWithPrototype:resultBlocked]; } -- (OWSSignalServiceProtosSyncMessageBlocked*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageBlocked defaultInstance]; +- (SSKProtoSyncMessageBlocked*) defaultInstance { + return [SSKProtoSyncMessageBlocked defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageBlocked*) build { +- (SSKProtoSyncMessageBlocked*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageBlocked*) buildPartial { - OWSSignalServiceProtosSyncMessageBlocked* returnMe = resultBlocked; +- (SSKProtoSyncMessageBlocked*) buildPartial { + SSKProtoSyncMessageBlocked* returnMe = resultBlocked; self.resultBlocked = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageBlocked*) other { - if (other == [OWSSignalServiceProtosSyncMessageBlocked defaultInstance]) { +- (SSKProtoSyncMessageBlockedBuilder*) mergeFrom:(SSKProtoSyncMessageBlocked*) other { + if (other == [SSKProtoSyncMessageBlocked defaultInstance]) { return self; } if (other.numbersArray.count > 0) { @@ -9270,10 +9273,10 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageBlockedBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -9301,28 +9304,28 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy - (NSString*)numbersAtIndex:(NSUInteger)index { return [resultBlocked numbersAtIndex:index]; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)addNumbers:(NSString*)value { +- (SSKProtoSyncMessageBlockedBuilder *)addNumbers:(NSString*)value { if (resultBlocked.numbersArray == nil) { resultBlocked.numbersArray = [[NSMutableArray alloc]init]; } [resultBlocked.numbersArray addObject:value]; return self; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)setNumbersArray:(NSArray *)array { +- (SSKProtoSyncMessageBlockedBuilder *)setNumbersArray:(NSArray *)array { resultBlocked.numbersArray = [[NSMutableArray alloc] initWithArray:array]; return self; } -- (OWSSignalServiceProtosSyncMessageBlockedBuilder *)clearNumbers { +- (SSKProtoSyncMessageBlockedBuilder *)clearNumbers { resultBlocked.numbersArray = nil; return self; } @end -@interface OWSSignalServiceProtosSyncMessageRequest () -@property OWSSignalServiceProtosSyncMessageRequestType type; +@interface SSKProtoSyncMessageRequest () +@property SSKProtoSyncMessageRequestType type; @end -@implementation OWSSignalServiceProtosSyncMessageRequest +@implementation SSKProtoSyncMessageRequest - (BOOL) hasType { return !!hasType_; @@ -9333,21 +9336,21 @@ static OWSSignalServiceProtosSyncMessageBlocked* defaultOWSSignalServiceProtosSy @synthesize type; - (instancetype) init { if ((self = [super init])) { - self.type = OWSSignalServiceProtosSyncMessageRequestTypeUnknown; + self.type = SSKProtoSyncMessageRequestTypeUnknown; } return self; } -static OWSSignalServiceProtosSyncMessageRequest* defaultOWSSignalServiceProtosSyncMessageRequestInstance = nil; +static SSKProtoSyncMessageRequest* defaultSSKProtoSyncMessageRequestInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageRequest class]) { - defaultOWSSignalServiceProtosSyncMessageRequestInstance = [[OWSSignalServiceProtosSyncMessageRequest alloc] init]; + if (self == [SSKProtoSyncMessageRequest class]) { + defaultSSKProtoSyncMessageRequestInstance = [[SSKProtoSyncMessageRequest alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageRequestInstance; + return defaultSSKProtoSyncMessageRequestInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageRequestInstance; + return defaultSSKProtoSyncMessageRequestInstance; } - (BOOL) isInitialized { return YES; @@ -9372,39 +9375,39 @@ static OWSSignalServiceProtosSyncMessageRequest* defaultOWSSignalServiceProtosSy memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageRequest*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRequest*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRequest*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRequest*)[[[OWSSignalServiceProtosSyncMessageRequest builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRequest*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRequest*)[[[SSKProtoSyncMessageRequest builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageRequestBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageRequestBuilder alloc] init]; ++ (SSKProtoSyncMessageRequestBuilder*) builder { + return [[SSKProtoSyncMessageRequestBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageRequestBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageRequest*) prototype { - return [[OWSSignalServiceProtosSyncMessageRequest builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageRequestBuilder*) builderWithPrototype:(SSKProtoSyncMessageRequest*) prototype { + return [[SSKProtoSyncMessageRequest builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageRequest builder]; +- (SSKProtoSyncMessageRequestBuilder*) builder { + return [SSKProtoSyncMessageRequest builder]; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageRequest builderWithPrototype:self]; +- (SSKProtoSyncMessageRequestBuilder*) toBuilder { + return [SSKProtoSyncMessageRequest builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosSyncMessageRequestType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoSyncMessageRequestType(self.type)]; } [self.unknownFields writeDescriptionTo:output withIndent:indent]; } @@ -9418,10 +9421,10 @@ static OWSSignalServiceProtosSyncMessageRequest* defaultOWSSignalServiceProtosSy if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageRequest class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageRequest class]]) { return NO; } - OWSSignalServiceProtosSyncMessageRequest *otherMessage = other; + SSKProtoSyncMessageRequest *otherMessage = other; return self.hasType == otherMessage.hasType && (!self.hasType || self.type == otherMessage.type) && @@ -9437,71 +9440,71 @@ static OWSSignalServiceProtosSyncMessageRequest* defaultOWSSignalServiceProtosSy } @end -BOOL OWSSignalServiceProtosSyncMessageRequestTypeIsValidValue(OWSSignalServiceProtosSyncMessageRequestType value) { +BOOL SSKProtoSyncMessageRequestTypeIsValidValue(SSKProtoSyncMessageRequestType value) { switch (value) { - case OWSSignalServiceProtosSyncMessageRequestTypeUnknown: - case OWSSignalServiceProtosSyncMessageRequestTypeContacts: - case OWSSignalServiceProtosSyncMessageRequestTypeGroups: - case OWSSignalServiceProtosSyncMessageRequestTypeBlocked: - case OWSSignalServiceProtosSyncMessageRequestTypeConfiguration: + case SSKProtoSyncMessageRequestTypeUnknown: + case SSKProtoSyncMessageRequestTypeContacts: + case SSKProtoSyncMessageRequestTypeGroups: + case SSKProtoSyncMessageRequestTypeBlocked: + case SSKProtoSyncMessageRequestTypeConfiguration: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServiceProtosSyncMessageRequestType value) { +NSString *NSStringFromSSKProtoSyncMessageRequestType(SSKProtoSyncMessageRequestType value) { switch (value) { - case OWSSignalServiceProtosSyncMessageRequestTypeUnknown: - return @"OWSSignalServiceProtosSyncMessageRequestTypeUnknown"; - case OWSSignalServiceProtosSyncMessageRequestTypeContacts: - return @"OWSSignalServiceProtosSyncMessageRequestTypeContacts"; - case OWSSignalServiceProtosSyncMessageRequestTypeGroups: - return @"OWSSignalServiceProtosSyncMessageRequestTypeGroups"; - case OWSSignalServiceProtosSyncMessageRequestTypeBlocked: - return @"OWSSignalServiceProtosSyncMessageRequestTypeBlocked"; - case OWSSignalServiceProtosSyncMessageRequestTypeConfiguration: - return @"OWSSignalServiceProtosSyncMessageRequestTypeConfiguration"; + case SSKProtoSyncMessageRequestTypeUnknown: + return @"SSKProtoSyncMessageRequestTypeUnknown"; + case SSKProtoSyncMessageRequestTypeContacts: + return @"SSKProtoSyncMessageRequestTypeContacts"; + case SSKProtoSyncMessageRequestTypeGroups: + return @"SSKProtoSyncMessageRequestTypeGroups"; + case SSKProtoSyncMessageRequestTypeBlocked: + return @"SSKProtoSyncMessageRequestTypeBlocked"; + case SSKProtoSyncMessageRequestTypeConfiguration: + return @"SSKProtoSyncMessageRequestTypeConfiguration"; default: return nil; } } -@interface OWSSignalServiceProtosSyncMessageRequestBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageRequest* resultRequest; +@interface SSKProtoSyncMessageRequestBuilder() +@property (strong) SSKProtoSyncMessageRequest* resultRequest; @end -@implementation OWSSignalServiceProtosSyncMessageRequestBuilder +@implementation SSKProtoSyncMessageRequestBuilder @synthesize resultRequest; - (instancetype) init { if ((self = [super init])) { - self.resultRequest = [[OWSSignalServiceProtosSyncMessageRequest alloc] init]; + self.resultRequest = [[SSKProtoSyncMessageRequest alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultRequest; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clear { - self.resultRequest = [[OWSSignalServiceProtosSyncMessageRequest alloc] init]; +- (SSKProtoSyncMessageRequestBuilder*) clear { + self.resultRequest = [[SSKProtoSyncMessageRequest alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageRequest builderWithPrototype:resultRequest]; +- (SSKProtoSyncMessageRequestBuilder*) clone { + return [SSKProtoSyncMessageRequest builderWithPrototype:resultRequest]; } -- (OWSSignalServiceProtosSyncMessageRequest*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageRequest defaultInstance]; +- (SSKProtoSyncMessageRequest*) defaultInstance { + return [SSKProtoSyncMessageRequest defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageRequest*) build { +- (SSKProtoSyncMessageRequest*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageRequest*) buildPartial { - OWSSignalServiceProtosSyncMessageRequest* returnMe = resultRequest; +- (SSKProtoSyncMessageRequest*) buildPartial { + SSKProtoSyncMessageRequest* returnMe = resultRequest; self.resultRequest = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageRequest*) other { - if (other == [OWSSignalServiceProtosSyncMessageRequest defaultInstance]) { +- (SSKProtoSyncMessageRequestBuilder*) mergeFrom:(SSKProtoSyncMessageRequest*) other { + if (other == [SSKProtoSyncMessageRequest defaultInstance]) { return self; } if (other.hasType) { @@ -9510,10 +9513,10 @@ NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServ [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageRequestBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -9529,8 +9532,8 @@ NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServ break; } case 8: { - OWSSignalServiceProtosSyncMessageRequestType value = (OWSSignalServiceProtosSyncMessageRequestType)[input readEnum]; - if (OWSSignalServiceProtosSyncMessageRequestTypeIsValidValue(value)) { + SSKProtoSyncMessageRequestType value = (SSKProtoSyncMessageRequestType)[input readEnum]; + if (SSKProtoSyncMessageRequestTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:1 value:value]; @@ -9543,27 +9546,27 @@ NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServ - (BOOL) hasType { return resultRequest.hasType; } -- (OWSSignalServiceProtosSyncMessageRequestType) type { +- (SSKProtoSyncMessageRequestType) type { return resultRequest.type; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) setType:(OWSSignalServiceProtosSyncMessageRequestType) value { +- (SSKProtoSyncMessageRequestBuilder*) setType:(SSKProtoSyncMessageRequestType) value { resultRequest.hasType = YES; resultRequest.type = value; return self; } -- (OWSSignalServiceProtosSyncMessageRequestBuilder*) clearType { +- (SSKProtoSyncMessageRequestBuilder*) clearType { resultRequest.hasType = NO; - resultRequest.type = OWSSignalServiceProtosSyncMessageRequestTypeUnknown; + resultRequest.type = SSKProtoSyncMessageRequestTypeUnknown; return self; } @end -@interface OWSSignalServiceProtosSyncMessageRead () +@interface SSKProtoSyncMessageRead () @property (strong) NSString* sender; @property UInt64 timestamp; @end -@implementation OWSSignalServiceProtosSyncMessageRead +@implementation SSKProtoSyncMessageRead - (BOOL) hasSender { return !!hasSender_; @@ -9586,17 +9589,17 @@ NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServ } return self; } -static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncMessageReadInstance = nil; +static SSKProtoSyncMessageRead* defaultSSKProtoSyncMessageReadInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageRead class]) { - defaultOWSSignalServiceProtosSyncMessageReadInstance = [[OWSSignalServiceProtosSyncMessageRead alloc] init]; + if (self == [SSKProtoSyncMessageRead class]) { + defaultSSKProtoSyncMessageReadInstance = [[SSKProtoSyncMessageRead alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageReadInstance; + return defaultSSKProtoSyncMessageReadInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageReadInstance; + return defaultSSKProtoSyncMessageReadInstance; } - (BOOL) isInitialized { return YES; @@ -9627,35 +9630,35 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageRead*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRead*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageRead*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRead*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageRead*)[[[OWSSignalServiceProtosSyncMessageRead builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageRead*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageRead*)[[[SSKProtoSyncMessageRead builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageReadBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageReadBuilder alloc] init]; ++ (SSKProtoSyncMessageReadBuilder*) builder { + return [[SSKProtoSyncMessageReadBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageReadBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageRead*) prototype { - return [[OWSSignalServiceProtosSyncMessageRead builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageReadBuilder*) builderWithPrototype:(SSKProtoSyncMessageRead*) prototype { + return [[SSKProtoSyncMessageRead builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageRead builder]; +- (SSKProtoSyncMessageReadBuilder*) builder { + return [SSKProtoSyncMessageRead builder]; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageRead builderWithPrototype:self]; +- (SSKProtoSyncMessageReadBuilder*) toBuilder { + return [SSKProtoSyncMessageRead builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasSender) { @@ -9679,10 +9682,10 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageRead class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageRead class]]) { return NO; } - OWSSignalServiceProtosSyncMessageRead *otherMessage = other; + SSKProtoSyncMessageRead *otherMessage = other; return self.hasSender == otherMessage.hasSender && (!self.hasSender || [self.sender isEqual:otherMessage.sender]) && @@ -9703,42 +9706,42 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM } @end -@interface OWSSignalServiceProtosSyncMessageReadBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageRead* resultRead; +@interface SSKProtoSyncMessageReadBuilder() +@property (strong) SSKProtoSyncMessageRead* resultRead; @end -@implementation OWSSignalServiceProtosSyncMessageReadBuilder +@implementation SSKProtoSyncMessageReadBuilder @synthesize resultRead; - (instancetype) init { if ((self = [super init])) { - self.resultRead = [[OWSSignalServiceProtosSyncMessageRead alloc] init]; + self.resultRead = [[SSKProtoSyncMessageRead alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultRead; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clear { - self.resultRead = [[OWSSignalServiceProtosSyncMessageRead alloc] init]; +- (SSKProtoSyncMessageReadBuilder*) clear { + self.resultRead = [[SSKProtoSyncMessageRead alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageRead builderWithPrototype:resultRead]; +- (SSKProtoSyncMessageReadBuilder*) clone { + return [SSKProtoSyncMessageRead builderWithPrototype:resultRead]; } -- (OWSSignalServiceProtosSyncMessageRead*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageRead defaultInstance]; +- (SSKProtoSyncMessageRead*) defaultInstance { + return [SSKProtoSyncMessageRead defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageRead*) build { +- (SSKProtoSyncMessageRead*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageRead*) buildPartial { - OWSSignalServiceProtosSyncMessageRead* returnMe = resultRead; +- (SSKProtoSyncMessageRead*) buildPartial { + SSKProtoSyncMessageRead* returnMe = resultRead; self.resultRead = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageRead*) other { - if (other == [OWSSignalServiceProtosSyncMessageRead defaultInstance]) { +- (SSKProtoSyncMessageReadBuilder*) mergeFrom:(SSKProtoSyncMessageRead*) other { + if (other == [SSKProtoSyncMessageRead defaultInstance]) { return self; } if (other.hasSender) { @@ -9750,10 +9753,10 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageReadBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -9785,12 +9788,12 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM - (NSString*) sender { return resultRead.sender; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) setSender:(NSString*) value { +- (SSKProtoSyncMessageReadBuilder*) setSender:(NSString*) value { resultRead.hasSender = YES; resultRead.sender = value; return self; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clearSender { +- (SSKProtoSyncMessageReadBuilder*) clearSender { resultRead.hasSender = NO; resultRead.sender = @""; return self; @@ -9801,23 +9804,23 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM - (UInt64) timestamp { return resultRead.timestamp; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) setTimestamp:(UInt64) value { +- (SSKProtoSyncMessageReadBuilder*) setTimestamp:(UInt64) value { resultRead.hasTimestamp = YES; resultRead.timestamp = value; return self; } -- (OWSSignalServiceProtosSyncMessageReadBuilder*) clearTimestamp { +- (SSKProtoSyncMessageReadBuilder*) clearTimestamp { resultRead.hasTimestamp = NO; resultRead.timestamp = 0L; return self; } @end -@interface OWSSignalServiceProtosSyncMessageConfiguration () +@interface SSKProtoSyncMessageConfiguration () @property BOOL readReceipts; @end -@implementation OWSSignalServiceProtosSyncMessageConfiguration +@implementation SSKProtoSyncMessageConfiguration - (BOOL) hasReadReceipts { return !!hasReadReceipts_; @@ -9837,17 +9840,17 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM } return self; } -static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServiceProtosSyncMessageConfigurationInstance = nil; +static SSKProtoSyncMessageConfiguration* defaultSSKProtoSyncMessageConfigurationInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosSyncMessageConfiguration class]) { - defaultOWSSignalServiceProtosSyncMessageConfigurationInstance = [[OWSSignalServiceProtosSyncMessageConfiguration alloc] init]; + if (self == [SSKProtoSyncMessageConfiguration class]) { + defaultSSKProtoSyncMessageConfigurationInstance = [[SSKProtoSyncMessageConfiguration alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageConfigurationInstance; + return defaultSSKProtoSyncMessageConfigurationInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosSyncMessageConfigurationInstance; + return defaultSSKProtoSyncMessageConfigurationInstance; } - (BOOL) isInitialized { return YES; @@ -9872,35 +9875,35 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromData:data] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromData:(NSData*) data { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromInputStream:input] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosSyncMessageConfiguration*)[[[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoSyncMessageConfiguration*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoSyncMessageConfiguration*)[[[SSKProtoSyncMessageConfiguration builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builder { - return [[OWSSignalServiceProtosSyncMessageConfigurationBuilder alloc] init]; ++ (SSKProtoSyncMessageConfigurationBuilder*) builder { + return [[SSKProtoSyncMessageConfigurationBuilder alloc] init]; } -+ (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builderWithPrototype:(OWSSignalServiceProtosSyncMessageConfiguration*) prototype { - return [[OWSSignalServiceProtosSyncMessageConfiguration builder] mergeFrom:prototype]; ++ (SSKProtoSyncMessageConfigurationBuilder*) builderWithPrototype:(SSKProtoSyncMessageConfiguration*) prototype { + return [[SSKProtoSyncMessageConfiguration builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builder { - return [OWSSignalServiceProtosSyncMessageConfiguration builder]; +- (SSKProtoSyncMessageConfigurationBuilder*) builder { + return [SSKProtoSyncMessageConfiguration builder]; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) toBuilder { - return [OWSSignalServiceProtosSyncMessageConfiguration builderWithPrototype:self]; +- (SSKProtoSyncMessageConfigurationBuilder*) toBuilder { + return [SSKProtoSyncMessageConfiguration builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasReadReceipts) { @@ -9918,10 +9921,10 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosSyncMessageConfiguration class]]) { + if (![other isKindOfClass:[SSKProtoSyncMessageConfiguration class]]) { return NO; } - OWSSignalServiceProtosSyncMessageConfiguration *otherMessage = other; + SSKProtoSyncMessageConfiguration *otherMessage = other; return self.hasReadReceipts == otherMessage.hasReadReceipts && (!self.hasReadReceipts || self.readReceipts == otherMessage.readReceipts) && @@ -9937,42 +9940,42 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr } @end -@interface OWSSignalServiceProtosSyncMessageConfigurationBuilder() -@property (strong) OWSSignalServiceProtosSyncMessageConfiguration* resultConfiguration; +@interface SSKProtoSyncMessageConfigurationBuilder() +@property (strong) SSKProtoSyncMessageConfiguration* resultConfiguration; @end -@implementation OWSSignalServiceProtosSyncMessageConfigurationBuilder +@implementation SSKProtoSyncMessageConfigurationBuilder @synthesize resultConfiguration; - (instancetype) init { if ((self = [super init])) { - self.resultConfiguration = [[OWSSignalServiceProtosSyncMessageConfiguration alloc] init]; + self.resultConfiguration = [[SSKProtoSyncMessageConfiguration alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultConfiguration; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clear { - self.resultConfiguration = [[OWSSignalServiceProtosSyncMessageConfiguration alloc] init]; +- (SSKProtoSyncMessageConfigurationBuilder*) clear { + self.resultConfiguration = [[SSKProtoSyncMessageConfiguration alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clone { - return [OWSSignalServiceProtosSyncMessageConfiguration builderWithPrototype:resultConfiguration]; +- (SSKProtoSyncMessageConfigurationBuilder*) clone { + return [SSKProtoSyncMessageConfiguration builderWithPrototype:resultConfiguration]; } -- (OWSSignalServiceProtosSyncMessageConfiguration*) defaultInstance { - return [OWSSignalServiceProtosSyncMessageConfiguration defaultInstance]; +- (SSKProtoSyncMessageConfiguration*) defaultInstance { + return [SSKProtoSyncMessageConfiguration defaultInstance]; } -- (OWSSignalServiceProtosSyncMessageConfiguration*) build { +- (SSKProtoSyncMessageConfiguration*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessageConfiguration*) buildPartial { - OWSSignalServiceProtosSyncMessageConfiguration* returnMe = resultConfiguration; +- (SSKProtoSyncMessageConfiguration*) buildPartial { + SSKProtoSyncMessageConfiguration* returnMe = resultConfiguration; self.resultConfiguration = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessageConfiguration*) other { - if (other == [OWSSignalServiceProtosSyncMessageConfiguration defaultInstance]) { +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFrom:(SSKProtoSyncMessageConfiguration*) other { + if (other == [SSKProtoSyncMessageConfiguration defaultInstance]) { return self; } if (other.hasReadReceipts) { @@ -9981,10 +9984,10 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageConfigurationBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -10012,54 +10015,54 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr - (BOOL) readReceipts { return resultConfiguration.readReceipts; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) setReadReceipts:(BOOL) value { +- (SSKProtoSyncMessageConfigurationBuilder*) setReadReceipts:(BOOL) value { resultConfiguration.hasReadReceipts = YES; resultConfiguration.readReceipts = value; return self; } -- (OWSSignalServiceProtosSyncMessageConfigurationBuilder*) clearReadReceipts { +- (SSKProtoSyncMessageConfigurationBuilder*) clearReadReceipts { resultConfiguration.hasReadReceipts = NO; resultConfiguration.readReceipts = NO; return self; } @end -@interface OWSSignalServiceProtosSyncMessageBuilder() -@property (strong) OWSSignalServiceProtosSyncMessage* resultSyncMessage; +@interface SSKProtoSyncMessageBuilder() +@property (strong) SSKProtoSyncMessage* resultSyncMessage; @end -@implementation OWSSignalServiceProtosSyncMessageBuilder +@implementation SSKProtoSyncMessageBuilder @synthesize resultSyncMessage; - (instancetype) init { if ((self = [super init])) { - self.resultSyncMessage = [[OWSSignalServiceProtosSyncMessage alloc] init]; + self.resultSyncMessage = [[SSKProtoSyncMessage alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultSyncMessage; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clear { - self.resultSyncMessage = [[OWSSignalServiceProtosSyncMessage alloc] init]; +- (SSKProtoSyncMessageBuilder*) clear { + self.resultSyncMessage = [[SSKProtoSyncMessage alloc] init]; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clone { - return [OWSSignalServiceProtosSyncMessage builderWithPrototype:resultSyncMessage]; +- (SSKProtoSyncMessageBuilder*) clone { + return [SSKProtoSyncMessage builderWithPrototype:resultSyncMessage]; } -- (OWSSignalServiceProtosSyncMessage*) defaultInstance { - return [OWSSignalServiceProtosSyncMessage defaultInstance]; +- (SSKProtoSyncMessage*) defaultInstance { + return [SSKProtoSyncMessage defaultInstance]; } -- (OWSSignalServiceProtosSyncMessage*) build { +- (SSKProtoSyncMessage*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosSyncMessage*) buildPartial { - OWSSignalServiceProtosSyncMessage* returnMe = resultSyncMessage; +- (SSKProtoSyncMessage*) buildPartial { + SSKProtoSyncMessage* returnMe = resultSyncMessage; self.resultSyncMessage = nil; return returnMe; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFrom:(OWSSignalServiceProtosSyncMessage*) other { - if (other == [OWSSignalServiceProtosSyncMessage defaultInstance]) { +- (SSKProtoSyncMessageBuilder*) mergeFrom:(SSKProtoSyncMessage*) other { + if (other == [SSKProtoSyncMessage defaultInstance]) { return self; } if (other.hasSent) { @@ -10096,10 +10099,10 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoSyncMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -10115,7 +10118,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 10: { - OWSSignalServiceProtosSyncMessageSentBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageSent builder]; + SSKProtoSyncMessageSentBuilder* subBuilder = [SSKProtoSyncMessageSent builder]; if (self.hasSent) { [subBuilder mergeFrom:self.sent]; } @@ -10124,7 +10127,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 18: { - OWSSignalServiceProtosSyncMessageContactsBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageContacts builder]; + SSKProtoSyncMessageContactsBuilder* subBuilder = [SSKProtoSyncMessageContacts builder]; if (self.hasContacts) { [subBuilder mergeFrom:self.contacts]; } @@ -10133,7 +10136,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 26: { - OWSSignalServiceProtosSyncMessageGroupsBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageGroups builder]; + SSKProtoSyncMessageGroupsBuilder* subBuilder = [SSKProtoSyncMessageGroups builder]; if (self.hasGroups) { [subBuilder mergeFrom:self.groups]; } @@ -10142,7 +10145,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 34: { - OWSSignalServiceProtosSyncMessageRequestBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageRequest builder]; + SSKProtoSyncMessageRequestBuilder* subBuilder = [SSKProtoSyncMessageRequest builder]; if (self.hasRequest) { [subBuilder mergeFrom:self.request]; } @@ -10151,13 +10154,13 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 42: { - OWSSignalServiceProtosSyncMessageReadBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageRead builder]; + SSKProtoSyncMessageReadBuilder* subBuilder = [SSKProtoSyncMessageRead builder]; [input readMessage:subBuilder extensionRegistry:extensionRegistry]; [self addRead:[subBuilder buildPartial]]; break; } case 50: { - OWSSignalServiceProtosSyncMessageBlockedBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageBlocked builder]; + SSKProtoSyncMessageBlockedBuilder* subBuilder = [SSKProtoSyncMessageBlocked builder]; if (self.hasBlocked) { [subBuilder mergeFrom:self.blocked]; } @@ -10166,7 +10169,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 58: { - OWSSignalServiceProtosVerifiedBuilder* subBuilder = [OWSSignalServiceProtosVerified builder]; + SSKProtoVerifiedBuilder* subBuilder = [SSKProtoVerified builder]; if (self.hasVerified) { [subBuilder mergeFrom:self.verified]; } @@ -10179,7 +10182,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr break; } case 74: { - OWSSignalServiceProtosSyncMessageConfigurationBuilder* subBuilder = [OWSSignalServiceProtosSyncMessageConfiguration builder]; + SSKProtoSyncMessageConfigurationBuilder* subBuilder = [SSKProtoSyncMessageConfiguration builder]; if (self.hasConfiguration) { [subBuilder mergeFrom:self.configuration]; } @@ -10193,232 +10196,232 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr - (BOOL) hasSent { return resultSyncMessage.hasSent; } -- (OWSSignalServiceProtosSyncMessageSent*) sent { +- (SSKProtoSyncMessageSent*) sent { return resultSyncMessage.sent; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setSent:(OWSSignalServiceProtosSyncMessageSent*) value { +- (SSKProtoSyncMessageBuilder*) setSent:(SSKProtoSyncMessageSent*) value { resultSyncMessage.hasSent = YES; resultSyncMessage.sent = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setSentBuilder:(OWSSignalServiceProtosSyncMessageSentBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setSentBuilder:(SSKProtoSyncMessageSentBuilder*) builderForValue { return [self setSent:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeSent:(OWSSignalServiceProtosSyncMessageSent*) value { +- (SSKProtoSyncMessageBuilder*) mergeSent:(SSKProtoSyncMessageSent*) value { if (resultSyncMessage.hasSent && - resultSyncMessage.sent != [OWSSignalServiceProtosSyncMessageSent defaultInstance]) { + resultSyncMessage.sent != [SSKProtoSyncMessageSent defaultInstance]) { resultSyncMessage.sent = - [[[OWSSignalServiceProtosSyncMessageSent builderWithPrototype:resultSyncMessage.sent] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageSent builderWithPrototype:resultSyncMessage.sent] mergeFrom:value] buildPartial]; } else { resultSyncMessage.sent = value; } resultSyncMessage.hasSent = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearSent { +- (SSKProtoSyncMessageBuilder*) clearSent { resultSyncMessage.hasSent = NO; - resultSyncMessage.sent = [OWSSignalServiceProtosSyncMessageSent defaultInstance]; + resultSyncMessage.sent = [SSKProtoSyncMessageSent defaultInstance]; return self; } - (BOOL) hasContacts { return resultSyncMessage.hasContacts; } -- (OWSSignalServiceProtosSyncMessageContacts*) contacts { +- (SSKProtoSyncMessageContacts*) contacts { return resultSyncMessage.contacts; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setContacts:(OWSSignalServiceProtosSyncMessageContacts*) value { +- (SSKProtoSyncMessageBuilder*) setContacts:(SSKProtoSyncMessageContacts*) value { resultSyncMessage.hasContacts = YES; resultSyncMessage.contacts = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setContactsBuilder:(OWSSignalServiceProtosSyncMessageContactsBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setContactsBuilder:(SSKProtoSyncMessageContactsBuilder*) builderForValue { return [self setContacts:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeContacts:(OWSSignalServiceProtosSyncMessageContacts*) value { +- (SSKProtoSyncMessageBuilder*) mergeContacts:(SSKProtoSyncMessageContacts*) value { if (resultSyncMessage.hasContacts && - resultSyncMessage.contacts != [OWSSignalServiceProtosSyncMessageContacts defaultInstance]) { + resultSyncMessage.contacts != [SSKProtoSyncMessageContacts defaultInstance]) { resultSyncMessage.contacts = - [[[OWSSignalServiceProtosSyncMessageContacts builderWithPrototype:resultSyncMessage.contacts] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageContacts builderWithPrototype:resultSyncMessage.contacts] mergeFrom:value] buildPartial]; } else { resultSyncMessage.contacts = value; } resultSyncMessage.hasContacts = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearContacts { +- (SSKProtoSyncMessageBuilder*) clearContacts { resultSyncMessage.hasContacts = NO; - resultSyncMessage.contacts = [OWSSignalServiceProtosSyncMessageContacts defaultInstance]; + resultSyncMessage.contacts = [SSKProtoSyncMessageContacts defaultInstance]; return self; } - (BOOL) hasGroups { return resultSyncMessage.hasGroups; } -- (OWSSignalServiceProtosSyncMessageGroups*) groups { +- (SSKProtoSyncMessageGroups*) groups { return resultSyncMessage.groups; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setGroups:(OWSSignalServiceProtosSyncMessageGroups*) value { +- (SSKProtoSyncMessageBuilder*) setGroups:(SSKProtoSyncMessageGroups*) value { resultSyncMessage.hasGroups = YES; resultSyncMessage.groups = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setGroupsBuilder:(OWSSignalServiceProtosSyncMessageGroupsBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setGroupsBuilder:(SSKProtoSyncMessageGroupsBuilder*) builderForValue { return [self setGroups:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeGroups:(OWSSignalServiceProtosSyncMessageGroups*) value { +- (SSKProtoSyncMessageBuilder*) mergeGroups:(SSKProtoSyncMessageGroups*) value { if (resultSyncMessage.hasGroups && - resultSyncMessage.groups != [OWSSignalServiceProtosSyncMessageGroups defaultInstance]) { + resultSyncMessage.groups != [SSKProtoSyncMessageGroups defaultInstance]) { resultSyncMessage.groups = - [[[OWSSignalServiceProtosSyncMessageGroups builderWithPrototype:resultSyncMessage.groups] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageGroups builderWithPrototype:resultSyncMessage.groups] mergeFrom:value] buildPartial]; } else { resultSyncMessage.groups = value; } resultSyncMessage.hasGroups = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearGroups { +- (SSKProtoSyncMessageBuilder*) clearGroups { resultSyncMessage.hasGroups = NO; - resultSyncMessage.groups = [OWSSignalServiceProtosSyncMessageGroups defaultInstance]; + resultSyncMessage.groups = [SSKProtoSyncMessageGroups defaultInstance]; return self; } - (BOOL) hasRequest { return resultSyncMessage.hasRequest; } -- (OWSSignalServiceProtosSyncMessageRequest*) request { +- (SSKProtoSyncMessageRequest*) request { return resultSyncMessage.request; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setRequest:(OWSSignalServiceProtosSyncMessageRequest*) value { +- (SSKProtoSyncMessageBuilder*) setRequest:(SSKProtoSyncMessageRequest*) value { resultSyncMessage.hasRequest = YES; resultSyncMessage.request = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setRequestBuilder:(OWSSignalServiceProtosSyncMessageRequestBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setRequestBuilder:(SSKProtoSyncMessageRequestBuilder*) builderForValue { return [self setRequest:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeRequest:(OWSSignalServiceProtosSyncMessageRequest*) value { +- (SSKProtoSyncMessageBuilder*) mergeRequest:(SSKProtoSyncMessageRequest*) value { if (resultSyncMessage.hasRequest && - resultSyncMessage.request != [OWSSignalServiceProtosSyncMessageRequest defaultInstance]) { + resultSyncMessage.request != [SSKProtoSyncMessageRequest defaultInstance]) { resultSyncMessage.request = - [[[OWSSignalServiceProtosSyncMessageRequest builderWithPrototype:resultSyncMessage.request] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageRequest builderWithPrototype:resultSyncMessage.request] mergeFrom:value] buildPartial]; } else { resultSyncMessage.request = value; } resultSyncMessage.hasRequest = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearRequest { +- (SSKProtoSyncMessageBuilder*) clearRequest { resultSyncMessage.hasRequest = NO; - resultSyncMessage.request = [OWSSignalServiceProtosSyncMessageRequest defaultInstance]; + resultSyncMessage.request = [SSKProtoSyncMessageRequest defaultInstance]; return self; } -- (NSMutableArray *)read { +- (NSMutableArray *)read { return resultSyncMessage.readArray; } -- (OWSSignalServiceProtosSyncMessageRead*)readAtIndex:(NSUInteger)index { +- (SSKProtoSyncMessageRead*)readAtIndex:(NSUInteger)index { return [resultSyncMessage readAtIndex:index]; } -- (OWSSignalServiceProtosSyncMessageBuilder *)addRead:(OWSSignalServiceProtosSyncMessageRead*)value { +- (SSKProtoSyncMessageBuilder *)addRead:(SSKProtoSyncMessageRead*)value { if (resultSyncMessage.readArray == nil) { resultSyncMessage.readArray = [[NSMutableArray alloc]init]; } [resultSyncMessage.readArray addObject:value]; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder *)setReadArray:(NSArray *)array { +- (SSKProtoSyncMessageBuilder *)setReadArray:(NSArray *)array { resultSyncMessage.readArray = [[NSMutableArray alloc]initWithArray:array]; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder *)clearRead { +- (SSKProtoSyncMessageBuilder *)clearRead { resultSyncMessage.readArray = nil; return self; } - (BOOL) hasBlocked { return resultSyncMessage.hasBlocked; } -- (OWSSignalServiceProtosSyncMessageBlocked*) blocked { +- (SSKProtoSyncMessageBlocked*) blocked { return resultSyncMessage.blocked; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setBlocked:(OWSSignalServiceProtosSyncMessageBlocked*) value { +- (SSKProtoSyncMessageBuilder*) setBlocked:(SSKProtoSyncMessageBlocked*) value { resultSyncMessage.hasBlocked = YES; resultSyncMessage.blocked = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setBlockedBuilder:(OWSSignalServiceProtosSyncMessageBlockedBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setBlockedBuilder:(SSKProtoSyncMessageBlockedBuilder*) builderForValue { return [self setBlocked:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeBlocked:(OWSSignalServiceProtosSyncMessageBlocked*) value { +- (SSKProtoSyncMessageBuilder*) mergeBlocked:(SSKProtoSyncMessageBlocked*) value { if (resultSyncMessage.hasBlocked && - resultSyncMessage.blocked != [OWSSignalServiceProtosSyncMessageBlocked defaultInstance]) { + resultSyncMessage.blocked != [SSKProtoSyncMessageBlocked defaultInstance]) { resultSyncMessage.blocked = - [[[OWSSignalServiceProtosSyncMessageBlocked builderWithPrototype:resultSyncMessage.blocked] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageBlocked builderWithPrototype:resultSyncMessage.blocked] mergeFrom:value] buildPartial]; } else { resultSyncMessage.blocked = value; } resultSyncMessage.hasBlocked = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearBlocked { +- (SSKProtoSyncMessageBuilder*) clearBlocked { resultSyncMessage.hasBlocked = NO; - resultSyncMessage.blocked = [OWSSignalServiceProtosSyncMessageBlocked defaultInstance]; + resultSyncMessage.blocked = [SSKProtoSyncMessageBlocked defaultInstance]; return self; } - (BOOL) hasVerified { return resultSyncMessage.hasVerified; } -- (OWSSignalServiceProtosVerified*) verified { +- (SSKProtoVerified*) verified { return resultSyncMessage.verified; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setVerified:(OWSSignalServiceProtosVerified*) value { +- (SSKProtoSyncMessageBuilder*) setVerified:(SSKProtoVerified*) value { resultSyncMessage.hasVerified = YES; resultSyncMessage.verified = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setVerifiedBuilder:(OWSSignalServiceProtosVerifiedBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setVerifiedBuilder:(SSKProtoVerifiedBuilder*) builderForValue { return [self setVerified:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeVerified:(OWSSignalServiceProtosVerified*) value { +- (SSKProtoSyncMessageBuilder*) mergeVerified:(SSKProtoVerified*) value { if (resultSyncMessage.hasVerified && - resultSyncMessage.verified != [OWSSignalServiceProtosVerified defaultInstance]) { + resultSyncMessage.verified != [SSKProtoVerified defaultInstance]) { resultSyncMessage.verified = - [[[OWSSignalServiceProtosVerified builderWithPrototype:resultSyncMessage.verified] mergeFrom:value] buildPartial]; + [[[SSKProtoVerified builderWithPrototype:resultSyncMessage.verified] mergeFrom:value] buildPartial]; } else { resultSyncMessage.verified = value; } resultSyncMessage.hasVerified = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearVerified { +- (SSKProtoSyncMessageBuilder*) clearVerified { resultSyncMessage.hasVerified = NO; - resultSyncMessage.verified = [OWSSignalServiceProtosVerified defaultInstance]; + resultSyncMessage.verified = [SSKProtoVerified defaultInstance]; return self; } - (BOOL) hasConfiguration { return resultSyncMessage.hasConfiguration; } -- (OWSSignalServiceProtosSyncMessageConfiguration*) configuration { +- (SSKProtoSyncMessageConfiguration*) configuration { return resultSyncMessage.configuration; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setConfiguration:(OWSSignalServiceProtosSyncMessageConfiguration*) value { +- (SSKProtoSyncMessageBuilder*) setConfiguration:(SSKProtoSyncMessageConfiguration*) value { resultSyncMessage.hasConfiguration = YES; resultSyncMessage.configuration = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setConfigurationBuilder:(OWSSignalServiceProtosSyncMessageConfigurationBuilder*) builderForValue { +- (SSKProtoSyncMessageBuilder*) setConfigurationBuilder:(SSKProtoSyncMessageConfigurationBuilder*) builderForValue { return [self setConfiguration:[builderForValue build]]; } -- (OWSSignalServiceProtosSyncMessageBuilder*) mergeConfiguration:(OWSSignalServiceProtosSyncMessageConfiguration*) value { +- (SSKProtoSyncMessageBuilder*) mergeConfiguration:(SSKProtoSyncMessageConfiguration*) value { if (resultSyncMessage.hasConfiguration && - resultSyncMessage.configuration != [OWSSignalServiceProtosSyncMessageConfiguration defaultInstance]) { + resultSyncMessage.configuration != [SSKProtoSyncMessageConfiguration defaultInstance]) { resultSyncMessage.configuration = - [[[OWSSignalServiceProtosSyncMessageConfiguration builderWithPrototype:resultSyncMessage.configuration] mergeFrom:value] buildPartial]; + [[[SSKProtoSyncMessageConfiguration builderWithPrototype:resultSyncMessage.configuration] mergeFrom:value] buildPartial]; } else { resultSyncMessage.configuration = value; } resultSyncMessage.hasConfiguration = YES; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearConfiguration { +- (SSKProtoSyncMessageBuilder*) clearConfiguration { resultSyncMessage.hasConfiguration = NO; - resultSyncMessage.configuration = [OWSSignalServiceProtosSyncMessageConfiguration defaultInstance]; + resultSyncMessage.configuration = [SSKProtoSyncMessageConfiguration defaultInstance]; return self; } - (BOOL) hasPadding { @@ -10427,19 +10430,19 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr - (NSData*) padding { return resultSyncMessage.padding; } -- (OWSSignalServiceProtosSyncMessageBuilder*) setPadding:(NSData*) value { +- (SSKProtoSyncMessageBuilder*) setPadding:(NSData*) value { resultSyncMessage.hasPadding = YES; resultSyncMessage.padding = value; return self; } -- (OWSSignalServiceProtosSyncMessageBuilder*) clearPadding { +- (SSKProtoSyncMessageBuilder*) clearPadding { resultSyncMessage.hasPadding = NO; resultSyncMessage.padding = [NSData data]; return self; } @end -@interface OWSSignalServiceProtosAttachmentPointer () +@interface SSKProtoAttachmentPointer () @property UInt64 id; @property (strong) NSString* contentType; @property (strong) NSData* key; @@ -10452,7 +10455,7 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr @property UInt32 height; @end -@implementation OWSSignalServiceProtosAttachmentPointer +@implementation SSKProtoAttachmentPointer - (BOOL) hasId { return !!hasId_; @@ -10539,17 +10542,17 @@ static OWSSignalServiceProtosSyncMessageConfiguration* defaultOWSSignalServicePr } return self; } -static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAttachmentPointerInstance = nil; +static SSKProtoAttachmentPointer* defaultSSKProtoAttachmentPointerInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosAttachmentPointer class]) { - defaultOWSSignalServiceProtosAttachmentPointerInstance = [[OWSSignalServiceProtosAttachmentPointer alloc] init]; + if (self == [SSKProtoAttachmentPointer class]) { + defaultSSKProtoAttachmentPointerInstance = [[SSKProtoAttachmentPointer alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosAttachmentPointerInstance; + return defaultSSKProtoAttachmentPointerInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosAttachmentPointerInstance; + return defaultSSKProtoAttachmentPointerInstance; } - (BOOL) isInitialized { return YES; @@ -10628,35 +10631,35 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromData:data] build]; ++ (SSKProtoAttachmentPointer*) parseFromData:(NSData*) data { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoAttachmentPointer*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromInputStream:input] build]; ++ (SSKProtoAttachmentPointer*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoAttachmentPointer*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosAttachmentPointer*)[[[OWSSignalServiceProtosAttachmentPointer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoAttachmentPointer*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoAttachmentPointer*)[[[SSKProtoAttachmentPointer builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosAttachmentPointerBuilder*) builder { - return [[OWSSignalServiceProtosAttachmentPointerBuilder alloc] init]; ++ (SSKProtoAttachmentPointerBuilder*) builder { + return [[SSKProtoAttachmentPointerBuilder alloc] init]; } -+ (OWSSignalServiceProtosAttachmentPointerBuilder*) builderWithPrototype:(OWSSignalServiceProtosAttachmentPointer*) prototype { - return [[OWSSignalServiceProtosAttachmentPointer builder] mergeFrom:prototype]; ++ (SSKProtoAttachmentPointerBuilder*) builderWithPrototype:(SSKProtoAttachmentPointer*) prototype { + return [[SSKProtoAttachmentPointer builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) builder { - return [OWSSignalServiceProtosAttachmentPointer builder]; +- (SSKProtoAttachmentPointerBuilder*) builder { + return [SSKProtoAttachmentPointer builder]; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) toBuilder { - return [OWSSignalServiceProtosAttachmentPointer builderWithPrototype:self]; +- (SSKProtoAttachmentPointerBuilder*) toBuilder { + return [SSKProtoAttachmentPointer builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -10728,10 +10731,10 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosAttachmentPointer class]]) { + if (![other isKindOfClass:[SSKProtoAttachmentPointer class]]) { return NO; } - OWSSignalServiceProtosAttachmentPointer *otherMessage = other; + SSKProtoAttachmentPointer *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id) && @@ -10792,59 +10795,59 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt } @end -BOOL OWSSignalServiceProtosAttachmentPointerFlagsIsValidValue(OWSSignalServiceProtosAttachmentPointerFlags value) { +BOOL SSKProtoAttachmentPointerFlagsIsValidValue(SSKProtoAttachmentPointerFlags value) { switch (value) { - case OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage: + case SSKProtoAttachmentPointerFlagsVoiceMessage: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServiceProtosAttachmentPointerFlags value) { +NSString *NSStringFromSSKProtoAttachmentPointerFlags(SSKProtoAttachmentPointerFlags value) { switch (value) { - case OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage: - return @"OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage"; + case SSKProtoAttachmentPointerFlagsVoiceMessage: + return @"SSKProtoAttachmentPointerFlagsVoiceMessage"; default: return nil; } } -@interface OWSSignalServiceProtosAttachmentPointerBuilder() -@property (strong) OWSSignalServiceProtosAttachmentPointer* resultAttachmentPointer; +@interface SSKProtoAttachmentPointerBuilder() +@property (strong) SSKProtoAttachmentPointer* resultAttachmentPointer; @end -@implementation OWSSignalServiceProtosAttachmentPointerBuilder +@implementation SSKProtoAttachmentPointerBuilder @synthesize resultAttachmentPointer; - (instancetype) init { if ((self = [super init])) { - self.resultAttachmentPointer = [[OWSSignalServiceProtosAttachmentPointer alloc] init]; + self.resultAttachmentPointer = [[SSKProtoAttachmentPointer alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultAttachmentPointer; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clear { - self.resultAttachmentPointer = [[OWSSignalServiceProtosAttachmentPointer alloc] init]; +- (SSKProtoAttachmentPointerBuilder*) clear { + self.resultAttachmentPointer = [[SSKProtoAttachmentPointer alloc] init]; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clone { - return [OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultAttachmentPointer]; +- (SSKProtoAttachmentPointerBuilder*) clone { + return [SSKProtoAttachmentPointer builderWithPrototype:resultAttachmentPointer]; } -- (OWSSignalServiceProtosAttachmentPointer*) defaultInstance { - return [OWSSignalServiceProtosAttachmentPointer defaultInstance]; +- (SSKProtoAttachmentPointer*) defaultInstance { + return [SSKProtoAttachmentPointer defaultInstance]; } -- (OWSSignalServiceProtosAttachmentPointer*) build { +- (SSKProtoAttachmentPointer*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosAttachmentPointer*) buildPartial { - OWSSignalServiceProtosAttachmentPointer* returnMe = resultAttachmentPointer; +- (SSKProtoAttachmentPointer*) buildPartial { + SSKProtoAttachmentPointer* returnMe = resultAttachmentPointer; self.resultAttachmentPointer = nil; return returnMe; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFrom:(OWSSignalServiceProtosAttachmentPointer*) other { - if (other == [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { +- (SSKProtoAttachmentPointerBuilder*) mergeFrom:(SSKProtoAttachmentPointer*) other { + if (other == [SSKProtoAttachmentPointer defaultInstance]) { return self; } if (other.hasId) { @@ -10880,10 +10883,10 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoAttachmentPointerBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -10947,12 +10950,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (UInt64) id { return resultAttachmentPointer.id; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setId:(UInt64) value { +- (SSKProtoAttachmentPointerBuilder*) setId:(UInt64) value { resultAttachmentPointer.hasId = YES; resultAttachmentPointer.id = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearId { +- (SSKProtoAttachmentPointerBuilder*) clearId { resultAttachmentPointer.hasId = NO; resultAttachmentPointer.id = 0L; return self; @@ -10963,12 +10966,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (NSString*) contentType { return resultAttachmentPointer.contentType; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setContentType:(NSString*) value { +- (SSKProtoAttachmentPointerBuilder*) setContentType:(NSString*) value { resultAttachmentPointer.hasContentType = YES; resultAttachmentPointer.contentType = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearContentType { +- (SSKProtoAttachmentPointerBuilder*) clearContentType { resultAttachmentPointer.hasContentType = NO; resultAttachmentPointer.contentType = @""; return self; @@ -10979,12 +10982,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (NSData*) key { return resultAttachmentPointer.key; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setKey:(NSData*) value { +- (SSKProtoAttachmentPointerBuilder*) setKey:(NSData*) value { resultAttachmentPointer.hasKey = YES; resultAttachmentPointer.key = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearKey { +- (SSKProtoAttachmentPointerBuilder*) clearKey { resultAttachmentPointer.hasKey = NO; resultAttachmentPointer.key = [NSData data]; return self; @@ -10995,12 +10998,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (UInt32) size { return resultAttachmentPointer.size; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setSize:(UInt32) value { +- (SSKProtoAttachmentPointerBuilder*) setSize:(UInt32) value { resultAttachmentPointer.hasSize = YES; resultAttachmentPointer.size = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearSize { +- (SSKProtoAttachmentPointerBuilder*) clearSize { resultAttachmentPointer.hasSize = NO; resultAttachmentPointer.size = 0; return self; @@ -11011,12 +11014,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (NSData*) thumbnail { return resultAttachmentPointer.thumbnail; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setThumbnail:(NSData*) value { +- (SSKProtoAttachmentPointerBuilder*) setThumbnail:(NSData*) value { resultAttachmentPointer.hasThumbnail = YES; resultAttachmentPointer.thumbnail = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearThumbnail { +- (SSKProtoAttachmentPointerBuilder*) clearThumbnail { resultAttachmentPointer.hasThumbnail = NO; resultAttachmentPointer.thumbnail = [NSData data]; return self; @@ -11027,12 +11030,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (NSData*) digest { return resultAttachmentPointer.digest; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setDigest:(NSData*) value { +- (SSKProtoAttachmentPointerBuilder*) setDigest:(NSData*) value { resultAttachmentPointer.hasDigest = YES; resultAttachmentPointer.digest = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearDigest { +- (SSKProtoAttachmentPointerBuilder*) clearDigest { resultAttachmentPointer.hasDigest = NO; resultAttachmentPointer.digest = [NSData data]; return self; @@ -11043,12 +11046,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (NSString*) fileName { return resultAttachmentPointer.fileName; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setFileName:(NSString*) value { +- (SSKProtoAttachmentPointerBuilder*) setFileName:(NSString*) value { resultAttachmentPointer.hasFileName = YES; resultAttachmentPointer.fileName = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearFileName { +- (SSKProtoAttachmentPointerBuilder*) clearFileName { resultAttachmentPointer.hasFileName = NO; resultAttachmentPointer.fileName = @""; return self; @@ -11059,12 +11062,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (UInt32) flags { return resultAttachmentPointer.flags; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setFlags:(UInt32) value { +- (SSKProtoAttachmentPointerBuilder*) setFlags:(UInt32) value { resultAttachmentPointer.hasFlags = YES; resultAttachmentPointer.flags = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearFlags { +- (SSKProtoAttachmentPointerBuilder*) clearFlags { resultAttachmentPointer.hasFlags = NO; resultAttachmentPointer.flags = 0; return self; @@ -11075,12 +11078,12 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (UInt32) width { return resultAttachmentPointer.width; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setWidth:(UInt32) value { +- (SSKProtoAttachmentPointerBuilder*) setWidth:(UInt32) value { resultAttachmentPointer.hasWidth = YES; resultAttachmentPointer.width = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearWidth { +- (SSKProtoAttachmentPointerBuilder*) clearWidth { resultAttachmentPointer.hasWidth = NO; resultAttachmentPointer.width = 0; return self; @@ -11091,27 +11094,27 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (UInt32) height { return resultAttachmentPointer.height; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) setHeight:(UInt32) value { +- (SSKProtoAttachmentPointerBuilder*) setHeight:(UInt32) value { resultAttachmentPointer.hasHeight = YES; resultAttachmentPointer.height = value; return self; } -- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearHeight { +- (SSKProtoAttachmentPointerBuilder*) clearHeight { resultAttachmentPointer.hasHeight = NO; resultAttachmentPointer.height = 0; return self; } @end -@interface OWSSignalServiceProtosGroupContext () +@interface SSKProtoGroupContext () @property (strong) NSData* id; -@property OWSSignalServiceProtosGroupContextType type; +@property SSKProtoGroupContextType type; @property (strong) NSString* name; @property (strong) NSMutableArray * membersArray; -@property (strong) OWSSignalServiceProtosAttachmentPointer* avatar; +@property (strong) SSKProtoAttachmentPointer* avatar; @end -@implementation OWSSignalServiceProtosGroupContext +@implementation SSKProtoGroupContext - (BOOL) hasId { return !!hasId_; @@ -11146,23 +11149,23 @@ NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServ - (instancetype) init { if ((self = [super init])) { self.id = [NSData data]; - self.type = OWSSignalServiceProtosGroupContextTypeUnknown; + self.type = SSKProtoGroupContextTypeUnknown; self.name = @""; - self.avatar = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + self.avatar = [SSKProtoAttachmentPointer defaultInstance]; } return self; } -static OWSSignalServiceProtosGroupContext* defaultOWSSignalServiceProtosGroupContextInstance = nil; +static SSKProtoGroupContext* defaultSSKProtoGroupContextInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosGroupContext class]) { - defaultOWSSignalServiceProtosGroupContextInstance = [[OWSSignalServiceProtosGroupContext alloc] init]; + if (self == [SSKProtoGroupContext class]) { + defaultSSKProtoGroupContextInstance = [[SSKProtoGroupContext alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupContextInstance; + return defaultSSKProtoGroupContextInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupContextInstance; + return defaultSSKProtoGroupContextInstance; } - (NSArray *)members { return membersArray; @@ -11223,42 +11226,42 @@ static OWSSignalServiceProtosGroupContext* defaultOWSSignalServiceProtosGroupCon memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosGroupContext*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromData:data] build]; ++ (SSKProtoGroupContext*) parseFromData:(NSData*) data { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosGroupContext*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupContext*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupContext*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromInputStream:input] build]; ++ (SSKProtoGroupContext*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupContext*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupContext*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupContext*)[[[OWSSignalServiceProtosGroupContext builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupContext*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupContext*)[[[SSKProtoGroupContext builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupContextBuilder*) builder { - return [[OWSSignalServiceProtosGroupContextBuilder alloc] init]; ++ (SSKProtoGroupContextBuilder*) builder { + return [[SSKProtoGroupContextBuilder alloc] init]; } -+ (OWSSignalServiceProtosGroupContextBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupContext*) prototype { - return [[OWSSignalServiceProtosGroupContext builder] mergeFrom:prototype]; ++ (SSKProtoGroupContextBuilder*) builderWithPrototype:(SSKProtoGroupContext*) prototype { + return [[SSKProtoGroupContext builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosGroupContextBuilder*) builder { - return [OWSSignalServiceProtosGroupContext builder]; +- (SSKProtoGroupContextBuilder*) builder { + return [SSKProtoGroupContext builder]; } -- (OWSSignalServiceProtosGroupContextBuilder*) toBuilder { - return [OWSSignalServiceProtosGroupContext builderWithPrototype:self]; +- (SSKProtoGroupContextBuilder*) toBuilder { + return [SSKProtoGroupContext builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { [output appendFormat:@"%@%@: %@\n", indent, @"id", self.id]; } if (self.hasType) { - [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromOWSSignalServiceProtosGroupContextType(self.type)]; + [output appendFormat:@"%@%@: %@\n", indent, @"type", NSStringFromSSKProtoGroupContextType(self.type)]; } if (self.hasName) { [output appendFormat:@"%@%@: %@\n", indent, @"name", self.name]; @@ -11296,10 +11299,10 @@ static OWSSignalServiceProtosGroupContext* defaultOWSSignalServiceProtosGroupCon if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosGroupContext class]]) { + if (![other isKindOfClass:[SSKProtoGroupContext class]]) { return NO; } - OWSSignalServiceProtosGroupContext *otherMessage = other; + SSKProtoGroupContext *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || [self.id isEqual:otherMessage.id]) && @@ -11334,71 +11337,71 @@ static OWSSignalServiceProtosGroupContext* defaultOWSSignalServiceProtosGroupCon } @end -BOOL OWSSignalServiceProtosGroupContextTypeIsValidValue(OWSSignalServiceProtosGroupContextType value) { +BOOL SSKProtoGroupContextTypeIsValidValue(SSKProtoGroupContextType value) { switch (value) { - case OWSSignalServiceProtosGroupContextTypeUnknown: - case OWSSignalServiceProtosGroupContextTypeUpdate: - case OWSSignalServiceProtosGroupContextTypeDeliver: - case OWSSignalServiceProtosGroupContextTypeQuit: - case OWSSignalServiceProtosGroupContextTypeRequestInfo: + case SSKProtoGroupContextTypeUnknown: + case SSKProtoGroupContextTypeUpdate: + case SSKProtoGroupContextTypeDeliver: + case SSKProtoGroupContextTypeQuit: + case SSKProtoGroupContextTypeRequestInfo: return YES; default: return NO; } } -NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServiceProtosGroupContextType value) { +NSString *NSStringFromSSKProtoGroupContextType(SSKProtoGroupContextType value) { switch (value) { - case OWSSignalServiceProtosGroupContextTypeUnknown: - return @"OWSSignalServiceProtosGroupContextTypeUnknown"; - case OWSSignalServiceProtosGroupContextTypeUpdate: - return @"OWSSignalServiceProtosGroupContextTypeUpdate"; - case OWSSignalServiceProtosGroupContextTypeDeliver: - return @"OWSSignalServiceProtosGroupContextTypeDeliver"; - case OWSSignalServiceProtosGroupContextTypeQuit: - return @"OWSSignalServiceProtosGroupContextTypeQuit"; - case OWSSignalServiceProtosGroupContextTypeRequestInfo: - return @"OWSSignalServiceProtosGroupContextTypeRequestInfo"; + case SSKProtoGroupContextTypeUnknown: + return @"SSKProtoGroupContextTypeUnknown"; + case SSKProtoGroupContextTypeUpdate: + return @"SSKProtoGroupContextTypeUpdate"; + case SSKProtoGroupContextTypeDeliver: + return @"SSKProtoGroupContextTypeDeliver"; + case SSKProtoGroupContextTypeQuit: + return @"SSKProtoGroupContextTypeQuit"; + case SSKProtoGroupContextTypeRequestInfo: + return @"SSKProtoGroupContextTypeRequestInfo"; default: return nil; } } -@interface OWSSignalServiceProtosGroupContextBuilder() -@property (strong) OWSSignalServiceProtosGroupContext* resultGroupContext; +@interface SSKProtoGroupContextBuilder() +@property (strong) SSKProtoGroupContext* resultGroupContext; @end -@implementation OWSSignalServiceProtosGroupContextBuilder +@implementation SSKProtoGroupContextBuilder @synthesize resultGroupContext; - (instancetype) init { if ((self = [super init])) { - self.resultGroupContext = [[OWSSignalServiceProtosGroupContext alloc] init]; + self.resultGroupContext = [[SSKProtoGroupContext alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultGroupContext; } -- (OWSSignalServiceProtosGroupContextBuilder*) clear { - self.resultGroupContext = [[OWSSignalServiceProtosGroupContext alloc] init]; +- (SSKProtoGroupContextBuilder*) clear { + self.resultGroupContext = [[SSKProtoGroupContext alloc] init]; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) clone { - return [OWSSignalServiceProtosGroupContext builderWithPrototype:resultGroupContext]; +- (SSKProtoGroupContextBuilder*) clone { + return [SSKProtoGroupContext builderWithPrototype:resultGroupContext]; } -- (OWSSignalServiceProtosGroupContext*) defaultInstance { - return [OWSSignalServiceProtosGroupContext defaultInstance]; +- (SSKProtoGroupContext*) defaultInstance { + return [SSKProtoGroupContext defaultInstance]; } -- (OWSSignalServiceProtosGroupContext*) build { +- (SSKProtoGroupContext*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosGroupContext*) buildPartial { - OWSSignalServiceProtosGroupContext* returnMe = resultGroupContext; +- (SSKProtoGroupContext*) buildPartial { + SSKProtoGroupContext* returnMe = resultGroupContext; self.resultGroupContext = nil; return returnMe; } -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFrom:(OWSSignalServiceProtosGroupContext*) other { - if (other == [OWSSignalServiceProtosGroupContext defaultInstance]) { +- (SSKProtoGroupContextBuilder*) mergeFrom:(SSKProtoGroupContext*) other { + if (other == [SSKProtoGroupContext defaultInstance]) { return self; } if (other.hasId) { @@ -11423,10 +11426,10 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoGroupContextBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -11446,8 +11449,8 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro break; } case 16: { - OWSSignalServiceProtosGroupContextType value = (OWSSignalServiceProtosGroupContextType)[input readEnum]; - if (OWSSignalServiceProtosGroupContextTypeIsValidValue(value)) { + SSKProtoGroupContextType value = (SSKProtoGroupContextType)[input readEnum]; + if (SSKProtoGroupContextTypeIsValidValue(value)) { [self setType:value]; } else { [unknownFields mergeVarintField:2 value:value]; @@ -11463,7 +11466,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro break; } case 42: { - OWSSignalServiceProtosAttachmentPointerBuilder* subBuilder = [OWSSignalServiceProtosAttachmentPointer builder]; + SSKProtoAttachmentPointerBuilder* subBuilder = [SSKProtoAttachmentPointer builder]; if (self.hasAvatar) { [subBuilder mergeFrom:self.avatar]; } @@ -11480,12 +11483,12 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (NSData*) id { return resultGroupContext.id; } -- (OWSSignalServiceProtosGroupContextBuilder*) setId:(NSData*) value { +- (SSKProtoGroupContextBuilder*) setId:(NSData*) value { resultGroupContext.hasId = YES; resultGroupContext.id = value; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) clearId { +- (SSKProtoGroupContextBuilder*) clearId { resultGroupContext.hasId = NO; resultGroupContext.id = [NSData data]; return self; @@ -11493,17 +11496,17 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (BOOL) hasType { return resultGroupContext.hasType; } -- (OWSSignalServiceProtosGroupContextType) type { +- (SSKProtoGroupContextType) type { return resultGroupContext.type; } -- (OWSSignalServiceProtosGroupContextBuilder*) setType:(OWSSignalServiceProtosGroupContextType) value { +- (SSKProtoGroupContextBuilder*) setType:(SSKProtoGroupContextType) value { resultGroupContext.hasType = YES; resultGroupContext.type = value; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) clearType { +- (SSKProtoGroupContextBuilder*) clearType { resultGroupContext.hasType = NO; - resultGroupContext.type = OWSSignalServiceProtosGroupContextTypeUnknown; + resultGroupContext.type = SSKProtoGroupContextTypeUnknown; return self; } - (BOOL) hasName { @@ -11512,12 +11515,12 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (NSString*) name { return resultGroupContext.name; } -- (OWSSignalServiceProtosGroupContextBuilder*) setName:(NSString*) value { +- (SSKProtoGroupContextBuilder*) setName:(NSString*) value { resultGroupContext.hasName = YES; resultGroupContext.name = value; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) clearName { +- (SSKProtoGroupContextBuilder*) clearName { resultGroupContext.hasName = NO; resultGroupContext.name = @""; return self; @@ -11528,65 +11531,65 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro - (NSString*)membersAtIndex:(NSUInteger)index { return [resultGroupContext membersAtIndex:index]; } -- (OWSSignalServiceProtosGroupContextBuilder *)addMembers:(NSString*)value { +- (SSKProtoGroupContextBuilder *)addMembers:(NSString*)value { if (resultGroupContext.membersArray == nil) { resultGroupContext.membersArray = [[NSMutableArray alloc]init]; } [resultGroupContext.membersArray addObject:value]; return self; } -- (OWSSignalServiceProtosGroupContextBuilder *)setMembersArray:(NSArray *)array { +- (SSKProtoGroupContextBuilder *)setMembersArray:(NSArray *)array { resultGroupContext.membersArray = [[NSMutableArray alloc] initWithArray:array]; return self; } -- (OWSSignalServiceProtosGroupContextBuilder *)clearMembers { +- (SSKProtoGroupContextBuilder *)clearMembers { resultGroupContext.membersArray = nil; return self; } - (BOOL) hasAvatar { return resultGroupContext.hasAvatar; } -- (OWSSignalServiceProtosAttachmentPointer*) avatar { +- (SSKProtoAttachmentPointer*) avatar { return resultGroupContext.avatar; } -- (OWSSignalServiceProtosGroupContextBuilder*) setAvatar:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoGroupContextBuilder*) setAvatar:(SSKProtoAttachmentPointer*) value { resultGroupContext.hasAvatar = YES; resultGroupContext.avatar = value; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) setAvatarBuilder:(OWSSignalServiceProtosAttachmentPointerBuilder*) builderForValue { +- (SSKProtoGroupContextBuilder*) setAvatarBuilder:(SSKProtoAttachmentPointerBuilder*) builderForValue { return [self setAvatar:[builderForValue build]]; } -- (OWSSignalServiceProtosGroupContextBuilder*) mergeAvatar:(OWSSignalServiceProtosAttachmentPointer*) value { +- (SSKProtoGroupContextBuilder*) mergeAvatar:(SSKProtoAttachmentPointer*) value { if (resultGroupContext.hasAvatar && - resultGroupContext.avatar != [OWSSignalServiceProtosAttachmentPointer defaultInstance]) { + resultGroupContext.avatar != [SSKProtoAttachmentPointer defaultInstance]) { resultGroupContext.avatar = - [[[OWSSignalServiceProtosAttachmentPointer builderWithPrototype:resultGroupContext.avatar] mergeFrom:value] buildPartial]; + [[[SSKProtoAttachmentPointer builderWithPrototype:resultGroupContext.avatar] mergeFrom:value] buildPartial]; } else { resultGroupContext.avatar = value; } resultGroupContext.hasAvatar = YES; return self; } -- (OWSSignalServiceProtosGroupContextBuilder*) clearAvatar { +- (SSKProtoGroupContextBuilder*) clearAvatar { resultGroupContext.hasAvatar = NO; - resultGroupContext.avatar = [OWSSignalServiceProtosAttachmentPointer defaultInstance]; + resultGroupContext.avatar = [SSKProtoAttachmentPointer defaultInstance]; return self; } @end -@interface OWSSignalServiceProtosContactDetails () +@interface SSKProtoContactDetails () @property (strong) NSString* number; @property (strong) NSString* name; -@property (strong) OWSSignalServiceProtosContactDetailsAvatar* avatar; +@property (strong) SSKProtoContactDetailsAvatar* avatar; @property (strong) NSString* color; -@property (strong) OWSSignalServiceProtosVerified* verified; +@property (strong) SSKProtoVerified* verified; @property (strong) NSData* profileKey; @property BOOL blocked; @property UInt32 expireTimer; @end -@implementation OWSSignalServiceProtosContactDetails +@implementation SSKProtoContactDetails - (BOOL) hasNumber { return !!hasNumber_; @@ -11653,26 +11656,26 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro if ((self = [super init])) { self.number = @""; self.name = @""; - self.avatar = [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]; + self.avatar = [SSKProtoContactDetailsAvatar defaultInstance]; self.color = @""; - self.verified = [OWSSignalServiceProtosVerified defaultInstance]; + self.verified = [SSKProtoVerified defaultInstance]; self.profileKey = [NSData data]; self.blocked = NO; self.expireTimer = 0; } return self; } -static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContactDetailsInstance = nil; +static SSKProtoContactDetails* defaultSSKProtoContactDetailsInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosContactDetails class]) { - defaultOWSSignalServiceProtosContactDetailsInstance = [[OWSSignalServiceProtosContactDetails alloc] init]; + if (self == [SSKProtoContactDetails class]) { + defaultSSKProtoContactDetailsInstance = [[SSKProtoContactDetails alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContactDetailsInstance; + return defaultSSKProtoContactDetailsInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContactDetailsInstance; + return defaultSSKProtoContactDetailsInstance; } - (BOOL) isInitialized { return YES; @@ -11739,35 +11742,35 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosContactDetails*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromData:data] build]; ++ (SSKProtoContactDetails*) parseFromData:(NSData*) data { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosContactDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetails*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromInputStream:input] build]; ++ (SSKProtoContactDetails*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosContactDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetails*)[[[OWSSignalServiceProtosContactDetails builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetails*)[[[SSKProtoContactDetails builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetailsBuilder*) builder { - return [[OWSSignalServiceProtosContactDetailsBuilder alloc] init]; ++ (SSKProtoContactDetailsBuilder*) builder { + return [[SSKProtoContactDetailsBuilder alloc] init]; } -+ (OWSSignalServiceProtosContactDetailsBuilder*) builderWithPrototype:(OWSSignalServiceProtosContactDetails*) prototype { - return [[OWSSignalServiceProtosContactDetails builder] mergeFrom:prototype]; ++ (SSKProtoContactDetailsBuilder*) builderWithPrototype:(SSKProtoContactDetails*) prototype { + return [[SSKProtoContactDetails builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosContactDetailsBuilder*) builder { - return [OWSSignalServiceProtosContactDetails builder]; +- (SSKProtoContactDetailsBuilder*) builder { + return [SSKProtoContactDetails builder]; } -- (OWSSignalServiceProtosContactDetailsBuilder*) toBuilder { - return [OWSSignalServiceProtosContactDetails builderWithPrototype:self]; +- (SSKProtoContactDetailsBuilder*) toBuilder { + return [SSKProtoContactDetails builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasNumber) { @@ -11837,10 +11840,10 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosContactDetails class]]) { + if (![other isKindOfClass:[SSKProtoContactDetails class]]) { return NO; } - OWSSignalServiceProtosContactDetails *otherMessage = other; + SSKProtoContactDetails *otherMessage = other; return self.hasNumber == otherMessage.hasNumber && (!self.hasNumber || [self.number isEqual:otherMessage.number]) && @@ -11891,12 +11894,12 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac } @end -@interface OWSSignalServiceProtosContactDetailsAvatar () +@interface SSKProtoContactDetailsAvatar () @property (strong) NSString* contentType; @property UInt32 length; @end -@implementation OWSSignalServiceProtosContactDetailsAvatar +@implementation SSKProtoContactDetailsAvatar - (BOOL) hasContentType { return !!hasContentType_; @@ -11919,17 +11922,17 @@ static OWSSignalServiceProtosContactDetails* defaultOWSSignalServiceProtosContac } return self; } -static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtosContactDetailsAvatarInstance = nil; +static SSKProtoContactDetailsAvatar* defaultSSKProtoContactDetailsAvatarInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosContactDetailsAvatar class]) { - defaultOWSSignalServiceProtosContactDetailsAvatarInstance = [[OWSSignalServiceProtosContactDetailsAvatar alloc] init]; + if (self == [SSKProtoContactDetailsAvatar class]) { + defaultSSKProtoContactDetailsAvatarInstance = [[SSKProtoContactDetailsAvatar alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContactDetailsAvatarInstance; + return defaultSSKProtoContactDetailsAvatarInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosContactDetailsAvatarInstance; + return defaultSSKProtoContactDetailsAvatarInstance; } - (BOOL) isInitialized { return YES; @@ -11960,35 +11963,35 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromData:data] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromData:(NSData*) data { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromInputStream:input] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosContactDetailsAvatar*)[[[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoContactDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoContactDetailsAvatar*)[[[SSKProtoContactDetailsAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builder { - return [[OWSSignalServiceProtosContactDetailsAvatarBuilder alloc] init]; ++ (SSKProtoContactDetailsAvatarBuilder*) builder { + return [[SSKProtoContactDetailsAvatarBuilder alloc] init]; } -+ (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosContactDetailsAvatar*) prototype { - return [[OWSSignalServiceProtosContactDetailsAvatar builder] mergeFrom:prototype]; ++ (SSKProtoContactDetailsAvatarBuilder*) builderWithPrototype:(SSKProtoContactDetailsAvatar*) prototype { + return [[SSKProtoContactDetailsAvatar builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) builder { - return [OWSSignalServiceProtosContactDetailsAvatar builder]; +- (SSKProtoContactDetailsAvatarBuilder*) builder { + return [SSKProtoContactDetailsAvatar builder]; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) toBuilder { - return [OWSSignalServiceProtosContactDetailsAvatar builderWithPrototype:self]; +- (SSKProtoContactDetailsAvatarBuilder*) toBuilder { + return [SSKProtoContactDetailsAvatar builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasContentType) { @@ -12012,10 +12015,10 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosContactDetailsAvatar class]]) { + if (![other isKindOfClass:[SSKProtoContactDetailsAvatar class]]) { return NO; } - OWSSignalServiceProtosContactDetailsAvatar *otherMessage = other; + SSKProtoContactDetailsAvatar *otherMessage = other; return self.hasContentType == otherMessage.hasContentType && (!self.hasContentType || [self.contentType isEqual:otherMessage.contentType]) && @@ -12036,42 +12039,42 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos } @end -@interface OWSSignalServiceProtosContactDetailsAvatarBuilder() -@property (strong) OWSSignalServiceProtosContactDetailsAvatar* resultAvatar; +@interface SSKProtoContactDetailsAvatarBuilder() +@property (strong) SSKProtoContactDetailsAvatar* resultAvatar; @end -@implementation OWSSignalServiceProtosContactDetailsAvatarBuilder +@implementation SSKProtoContactDetailsAvatarBuilder @synthesize resultAvatar; - (instancetype) init { if ((self = [super init])) { - self.resultAvatar = [[OWSSignalServiceProtosContactDetailsAvatar alloc] init]; + self.resultAvatar = [[SSKProtoContactDetailsAvatar alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultAvatar; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clear { - self.resultAvatar = [[OWSSignalServiceProtosContactDetailsAvatar alloc] init]; +- (SSKProtoContactDetailsAvatarBuilder*) clear { + self.resultAvatar = [[SSKProtoContactDetailsAvatar alloc] init]; return self; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clone { - return [OWSSignalServiceProtosContactDetailsAvatar builderWithPrototype:resultAvatar]; +- (SSKProtoContactDetailsAvatarBuilder*) clone { + return [SSKProtoContactDetailsAvatar builderWithPrototype:resultAvatar]; } -- (OWSSignalServiceProtosContactDetailsAvatar*) defaultInstance { - return [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]; +- (SSKProtoContactDetailsAvatar*) defaultInstance { + return [SSKProtoContactDetailsAvatar defaultInstance]; } -- (OWSSignalServiceProtosContactDetailsAvatar*) build { +- (SSKProtoContactDetailsAvatar*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosContactDetailsAvatar*) buildPartial { - OWSSignalServiceProtosContactDetailsAvatar* returnMe = resultAvatar; +- (SSKProtoContactDetailsAvatar*) buildPartial { + SSKProtoContactDetailsAvatar* returnMe = resultAvatar; self.resultAvatar = nil; return returnMe; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosContactDetailsAvatar*) other { - if (other == [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]) { +- (SSKProtoContactDetailsAvatarBuilder*) mergeFrom:(SSKProtoContactDetailsAvatar*) other { + if (other == [SSKProtoContactDetailsAvatar defaultInstance]) { return self; } if (other.hasContentType) { @@ -12083,10 +12086,10 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoContactDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -12118,12 +12121,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (NSString*) contentType { return resultAvatar.contentType; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) setContentType:(NSString*) value { +- (SSKProtoContactDetailsAvatarBuilder*) setContentType:(NSString*) value { resultAvatar.hasContentType = YES; resultAvatar.contentType = value; return self; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clearContentType { +- (SSKProtoContactDetailsAvatarBuilder*) clearContentType { resultAvatar.hasContentType = NO; resultAvatar.contentType = @""; return self; @@ -12134,54 +12137,54 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (UInt32) length { return resultAvatar.length; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) setLength:(UInt32) value { +- (SSKProtoContactDetailsAvatarBuilder*) setLength:(UInt32) value { resultAvatar.hasLength = YES; resultAvatar.length = value; return self; } -- (OWSSignalServiceProtosContactDetailsAvatarBuilder*) clearLength { +- (SSKProtoContactDetailsAvatarBuilder*) clearLength { resultAvatar.hasLength = NO; resultAvatar.length = 0; return self; } @end -@interface OWSSignalServiceProtosContactDetailsBuilder() -@property (strong) OWSSignalServiceProtosContactDetails* resultContactDetails; +@interface SSKProtoContactDetailsBuilder() +@property (strong) SSKProtoContactDetails* resultContactDetails; @end -@implementation OWSSignalServiceProtosContactDetailsBuilder +@implementation SSKProtoContactDetailsBuilder @synthesize resultContactDetails; - (instancetype) init { if ((self = [super init])) { - self.resultContactDetails = [[OWSSignalServiceProtosContactDetails alloc] init]; + self.resultContactDetails = [[SSKProtoContactDetails alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultContactDetails; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clear { - self.resultContactDetails = [[OWSSignalServiceProtosContactDetails alloc] init]; +- (SSKProtoContactDetailsBuilder*) clear { + self.resultContactDetails = [[SSKProtoContactDetails alloc] init]; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clone { - return [OWSSignalServiceProtosContactDetails builderWithPrototype:resultContactDetails]; +- (SSKProtoContactDetailsBuilder*) clone { + return [SSKProtoContactDetails builderWithPrototype:resultContactDetails]; } -- (OWSSignalServiceProtosContactDetails*) defaultInstance { - return [OWSSignalServiceProtosContactDetails defaultInstance]; +- (SSKProtoContactDetails*) defaultInstance { + return [SSKProtoContactDetails defaultInstance]; } -- (OWSSignalServiceProtosContactDetails*) build { +- (SSKProtoContactDetails*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosContactDetails*) buildPartial { - OWSSignalServiceProtosContactDetails* returnMe = resultContactDetails; +- (SSKProtoContactDetails*) buildPartial { + SSKProtoContactDetails* returnMe = resultContactDetails; self.resultContactDetails = nil; return returnMe; } -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFrom:(OWSSignalServiceProtosContactDetails*) other { - if (other == [OWSSignalServiceProtosContactDetails defaultInstance]) { +- (SSKProtoContactDetailsBuilder*) mergeFrom:(SSKProtoContactDetails*) other { + if (other == [SSKProtoContactDetails defaultInstance]) { return self; } if (other.hasNumber) { @@ -12211,10 +12214,10 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoContactDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -12238,7 +12241,7 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos break; } case 26: { - OWSSignalServiceProtosContactDetailsAvatarBuilder* subBuilder = [OWSSignalServiceProtosContactDetailsAvatar builder]; + SSKProtoContactDetailsAvatarBuilder* subBuilder = [SSKProtoContactDetailsAvatar builder]; if (self.hasAvatar) { [subBuilder mergeFrom:self.avatar]; } @@ -12251,7 +12254,7 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos break; } case 42: { - OWSSignalServiceProtosVerifiedBuilder* subBuilder = [OWSSignalServiceProtosVerified builder]; + SSKProtoVerifiedBuilder* subBuilder = [SSKProtoVerified builder]; if (self.hasVerified) { [subBuilder mergeFrom:self.verified]; } @@ -12280,12 +12283,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (NSString*) number { return resultContactDetails.number; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setNumber:(NSString*) value { +- (SSKProtoContactDetailsBuilder*) setNumber:(NSString*) value { resultContactDetails.hasNumber = YES; resultContactDetails.number = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearNumber { +- (SSKProtoContactDetailsBuilder*) clearNumber { resultContactDetails.hasNumber = NO; resultContactDetails.number = @""; return self; @@ -12296,12 +12299,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (NSString*) name { return resultContactDetails.name; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setName:(NSString*) value { +- (SSKProtoContactDetailsBuilder*) setName:(NSString*) value { resultContactDetails.hasName = YES; resultContactDetails.name = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearName { +- (SSKProtoContactDetailsBuilder*) clearName { resultContactDetails.hasName = NO; resultContactDetails.name = @""; return self; @@ -12309,31 +12312,31 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (BOOL) hasAvatar { return resultContactDetails.hasAvatar; } -- (OWSSignalServiceProtosContactDetailsAvatar*) avatar { +- (SSKProtoContactDetailsAvatar*) avatar { return resultContactDetails.avatar; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setAvatar:(OWSSignalServiceProtosContactDetailsAvatar*) value { +- (SSKProtoContactDetailsBuilder*) setAvatar:(SSKProtoContactDetailsAvatar*) value { resultContactDetails.hasAvatar = YES; resultContactDetails.avatar = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setAvatarBuilder:(OWSSignalServiceProtosContactDetailsAvatarBuilder*) builderForValue { +- (SSKProtoContactDetailsBuilder*) setAvatarBuilder:(SSKProtoContactDetailsAvatarBuilder*) builderForValue { return [self setAvatar:[builderForValue build]]; } -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeAvatar:(OWSSignalServiceProtosContactDetailsAvatar*) value { +- (SSKProtoContactDetailsBuilder*) mergeAvatar:(SSKProtoContactDetailsAvatar*) value { if (resultContactDetails.hasAvatar && - resultContactDetails.avatar != [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]) { + resultContactDetails.avatar != [SSKProtoContactDetailsAvatar defaultInstance]) { resultContactDetails.avatar = - [[[OWSSignalServiceProtosContactDetailsAvatar builderWithPrototype:resultContactDetails.avatar] mergeFrom:value] buildPartial]; + [[[SSKProtoContactDetailsAvatar builderWithPrototype:resultContactDetails.avatar] mergeFrom:value] buildPartial]; } else { resultContactDetails.avatar = value; } resultContactDetails.hasAvatar = YES; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearAvatar { +- (SSKProtoContactDetailsBuilder*) clearAvatar { resultContactDetails.hasAvatar = NO; - resultContactDetails.avatar = [OWSSignalServiceProtosContactDetailsAvatar defaultInstance]; + resultContactDetails.avatar = [SSKProtoContactDetailsAvatar defaultInstance]; return self; } - (BOOL) hasColor { @@ -12342,12 +12345,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (NSString*) color { return resultContactDetails.color; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setColor:(NSString*) value { +- (SSKProtoContactDetailsBuilder*) setColor:(NSString*) value { resultContactDetails.hasColor = YES; resultContactDetails.color = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearColor { +- (SSKProtoContactDetailsBuilder*) clearColor { resultContactDetails.hasColor = NO; resultContactDetails.color = @""; return self; @@ -12355,31 +12358,31 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (BOOL) hasVerified { return resultContactDetails.hasVerified; } -- (OWSSignalServiceProtosVerified*) verified { +- (SSKProtoVerified*) verified { return resultContactDetails.verified; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setVerified:(OWSSignalServiceProtosVerified*) value { +- (SSKProtoContactDetailsBuilder*) setVerified:(SSKProtoVerified*) value { resultContactDetails.hasVerified = YES; resultContactDetails.verified = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setVerifiedBuilder:(OWSSignalServiceProtosVerifiedBuilder*) builderForValue { +- (SSKProtoContactDetailsBuilder*) setVerifiedBuilder:(SSKProtoVerifiedBuilder*) builderForValue { return [self setVerified:[builderForValue build]]; } -- (OWSSignalServiceProtosContactDetailsBuilder*) mergeVerified:(OWSSignalServiceProtosVerified*) value { +- (SSKProtoContactDetailsBuilder*) mergeVerified:(SSKProtoVerified*) value { if (resultContactDetails.hasVerified && - resultContactDetails.verified != [OWSSignalServiceProtosVerified defaultInstance]) { + resultContactDetails.verified != [SSKProtoVerified defaultInstance]) { resultContactDetails.verified = - [[[OWSSignalServiceProtosVerified builderWithPrototype:resultContactDetails.verified] mergeFrom:value] buildPartial]; + [[[SSKProtoVerified builderWithPrototype:resultContactDetails.verified] mergeFrom:value] buildPartial]; } else { resultContactDetails.verified = value; } resultContactDetails.hasVerified = YES; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearVerified { +- (SSKProtoContactDetailsBuilder*) clearVerified { resultContactDetails.hasVerified = NO; - resultContactDetails.verified = [OWSSignalServiceProtosVerified defaultInstance]; + resultContactDetails.verified = [SSKProtoVerified defaultInstance]; return self; } - (BOOL) hasProfileKey { @@ -12388,12 +12391,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (NSData*) profileKey { return resultContactDetails.profileKey; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setProfileKey:(NSData*) value { +- (SSKProtoContactDetailsBuilder*) setProfileKey:(NSData*) value { resultContactDetails.hasProfileKey = YES; resultContactDetails.profileKey = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearProfileKey { +- (SSKProtoContactDetailsBuilder*) clearProfileKey { resultContactDetails.hasProfileKey = NO; resultContactDetails.profileKey = [NSData data]; return self; @@ -12404,12 +12407,12 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (BOOL) blocked { return resultContactDetails.blocked; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setBlocked:(BOOL) value { +- (SSKProtoContactDetailsBuilder*) setBlocked:(BOOL) value { resultContactDetails.hasBlocked = YES; resultContactDetails.blocked = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearBlocked { +- (SSKProtoContactDetailsBuilder*) clearBlocked { resultContactDetails.hasBlocked = NO; resultContactDetails.blocked = NO; return self; @@ -12420,29 +12423,29 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos - (UInt32) expireTimer { return resultContactDetails.expireTimer; } -- (OWSSignalServiceProtosContactDetailsBuilder*) setExpireTimer:(UInt32) value { +- (SSKProtoContactDetailsBuilder*) setExpireTimer:(UInt32) value { resultContactDetails.hasExpireTimer = YES; resultContactDetails.expireTimer = value; return self; } -- (OWSSignalServiceProtosContactDetailsBuilder*) clearExpireTimer { +- (SSKProtoContactDetailsBuilder*) clearExpireTimer { resultContactDetails.hasExpireTimer = NO; resultContactDetails.expireTimer = 0; return self; } @end -@interface OWSSignalServiceProtosGroupDetails () +@interface SSKProtoGroupDetails () @property (strong) NSData* id; @property (strong) NSString* name; @property (strong) NSMutableArray * membersArray; -@property (strong) OWSSignalServiceProtosGroupDetailsAvatar* avatar; +@property (strong) SSKProtoGroupDetailsAvatar* avatar; @property BOOL active; @property UInt32 expireTimer; @property (strong) NSString* color; @end -@implementation OWSSignalServiceProtosGroupDetails +@implementation SSKProtoGroupDetails - (BOOL) hasId { return !!hasId_; @@ -12497,24 +12500,24 @@ static OWSSignalServiceProtosContactDetailsAvatar* defaultOWSSignalServiceProtos if ((self = [super init])) { self.id = [NSData data]; self.name = @""; - self.avatar = [OWSSignalServiceProtosGroupDetailsAvatar defaultInstance]; + self.avatar = [SSKProtoGroupDetailsAvatar defaultInstance]; self.active = YES; self.expireTimer = 0; self.color = @""; } return self; } -static OWSSignalServiceProtosGroupDetails* defaultOWSSignalServiceProtosGroupDetailsInstance = nil; +static SSKProtoGroupDetails* defaultSSKProtoGroupDetailsInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosGroupDetails class]) { - defaultOWSSignalServiceProtosGroupDetailsInstance = [[OWSSignalServiceProtosGroupDetails alloc] init]; + if (self == [SSKProtoGroupDetails class]) { + defaultSSKProtoGroupDetailsInstance = [[SSKProtoGroupDetails alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupDetailsInstance; + return defaultSSKProtoGroupDetailsInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupDetailsInstance; + return defaultSSKProtoGroupDetailsInstance; } - (NSArray *)members { return membersArray; @@ -12587,35 +12590,35 @@ static OWSSignalServiceProtosGroupDetails* defaultOWSSignalServiceProtosGroupDet memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromData:data] build]; ++ (SSKProtoGroupDetails*) parseFromData:(NSData*) data { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetails*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromInputStream:input] build]; ++ (SSKProtoGroupDetails*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetails*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetails*)[[[OWSSignalServiceProtosGroupDetails builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetails*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetails*)[[[SSKProtoGroupDetails builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetailsBuilder*) builder { - return [[OWSSignalServiceProtosGroupDetailsBuilder alloc] init]; ++ (SSKProtoGroupDetailsBuilder*) builder { + return [[SSKProtoGroupDetailsBuilder alloc] init]; } -+ (OWSSignalServiceProtosGroupDetailsBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupDetails*) prototype { - return [[OWSSignalServiceProtosGroupDetails builder] mergeFrom:prototype]; ++ (SSKProtoGroupDetailsBuilder*) builderWithPrototype:(SSKProtoGroupDetails*) prototype { + return [[SSKProtoGroupDetails builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) builder { - return [OWSSignalServiceProtosGroupDetails builder]; +- (SSKProtoGroupDetailsBuilder*) builder { + return [SSKProtoGroupDetails builder]; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) toBuilder { - return [OWSSignalServiceProtosGroupDetails builderWithPrototype:self]; +- (SSKProtoGroupDetailsBuilder*) toBuilder { + return [SSKProtoGroupDetails builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasId) { @@ -12672,10 +12675,10 @@ static OWSSignalServiceProtosGroupDetails* defaultOWSSignalServiceProtosGroupDet if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosGroupDetails class]]) { + if (![other isKindOfClass:[SSKProtoGroupDetails class]]) { return NO; } - OWSSignalServiceProtosGroupDetails *otherMessage = other; + SSKProtoGroupDetails *otherMessage = other; return self.hasId == otherMessage.hasId && (!self.hasId || [self.id isEqual:otherMessage.id]) && @@ -12720,12 +12723,12 @@ static OWSSignalServiceProtosGroupDetails* defaultOWSSignalServiceProtosGroupDet } @end -@interface OWSSignalServiceProtosGroupDetailsAvatar () +@interface SSKProtoGroupDetailsAvatar () @property (strong) NSString* contentType; @property UInt32 length; @end -@implementation OWSSignalServiceProtosGroupDetailsAvatar +@implementation SSKProtoGroupDetailsAvatar - (BOOL) hasContentType { return !!hasContentType_; @@ -12748,17 +12751,17 @@ static OWSSignalServiceProtosGroupDetails* defaultOWSSignalServiceProtosGroupDet } return self; } -static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGroupDetailsAvatarInstance = nil; +static SSKProtoGroupDetailsAvatar* defaultSSKProtoGroupDetailsAvatarInstance = nil; + (void) initialize { - if (self == [OWSSignalServiceProtosGroupDetailsAvatar class]) { - defaultOWSSignalServiceProtosGroupDetailsAvatarInstance = [[OWSSignalServiceProtosGroupDetailsAvatar alloc] init]; + if (self == [SSKProtoGroupDetailsAvatar class]) { + defaultSSKProtoGroupDetailsAvatarInstance = [[SSKProtoGroupDetailsAvatar alloc] init]; } } + (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupDetailsAvatarInstance; + return defaultSSKProtoGroupDetailsAvatarInstance; } - (instancetype) defaultInstance { - return defaultOWSSignalServiceProtosGroupDetailsAvatarInstance; + return defaultSSKProtoGroupDetailsAvatarInstance; } - (BOOL) isInitialized { return YES; @@ -12789,35 +12792,35 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr memoizedSerializedSize = size_; return size_; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromData:(NSData*) data { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromData:data] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromData:(NSData*) data { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromData:data] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromData:data extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromInputStream:input] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromCodedInputStream:input] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromCodedInputStream:input] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { - return (OWSSignalServiceProtosGroupDetailsAvatar*)[[[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; ++ (SSKProtoGroupDetailsAvatar*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { + return (SSKProtoGroupDetailsAvatar*)[[[SSKProtoGroupDetailsAvatar builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build]; } -+ (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builder { - return [[OWSSignalServiceProtosGroupDetailsAvatarBuilder alloc] init]; ++ (SSKProtoGroupDetailsAvatarBuilder*) builder { + return [[SSKProtoGroupDetailsAvatarBuilder alloc] init]; } -+ (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builderWithPrototype:(OWSSignalServiceProtosGroupDetailsAvatar*) prototype { - return [[OWSSignalServiceProtosGroupDetailsAvatar builder] mergeFrom:prototype]; ++ (SSKProtoGroupDetailsAvatarBuilder*) builderWithPrototype:(SSKProtoGroupDetailsAvatar*) prototype { + return [[SSKProtoGroupDetailsAvatar builder] mergeFrom:prototype]; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builder { - return [OWSSignalServiceProtosGroupDetailsAvatar builder]; +- (SSKProtoGroupDetailsAvatarBuilder*) builder { + return [SSKProtoGroupDetailsAvatar builder]; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) toBuilder { - return [OWSSignalServiceProtosGroupDetailsAvatar builderWithPrototype:self]; +- (SSKProtoGroupDetailsAvatarBuilder*) toBuilder { + return [SSKProtoGroupDetailsAvatar builderWithPrototype:self]; } - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { if (self.hasContentType) { @@ -12841,10 +12844,10 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr if (other == self) { return YES; } - if (![other isKindOfClass:[OWSSignalServiceProtosGroupDetailsAvatar class]]) { + if (![other isKindOfClass:[SSKProtoGroupDetailsAvatar class]]) { return NO; } - OWSSignalServiceProtosGroupDetailsAvatar *otherMessage = other; + SSKProtoGroupDetailsAvatar *otherMessage = other; return self.hasContentType == otherMessage.hasContentType && (!self.hasContentType || [self.contentType isEqual:otherMessage.contentType]) && @@ -12865,42 +12868,42 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr } @end -@interface OWSSignalServiceProtosGroupDetailsAvatarBuilder() -@property (strong) OWSSignalServiceProtosGroupDetailsAvatar* resultAvatar; +@interface SSKProtoGroupDetailsAvatarBuilder() +@property (strong) SSKProtoGroupDetailsAvatar* resultAvatar; @end -@implementation OWSSignalServiceProtosGroupDetailsAvatarBuilder +@implementation SSKProtoGroupDetailsAvatarBuilder @synthesize resultAvatar; - (instancetype) init { if ((self = [super init])) { - self.resultAvatar = [[OWSSignalServiceProtosGroupDetailsAvatar alloc] init]; + self.resultAvatar = [[SSKProtoGroupDetailsAvatar alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultAvatar; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clear { - self.resultAvatar = [[OWSSignalServiceProtosGroupDetailsAvatar alloc] init]; +- (SSKProtoGroupDetailsAvatarBuilder*) clear { + self.resultAvatar = [[SSKProtoGroupDetailsAvatar alloc] init]; return self; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clone { - return [OWSSignalServiceProtosGroupDetailsAvatar builderWithPrototype:resultAvatar]; +- (SSKProtoGroupDetailsAvatarBuilder*) clone { + return [SSKProtoGroupDetailsAvatar builderWithPrototype:resultAvatar]; } -- (OWSSignalServiceProtosGroupDetailsAvatar*) defaultInstance { - return [OWSSignalServiceProtosGroupDetailsAvatar defaultInstance]; +- (SSKProtoGroupDetailsAvatar*) defaultInstance { + return [SSKProtoGroupDetailsAvatar defaultInstance]; } -- (OWSSignalServiceProtosGroupDetailsAvatar*) build { +- (SSKProtoGroupDetailsAvatar*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosGroupDetailsAvatar*) buildPartial { - OWSSignalServiceProtosGroupDetailsAvatar* returnMe = resultAvatar; +- (SSKProtoGroupDetailsAvatar*) buildPartial { + SSKProtoGroupDetailsAvatar* returnMe = resultAvatar; self.resultAvatar = nil; return returnMe; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFrom:(OWSSignalServiceProtosGroupDetailsAvatar*) other { - if (other == [OWSSignalServiceProtosGroupDetailsAvatar defaultInstance]) { +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFrom:(SSKProtoGroupDetailsAvatar*) other { + if (other == [SSKProtoGroupDetailsAvatar defaultInstance]) { return self; } if (other.hasContentType) { @@ -12912,10 +12915,10 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoGroupDetailsAvatarBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -12947,12 +12950,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (NSString*) contentType { return resultAvatar.contentType; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) setContentType:(NSString*) value { +- (SSKProtoGroupDetailsAvatarBuilder*) setContentType:(NSString*) value { resultAvatar.hasContentType = YES; resultAvatar.contentType = value; return self; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clearContentType { +- (SSKProtoGroupDetailsAvatarBuilder*) clearContentType { resultAvatar.hasContentType = NO; resultAvatar.contentType = @""; return self; @@ -12963,54 +12966,54 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (UInt32) length { return resultAvatar.length; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) setLength:(UInt32) value { +- (SSKProtoGroupDetailsAvatarBuilder*) setLength:(UInt32) value { resultAvatar.hasLength = YES; resultAvatar.length = value; return self; } -- (OWSSignalServiceProtosGroupDetailsAvatarBuilder*) clearLength { +- (SSKProtoGroupDetailsAvatarBuilder*) clearLength { resultAvatar.hasLength = NO; resultAvatar.length = 0; return self; } @end -@interface OWSSignalServiceProtosGroupDetailsBuilder() -@property (strong) OWSSignalServiceProtosGroupDetails* resultGroupDetails; +@interface SSKProtoGroupDetailsBuilder() +@property (strong) SSKProtoGroupDetails* resultGroupDetails; @end -@implementation OWSSignalServiceProtosGroupDetailsBuilder +@implementation SSKProtoGroupDetailsBuilder @synthesize resultGroupDetails; - (instancetype) init { if ((self = [super init])) { - self.resultGroupDetails = [[OWSSignalServiceProtosGroupDetails alloc] init]; + self.resultGroupDetails = [[SSKProtoGroupDetails alloc] init]; } return self; } - (PBGeneratedMessage*) internalGetResult { return resultGroupDetails; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clear { - self.resultGroupDetails = [[OWSSignalServiceProtosGroupDetails alloc] init]; +- (SSKProtoGroupDetailsBuilder*) clear { + self.resultGroupDetails = [[SSKProtoGroupDetails alloc] init]; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clone { - return [OWSSignalServiceProtosGroupDetails builderWithPrototype:resultGroupDetails]; +- (SSKProtoGroupDetailsBuilder*) clone { + return [SSKProtoGroupDetails builderWithPrototype:resultGroupDetails]; } -- (OWSSignalServiceProtosGroupDetails*) defaultInstance { - return [OWSSignalServiceProtosGroupDetails defaultInstance]; +- (SSKProtoGroupDetails*) defaultInstance { + return [SSKProtoGroupDetails defaultInstance]; } -- (OWSSignalServiceProtosGroupDetails*) build { +- (SSKProtoGroupDetails*) build { [self checkInitialized]; return [self buildPartial]; } -- (OWSSignalServiceProtosGroupDetails*) buildPartial { - OWSSignalServiceProtosGroupDetails* returnMe = resultGroupDetails; +- (SSKProtoGroupDetails*) buildPartial { + SSKProtoGroupDetails* returnMe = resultGroupDetails; self.resultGroupDetails = nil; return returnMe; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFrom:(OWSSignalServiceProtosGroupDetails*) other { - if (other == [OWSSignalServiceProtosGroupDetails defaultInstance]) { +- (SSKProtoGroupDetailsBuilder*) mergeFrom:(SSKProtoGroupDetails*) other { + if (other == [SSKProtoGroupDetails defaultInstance]) { return self; } if (other.hasId) { @@ -13041,10 +13044,10 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr [self mergeUnknownFields:other.unknownFields]; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { +- (SSKProtoGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input { return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]]; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { +- (SSKProtoGroupDetailsBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry { PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields]; while (YES) { SInt32 tag = [input readTag]; @@ -13072,7 +13075,7 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr break; } case 34: { - OWSSignalServiceProtosGroupDetailsAvatarBuilder* subBuilder = [OWSSignalServiceProtosGroupDetailsAvatar builder]; + SSKProtoGroupDetailsAvatarBuilder* subBuilder = [SSKProtoGroupDetailsAvatar builder]; if (self.hasAvatar) { [subBuilder mergeFrom:self.avatar]; } @@ -13101,12 +13104,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (NSData*) id { return resultGroupDetails.id; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setId:(NSData*) value { +- (SSKProtoGroupDetailsBuilder*) setId:(NSData*) value { resultGroupDetails.hasId = YES; resultGroupDetails.id = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearId { +- (SSKProtoGroupDetailsBuilder*) clearId { resultGroupDetails.hasId = NO; resultGroupDetails.id = [NSData data]; return self; @@ -13117,12 +13120,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (NSString*) name { return resultGroupDetails.name; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setName:(NSString*) value { +- (SSKProtoGroupDetailsBuilder*) setName:(NSString*) value { resultGroupDetails.hasName = YES; resultGroupDetails.name = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearName { +- (SSKProtoGroupDetailsBuilder*) clearName { resultGroupDetails.hasName = NO; resultGroupDetails.name = @""; return self; @@ -13133,49 +13136,49 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (NSString*)membersAtIndex:(NSUInteger)index { return [resultGroupDetails membersAtIndex:index]; } -- (OWSSignalServiceProtosGroupDetailsBuilder *)addMembers:(NSString*)value { +- (SSKProtoGroupDetailsBuilder *)addMembers:(NSString*)value { if (resultGroupDetails.membersArray == nil) { resultGroupDetails.membersArray = [[NSMutableArray alloc]init]; } [resultGroupDetails.membersArray addObject:value]; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder *)setMembersArray:(NSArray *)array { +- (SSKProtoGroupDetailsBuilder *)setMembersArray:(NSArray *)array { resultGroupDetails.membersArray = [[NSMutableArray alloc] initWithArray:array]; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder *)clearMembers { +- (SSKProtoGroupDetailsBuilder *)clearMembers { resultGroupDetails.membersArray = nil; return self; } - (BOOL) hasAvatar { return resultGroupDetails.hasAvatar; } -- (OWSSignalServiceProtosGroupDetailsAvatar*) avatar { +- (SSKProtoGroupDetailsAvatar*) avatar { return resultGroupDetails.avatar; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setAvatar:(OWSSignalServiceProtosGroupDetailsAvatar*) value { +- (SSKProtoGroupDetailsBuilder*) setAvatar:(SSKProtoGroupDetailsAvatar*) value { resultGroupDetails.hasAvatar = YES; resultGroupDetails.avatar = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setAvatarBuilder:(OWSSignalServiceProtosGroupDetailsAvatarBuilder*) builderForValue { +- (SSKProtoGroupDetailsBuilder*) setAvatarBuilder:(SSKProtoGroupDetailsAvatarBuilder*) builderForValue { return [self setAvatar:[builderForValue build]]; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) mergeAvatar:(OWSSignalServiceProtosGroupDetailsAvatar*) value { +- (SSKProtoGroupDetailsBuilder*) mergeAvatar:(SSKProtoGroupDetailsAvatar*) value { if (resultGroupDetails.hasAvatar && - resultGroupDetails.avatar != [OWSSignalServiceProtosGroupDetailsAvatar defaultInstance]) { + resultGroupDetails.avatar != [SSKProtoGroupDetailsAvatar defaultInstance]) { resultGroupDetails.avatar = - [[[OWSSignalServiceProtosGroupDetailsAvatar builderWithPrototype:resultGroupDetails.avatar] mergeFrom:value] buildPartial]; + [[[SSKProtoGroupDetailsAvatar builderWithPrototype:resultGroupDetails.avatar] mergeFrom:value] buildPartial]; } else { resultGroupDetails.avatar = value; } resultGroupDetails.hasAvatar = YES; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearAvatar { +- (SSKProtoGroupDetailsBuilder*) clearAvatar { resultGroupDetails.hasAvatar = NO; - resultGroupDetails.avatar = [OWSSignalServiceProtosGroupDetailsAvatar defaultInstance]; + resultGroupDetails.avatar = [SSKProtoGroupDetailsAvatar defaultInstance]; return self; } - (BOOL) hasActive { @@ -13184,12 +13187,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (BOOL) active { return resultGroupDetails.active; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setActive:(BOOL) value { +- (SSKProtoGroupDetailsBuilder*) setActive:(BOOL) value { resultGroupDetails.hasActive = YES; resultGroupDetails.active = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearActive { +- (SSKProtoGroupDetailsBuilder*) clearActive { resultGroupDetails.hasActive = NO; resultGroupDetails.active = YES; return self; @@ -13200,12 +13203,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (UInt32) expireTimer { return resultGroupDetails.expireTimer; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setExpireTimer:(UInt32) value { +- (SSKProtoGroupDetailsBuilder*) setExpireTimer:(UInt32) value { resultGroupDetails.hasExpireTimer = YES; resultGroupDetails.expireTimer = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearExpireTimer { +- (SSKProtoGroupDetailsBuilder*) clearExpireTimer { resultGroupDetails.hasExpireTimer = NO; resultGroupDetails.expireTimer = 0; return self; @@ -13216,12 +13219,12 @@ static OWSSignalServiceProtosGroupDetailsAvatar* defaultOWSSignalServiceProtosGr - (NSString*) color { return resultGroupDetails.color; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) setColor:(NSString*) value { +- (SSKProtoGroupDetailsBuilder*) setColor:(NSString*) value { resultGroupDetails.hasColor = YES; resultGroupDetails.color = value; return self; } -- (OWSSignalServiceProtosGroupDetailsBuilder*) clearColor { +- (SSKProtoGroupDetailsBuilder*) clearColor { resultGroupDetails.hasColor = NO; resultGroupDetails.color = @""; return self; diff --git a/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m b/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m index 9921db981..2960f725a 100644 --- a/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m +++ b/SignalServiceKit/src/Network/WebSockets/TSSocketManager.m @@ -15,7 +15,6 @@ #import "OWSMessageReceiver.h" #import "OWSPrimaryStorage.h" #import "OWSSignalService.h" -#import "OWSSignalServiceProtos.pb.h" #import "OWSWebsocketSecurityPolicy.h" #import "TSAccountManager.h" #import "TSConstants.h" diff --git a/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h b/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h index 2bce3e00d..2ab05e474 100644 --- a/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h +++ b/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h @@ -1,25 +1,26 @@ -// Created by Michael Kirk on 12/4/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// NS_ASSUME_NONNULL_BEGIN -@class OWSSignalServiceProtosCallMessageOffer; -@class OWSSignalServiceProtosCallMessageAnswer; -@class OWSSignalServiceProtosCallMessageIceUpdate; -@class OWSSignalServiceProtosCallMessageHangup; -@class OWSSignalServiceProtosCallMessageBusy; +@class SSKProtoCallMessageAnswer; +@class SSKProtoCallMessageBusy; +@class SSKProtoCallMessageHangup; +@class SSKProtoCallMessageIceUpdate; +@class SSKProtoCallMessageOffer; @protocol OWSCallMessageHandler -- (void)receivedOffer:(OWSSignalServiceProtosCallMessageOffer *)offer +- (void)receivedOffer:(SSKProtoCallMessageOffer *)offer fromCallerId:(NSString *)callerId NS_SWIFT_NAME(receivedOffer(_:from:)); -- (void)receivedAnswer:(OWSSignalServiceProtosCallMessageAnswer *)answer +- (void)receivedAnswer:(SSKProtoCallMessageAnswer *)answer fromCallerId:(NSString *)callerId NS_SWIFT_NAME(receivedAnswer(_:from:)); -- (void)receivedIceUpdate:(OWSSignalServiceProtosCallMessageIceUpdate *)iceUpdate +- (void)receivedIceUpdate:(SSKProtoCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId NS_SWIFT_NAME(receivedIceUpdate(_:from:)); -- (void)receivedHangup:(OWSSignalServiceProtosCallMessageHangup *)hangup +- (void)receivedHangup:(SSKProtoCallMessageHangup *)hangup fromCallerId:(NSString *)callerId NS_SWIFT_NAME(receivedHangup(_:from:)); -- (void)receivedBusy:(OWSSignalServiceProtosCallMessageBusy *)busy +- (void)receivedBusy:(SSKProtoCallMessageBusy *)busy fromCallerId:(NSString *)callerId NS_SWIFT_NAME(receivedBusy(_:from:)); @end diff --git a/SignalServiceKit/src/Protocols/ProtoBuf+OWS.h b/SignalServiceKit/src/Protocols/ProtoBuf+OWS.h index 320635475..c4f77eabd 100644 --- a/SignalServiceKit/src/Protocols/ProtoBuf+OWS.h +++ b/SignalServiceKit/src/Protocols/ProtoBuf+OWS.h @@ -1,20 +1,20 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import "OWSSignalServiceProtos.pb.h" +#import "SignalServiceKit-Swift.h" NS_ASSUME_NONNULL_BEGIN @class TSThread; -@interface PBGeneratedMessageBuilder (OWS) - -@end +//@interface PBGeneratedMessageBuilder (OWS) +// +//@end #pragma mark - -@interface OWSSignalServiceProtosDataMessageBuilder (OWS) +@interface SSKProtoDataMessageBuilder (OWS) - (void)addLocalProfileKeyIfNecessary:(TSThread *)thread recipientId:(NSString *_Nullable)recipientId; - (void)addLocalProfileKey; @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@interface OWSSignalServiceProtosCallMessageBuilder (OWS) +@interface SSKProtoCallMessageBuilder (OWS) - (void)addLocalProfileKeyIfNecessary:(TSThread *)thread recipientId:(NSString *)recipientId; diff --git a/SignalServiceKit/src/Protocols/ProtoBuf+OWS.m b/SignalServiceKit/src/Protocols/ProtoBuf+OWS.m index ae6c0bdb8..0459a1219 100644 --- a/SignalServiceKit/src/Protocols/ProtoBuf+OWS.m +++ b/SignalServiceKit/src/Protocols/ProtoBuf+OWS.m @@ -2,47 +2,47 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // +#import "ProtoBuf+OWS.h" #import "Cryptography.h" #import "ProfileManagerProtocol.h" -#import "ProtoBuf+OWS.h" #import "TSThread.h" #import "TextSecureKitEnv.h" NS_ASSUME_NONNULL_BEGIN -@implementation PBGeneratedMessageBuilder (OWS) - -- (BOOL)shouldMessageHaveLocalProfileKey:(TSThread *)thread recipientId:(NSString *_Nullable)recipientId -{ - OWSAssert(thread); - - id profileManager = [TextSecureKitEnv sharedEnv].profileManager; - - // For 1:1 threads, we want to include the profile key IFF the - // contact is in the whitelist. - // - // For Group threads, we want to include the profile key IFF the - // recipient OR the group is in the whitelist. - if (recipientId.length > 0 && [profileManager isUserInProfileWhitelist:recipientId]) { - return YES; - } else if ([profileManager isThreadInProfileWhitelist:thread]) { - return YES; - } - - return NO; -} - -- (OWSAES256Key *)localProfileKey -{ - id profileManager = [TextSecureKitEnv sharedEnv].profileManager; - return profileManager.localProfileKey; -} - -@end +//@implementation PBGeneratedMessageBuilder (OWS) +// +//- (BOOL)shouldMessageHaveLocalProfileKey:(TSThread *)thread recipientId:(NSString *_Nullable)recipientId +//{ +// OWSAssert(thread); +// +// id profileManager = [TextSecureKitEnv sharedEnv].profileManager; +// +// // For 1:1 threads, we want to include the profile key IFF the +// // contact is in the whitelist. +// // +// // For Group threads, we want to include the profile key IFF the +// // recipient OR the group is in the whitelist. +// if (recipientId.length > 0 && [profileManager isUserInProfileWhitelist:recipientId]) { +// return YES; +// } else if ([profileManager isThreadInProfileWhitelist:thread]) { +// return YES; +// } +// +// return NO; +//} +// +//- (OWSAES256Key *)localProfileKey +//{ +// id profileManager = [TextSecureKitEnv sharedEnv].profileManager; +// return profileManager.localProfileKey; +//} +// +//@end #pragma mark - -@implementation OWSSignalServiceProtosDataMessageBuilder (OWS) +@implementation SSKProtoDataMessageBuilder (OWS) - (void)addLocalProfileKeyIfNecessary:(TSThread *)thread recipientId:(NSString *_Nullable)recipientId { @@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@implementation OWSSignalServiceProtosCallMessageBuilder (OWS) +@implementation SSKProtoCallMessageBuilder (OWS) - (void)addLocalProfileKeyIfNecessary:(TSThread *)thread recipientId:(NSString *)recipientId { diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.h b/SignalServiceKit/src/Security/OWSRecipientIdentity.h index 653ee306b..eefef55c4 100644 --- a/SignalServiceKit/src/Security/OWSRecipientIdentity.h +++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import "OWSSignalServiceProtos.pb.h" +#import "SignalServiceKit-Swift.h" #import "TSYapDatabaseObject.h" NS_ASSUME_NONNULL_BEGIN @@ -14,7 +14,7 @@ typedef NS_ENUM(NSUInteger, OWSVerificationState) { }; NSString *OWSVerificationStateToString(OWSVerificationState verificationState); -OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerificationState verificationState); +SSKProtoVerifiedState OWSVerificationStateToProtoState(OWSVerificationState verificationState); @interface OWSRecipientIdentity : TSYapDatabaseObject diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.m b/SignalServiceKit/src/Security/OWSRecipientIdentity.m index 1deda02e8..34f1d27fb 100644 --- a/SignalServiceKit/src/Security/OWSRecipientIdentity.m +++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.m @@ -21,15 +21,15 @@ NSString *OWSVerificationStateToString(OWSVerificationState verificationState) } } -OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerificationState verificationState) +SSKProtoVerifiedState OWSVerificationStateToProtoState(OWSVerificationState verificationState) { switch (verificationState) { case OWSVerificationStateDefault: - return OWSSignalServiceProtosVerifiedStateDefault; + return SSKProtoVerifiedStateDefault; case OWSVerificationStateVerified: - return OWSSignalServiceProtosVerifiedStateVerified; + return SSKProtoVerifiedStateVerified; case OWSVerificationStateNoLongerVerified: - return OWSSignalServiceProtosVerifiedStateUnverified; + return SSKProtoVerifiedStateUnverified; } }