diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h index b2a373808b..4ba8547a01 100644 --- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h +++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h @@ -12,38 +12,6 @@ __attribute__((deprecated)) @interface OWSAddToProfileWhitelistOfferMessage : TS // --- CODE GENERATION MARKER -// This snippet is generated by /Scripts/sds_codegen/sds_generate.py. Do not manually edit it, instead run -// `sds_codegen.sh`. - -// clang-format off - -- (instancetype)initWithGrdbId:(int64_t)grdbId - uniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - attachmentIds:(NSArray *)attachmentIds - body:(nullable NSString *)body - contactShare:(nullable OWSContact *)contactShare - expireStartedAt:(uint64_t)expireStartedAt - expiresAt:(uint64_t)expiresAt - expiresInSeconds:(unsigned int)expiresInSeconds - isViewOnceComplete:(BOOL)isViewOnceComplete - isViewOnceMessage:(BOOL)isViewOnceMessage - linkPreview:(nullable OWSLinkPreview *)linkPreview - messageSticker:(nullable MessageSticker *)messageSticker - quotedMessage:(nullable TSQuotedMessage *)quotedMessage - storedShouldStartExpireTimer:(BOOL)storedShouldStartExpireTimer - customMessage:(nullable NSString *)customMessage - messageType:(TSInfoMessageType)messageType - read:(BOOL)read - unregisteredAddress:(nullable SignalServiceAddress *)unregisteredAddress - contactId:(NSString *)contactId -NS_SWIFT_NAME(init(grdbId:uniqueId:receivedAtTimestamp:sortId:timestamp:uniqueThreadId:attachmentIds:body:contactShare:expireStartedAt:expiresAt:expiresInSeconds:isViewOnceComplete:isViewOnceMessage:linkPreview:messageSticker:quotedMessage:storedShouldStartExpireTimer:customMessage:messageType:read:unregisteredAddress:contactId:)); - -// clang-format on - // --- CODE GENERATION MARKER @end diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m index 2a92f8c5bb..b1e7376d91 100644 --- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m +++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m @@ -16,69 +16,6 @@ NS_ASSUME_NONNULL_BEGIN // --- CODE GENERATION MARKER -// This snippet is generated by /Scripts/sds_codegen/sds_generate.py. Do not manually edit it, instead run -// `sds_codegen.sh`. - -// clang-format off - -- (instancetype)initWithGrdbId:(int64_t)grdbId - uniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - attachmentIds:(NSArray *)attachmentIds - body:(nullable NSString *)body - contactShare:(nullable OWSContact *)contactShare - expireStartedAt:(uint64_t)expireStartedAt - expiresAt:(uint64_t)expiresAt - expiresInSeconds:(unsigned int)expiresInSeconds - isViewOnceComplete:(BOOL)isViewOnceComplete - isViewOnceMessage:(BOOL)isViewOnceMessage - linkPreview:(nullable OWSLinkPreview *)linkPreview - messageSticker:(nullable MessageSticker *)messageSticker - quotedMessage:(nullable TSQuotedMessage *)quotedMessage - storedShouldStartExpireTimer:(BOOL)storedShouldStartExpireTimer - customMessage:(nullable NSString *)customMessage - messageType:(TSInfoMessageType)messageType - read:(BOOL)read - unregisteredAddress:(nullable SignalServiceAddress *)unregisteredAddress - contactId:(NSString *)contactId -{ - self = [super initWithGrdbId:grdbId - uniqueId:uniqueId - receivedAtTimestamp:receivedAtTimestamp - sortId:sortId - timestamp:timestamp - uniqueThreadId:uniqueThreadId - attachmentIds:attachmentIds - body:body - contactShare:contactShare - expireStartedAt:expireStartedAt - expiresAt:expiresAt - expiresInSeconds:expiresInSeconds - isViewOnceComplete:isViewOnceComplete - isViewOnceMessage:isViewOnceMessage - linkPreview:linkPreview - messageSticker:messageSticker - quotedMessage:quotedMessage - storedShouldStartExpireTimer:storedShouldStartExpireTimer - customMessage:customMessage - messageType:messageType - read:read - unregisteredAddress:unregisteredAddress]; - - if (!self) { - return self; - } - - _contactId = contactId; - - return self; -} - -// clang-format on - // --- CODE GENERATION MARKER - (BOOL)shouldUseReceiptDateForSorting diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h index 535845a0c1..5e7f0bd3e2 100644 --- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h +++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h @@ -12,37 +12,6 @@ __attribute__((deprecated)) @interface OWSUnknownContactBlockOfferMessage : TSEr // --- CODE GENERATION MARKER -// This snippet is generated by /Scripts/sds_codegen/sds_generate.py. Do not manually edit it, instead run -// `sds_codegen.sh`. - -// clang-format off - -- (instancetype)initWithGrdbId:(int64_t)grdbId - uniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - attachmentIds:(NSArray *)attachmentIds - body:(nullable NSString *)body - contactShare:(nullable OWSContact *)contactShare - expireStartedAt:(uint64_t)expireStartedAt - expiresAt:(uint64_t)expiresAt - expiresInSeconds:(unsigned int)expiresInSeconds - isViewOnceComplete:(BOOL)isViewOnceComplete - isViewOnceMessage:(BOOL)isViewOnceMessage - linkPreview:(nullable OWSLinkPreview *)linkPreview - messageSticker:(nullable MessageSticker *)messageSticker - quotedMessage:(nullable TSQuotedMessage *)quotedMessage - storedShouldStartExpireTimer:(BOOL)storedShouldStartExpireTimer - errorType:(TSErrorMessageType)errorType - read:(BOOL)read - recipientAddress:(nullable SignalServiceAddress *)recipientAddress - contactId:(NSString *)contactId -NS_SWIFT_NAME(init(grdbId:uniqueId:receivedAtTimestamp:sortId:timestamp:uniqueThreadId:attachmentIds:body:contactShare:expireStartedAt:expiresAt:expiresInSeconds:isViewOnceComplete:isViewOnceMessage:linkPreview:messageSticker:quotedMessage:storedShouldStartExpireTimer:errorType:read:recipientAddress:contactId:)); - -// clang-format on - // --- CODE GENERATION MARKER @end diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m index 812ff4b166..3b98835acc 100644 --- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m +++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m @@ -17,67 +17,6 @@ NS_ASSUME_NONNULL_BEGIN // --- CODE GENERATION MARKER -// This snippet is generated by /Scripts/sds_codegen/sds_generate.py. Do not manually edit it, instead run -// `sds_codegen.sh`. - -// clang-format off - -- (instancetype)initWithGrdbId:(int64_t)grdbId - uniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - attachmentIds:(NSArray *)attachmentIds - body:(nullable NSString *)body - contactShare:(nullable OWSContact *)contactShare - expireStartedAt:(uint64_t)expireStartedAt - expiresAt:(uint64_t)expiresAt - expiresInSeconds:(unsigned int)expiresInSeconds - isViewOnceComplete:(BOOL)isViewOnceComplete - isViewOnceMessage:(BOOL)isViewOnceMessage - linkPreview:(nullable OWSLinkPreview *)linkPreview - messageSticker:(nullable MessageSticker *)messageSticker - quotedMessage:(nullable TSQuotedMessage *)quotedMessage - storedShouldStartExpireTimer:(BOOL)storedShouldStartExpireTimer - errorType:(TSErrorMessageType)errorType - read:(BOOL)read - recipientAddress:(nullable SignalServiceAddress *)recipientAddress - contactId:(NSString *)contactId -{ - self = [super initWithGrdbId:grdbId - uniqueId:uniqueId - receivedAtTimestamp:receivedAtTimestamp - sortId:sortId - timestamp:timestamp - uniqueThreadId:uniqueThreadId - attachmentIds:attachmentIds - body:body - contactShare:contactShare - expireStartedAt:expireStartedAt - expiresAt:expiresAt - expiresInSeconds:expiresInSeconds - isViewOnceComplete:isViewOnceComplete - isViewOnceMessage:isViewOnceMessage - linkPreview:linkPreview - messageSticker:messageSticker - quotedMessage:quotedMessage - storedShouldStartExpireTimer:storedShouldStartExpireTimer - errorType:errorType - read:read - recipientAddress:recipientAddress]; - - if (!self) { - return self; - } - - _contactId = contactId; - - return self; -} - -// clang-format on - // --- CODE GENERATION MARKER - (BOOL)shouldUseReceiptDateForSorting