signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Respond to CR.

Browse Source
This commit is contained in:
Matthew Chen 2019-09-17 11:02:58 -03:00
parent 73c8ded66b
commit 232f65618e
39 changed files with 124 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/sds_codegen/sds_generate.py
View File

@ -426,20 +426,11 @@ class TypeInfo:
conversion_method = conversion_map[self.swift_type()]
if conversion_method is None:
fail('Could not convert:', self.swift_type())
serialization_conversion = '$0.%s' % ( conversion_method, )
if self.swift_type() == 'UInt64':
serialization_conversion = 'serializationSafeUInt64(%s)' % ( serialization_conversion, )
elif self.swift_type() == 'UInt':
serialization_conversion = 'serializationSafeUInt(%s)' % ( serialization_conversion, )
serialization_conversion = '{ %s }' % ( serialization_conversion, )
serialization_conversion = '{ $0.%s }' % ( conversion_method, )
if is_optional or did_force_optional:
return 'archiveOptionalNSNumber(%s, conversion: %s)' % ( value_expr, serialization_conversion, )
else:
return 'archiveNSNumber(%s, conversion: %s)' % ( value_expr, serialization_conversion, )
elif self.swift_type() == 'UInt64':
value_expr = 'serializationSafeUInt64(%s)' % ( value_expr, )
elif self.swift_type() == 'UInt':
value_expr = 'serializationSafeUInt(%s)' % ( value_expr, )
return value_expr

2
SignalServiceKit/src/Contacts/SignalAccount+SDS.swift
View File

@ -574,7 +574,7 @@ class SignalAccountSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let accountSchemaVersion: UInt = serializationSafeUInt(model.accountSchemaVersion)
let accountSchemaVersion: UInt = model.accountSchemaVersion
let contact: Data? = optionalArchive(model.contact)
let hasMultipleAccountContact: Bool = model.hasMultipleAccountContact
let multipleAccountLabelText: String = model.multipleAccountLabelText

2
SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift
View File

@ -562,7 +562,7 @@ class SignalRecipientSerializer: SDSSerializer {
// Base class properties
let devices: Data = requiredArchive(model.devices)
let recipientPhoneNumber: String? = model.recipientPhoneNumber
let recipientSchemaVersion: UInt = serializationSafeUInt(model.recipientSchemaVersion)
let recipientSchemaVersion: UInt = model.recipientSchemaVersion
let recipientUUID: String? = model.recipientUUID
return SignalRecipientRecord(id: id, recordType: recordType, uniqueId: uniqueId, devices: devices, recipientPhoneNumber: recipientPhoneNumber, recipientSchemaVersion: recipientSchemaVersion, recipientUUID: recipientUUID)

2
SignalServiceKit/src/Contacts/TSThread+SDS.swift
View File

@ -706,7 +706,7 @@ class TSThreadSerializer: SDSSerializer {
// Base class properties
let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
let conversationColorName: String = model.conversationColorName.rawValue
let creationDate: Double? = archiveOptionalDate(model.creationDate)
let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting

4
SignalServiceKit/src/Contacts/Threads/TSContactThread+SDS.swift
View File

@ -62,7 +62,7 @@ class TSContactThreadSerializer: SDSSerializer {
// Base class properties
let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
let conversationColorName: String = model.conversationColorName.rawValue
let creationDate: Double? = archiveOptionalDate(model.creationDate)
let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting
@ -73,7 +73,7 @@ class TSContactThreadSerializer: SDSSerializer {
// Subclass properties
let contactPhoneNumber: String? = model.contactPhoneNumber
let contactThreadSchemaVersion: UInt? = serializationSafeUInt(model.contactThreadSchemaVersion)
let contactThreadSchemaVersion: UInt? = model.contactThreadSchemaVersion
let contactUUID: String? = model.contactUUID
let groupModel: Data? = nil
let hasDismissedOffers: Bool? = model.hasDismissedOffers

2
SignalServiceKit/src/Contacts/Threads/TSGroupThread+SDS.swift
View File

@ -62,7 +62,7 @@ class TSGroupThreadSerializer: SDSSerializer {
// Base class properties
let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
let conversationColorName: String = model.conversationColorName.rawValue
let creationDate: Double? = archiveOptionalDate(model.creationDate)
let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting

6
SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift
View File

@ -566,9 +566,9 @@ class OWSLinkedDeviceReadReceiptSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let linkedDeviceReadReceiptSchemaVersion: UInt = serializationSafeUInt(model.linkedDeviceReadReceiptSchemaVersion)
let messageIdTimestamp: UInt64 = serializationSafeUInt64(model.messageIdTimestamp)
let readTimestamp: UInt64 = serializationSafeUInt64(model.readTimestamp)
let linkedDeviceReadReceiptSchemaVersion: UInt = model.linkedDeviceReadReceiptSchemaVersion
let messageIdTimestamp: UInt64 = model.messageIdTimestamp
let readTimestamp: UInt64 = model.readTimestamp
let senderPhoneNumber: String? = model.senderPhoneNumber
let senderUUID: String? = model.senderUUID

4
SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift
View File

@ -778,14 +778,14 @@ class TSAttachmentSerializer: SDSSerializer {
// Base class properties
let albumMessageId: String? = model.albumMessageId
let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
let attachmentType: TSAttachmentType = model.attachmentType
let byteCount: UInt32 = model.byteCount
let caption: String? = model.caption
let contentType: String = model.contentType
let encryptionKey: Data? = model.encryptionKey
let isDownloaded: Bool = model.isDownloaded
let serverId: UInt64 = serializationSafeUInt64(model.serverId)
let serverId: UInt64 = model.serverId
let sourceFilename: String? = model.sourceFilename
// Subclass properties

4
SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer+SDS.swift
View File

@ -62,14 +62,14 @@ class TSAttachmentPointerSerializer: SDSSerializer {
// Base class properties
let albumMessageId: String? = model.albumMessageId
let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
let attachmentType: TSAttachmentType = model.attachmentType
let byteCount: UInt32 = model.byteCount
let caption: String? = model.caption
let contentType: String = model.contentType
let encryptionKey: Data? = model.encryptionKey
let isDownloaded: Bool = model.isDownloaded
let serverId: UInt64 = serializationSafeUInt64(model.serverId)
let serverId: UInt64 = model.serverId
let sourceFilename: String? = model.sourceFilename
// Subclass properties

4
SignalServiceKit/src/Messages/Attachments/TSAttachmentStream+SDS.swift
View File

@ -62,14 +62,14 @@ class TSAttachmentStreamSerializer: SDSSerializer {
// Base class properties
let albumMessageId: String? = model.albumMessageId
let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
let attachmentType: TSAttachmentType = model.attachmentType
let byteCount: UInt32 = model.byteCount
let caption: String? = model.caption
let contentType: String = model.contentType
let encryptionKey: Data? = model.encryptionKey
let isDownloaded: Bool = model.isDownloaded
let serverId: UInt64 = serializationSafeUInt64(model.serverId)
let serverId: UInt64 = model.serverId
let sourceFilename: String? = model.sourceFilename
// Subclass properties

4
SignalServiceKit/src/Messages/Interactions/OWSContactOffersInteraction+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSContactOffersInteractionSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties

12
SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -114,7 +114,7 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = model.isLocalChange
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -114,7 +114,7 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/Interactions/TSErrorMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSErrorMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -82,10 +82,10 @@ class TSErrorMessageSerializer: SDSSerializer {
let createdInExistingGroup: Bool? = nil
let customMessage: String? = nil
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
let errorType: TSErrorMessageType? = model.errorType
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class TSErrorMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

14
SignalServiceKit/src/Messages/Interactions/TSIncomingMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSIncomingMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class TSIncomingMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -93,7 +93,7 @@ class TSIncomingMessageSerializer: SDSSerializer {
let hasBlockOffer: Bool? = nil
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = serializationSafeUInt(model.incomingMessageSchemaVersion)
let incomingMessageSchemaVersion: UInt? = model.incomingMessageSchemaVersion
let infoMessageSchemaVersion: UInt? = nil
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
@ -114,9 +114,9 @@ class TSIncomingMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = archiveOptionalNSNumber(model.serverTimestamp, conversion: { serializationSafeUInt64($0.uint64Value) })
let serverTimestamp: UInt64? = archiveOptionalNSNumber(model.serverTimestamp, conversion: { $0.uint64Value })
let sourceDeviceId: UInt32? = model.sourceDeviceId
let storedMessageState: TSOutgoingMessageState? = nil
let storedShouldStartExpireTimer: Bool? = model.storedShouldStartExpireTimer

12
SignalServiceKit/src/Messages/Interactions/TSInfoMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSInfoMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class TSInfoMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class TSInfoMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -114,7 +114,7 @@ class TSInfoMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

4
SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift
View File

@ -1803,8 +1803,8 @@ class TSInteractionSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties

10
SignalServiceKit/src/Messages/Interactions/TSMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class TSMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class TSMessageSerializer: SDSSerializer {
let read: Bool? = nil
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSOutgoingMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class TSOutgoingMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = model.groupMetaMessage
let hasAddToContactsOffer: Bool? = nil
@ -107,14 +107,14 @@ class TSOutgoingMessageSerializer: SDSSerializer {
let messageSticker: Data? = optionalArchive(model.messageSticker)
let messageType: TSInfoMessageType? = nil
let mostRecentFailureText: String? = model.mostRecentFailureText
let outgoingMessageSchemaVersion: UInt? = serializationSafeUInt(model.outgoingMessageSchemaVersion)
let outgoingMessageSchemaVersion: UInt? = model.outgoingMessageSchemaVersion
let preKeyBundle: Data? = nil
let protocolVersion: UInt? = nil
let quotedMessage: Data? = optionalArchive(model.quotedMessage)
let read: Bool? = nil
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = optionalArchive(model.recipientAddressStates)
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

4
SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction+SDS.swift
View File

@ -61,8 +61,8 @@ class TSUnreadIndicatorInteractionSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties

12
SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -82,10 +82,10 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
let createdInExistingGroup: Bool? = nil
let customMessage: String? = nil
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
let errorType: TSErrorMessageType? = model.errorType
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -82,10 +82,10 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
let createdInExistingGroup: Bool? = nil
let customMessage: String? = nil
let envelopeData: Data? = model.envelopeData
let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
let errorType: TSErrorMessageType? = model.errorType
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -82,10 +82,10 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
let createdInExistingGroup: Bool? = nil
let customMessage: String? = nil
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
let errorType: TSErrorMessageType? = model.errorType
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -114,7 +114,7 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

12
SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -114,7 +114,7 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

4
SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift
View File

@ -554,8 +554,8 @@ class TSRecipientReadReceiptSerializer: SDSSerializer {
// Base class properties
let recipientMap: Data = requiredArchive(model.recipientMap)
let recipientReadReceiptSchemaVersion: UInt = serializationSafeUInt(model.recipientReadReceiptSchemaVersion)
let sentTimestamp: UInt64 = serializationSafeUInt64(model.sentTimestamp)
let recipientReadReceiptSchemaVersion: UInt = model.recipientReadReceiptSchemaVersion
let sentTimestamp: UInt64 = model.sentTimestamp
return RecipientReadReceiptRecord(id: id, recordType: recordType, uniqueId: uniqueId, recipientMap: recipientMap, recipientReadReceiptSchemaVersion: recipientReadReceiptSchemaVersion, sentTimestamp: sentTimestamp)
}

12
SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -82,10 +82,10 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
let createdInExistingGroup: Bool? = nil
let customMessage: String? = nil
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
let errorType: TSErrorMessageType? = model.errorType
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -114,7 +114,7 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
let read: Bool? = model.wasRead
let recipientAddress: Data? = optionalArchive(model.recipientAddress)
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = nil
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil

16
SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage+SDS.swift
View File

@ -61,8 +61,8 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -84,8 +84,8 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
let envelopeData: Data? = nil
let errorMessageSchemaVersion: UInt? = nil
let errorType: TSErrorMessageType? = nil
let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
let expireStartedAt: UInt64? = model.expireStartedAt
let expiresAt: UInt64? = model.expiresAt
let expiresInSeconds: UInt32? = model.expiresInSeconds
let groupMetaMessage: TSGroupMetaMessage? = nil
let hasAddToContactsOffer: Bool? = nil
@ -94,7 +94,7 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
let hasLegacyMessageState: Bool? = nil
let hasSyncedTranscript: Bool? = nil
let incomingMessageSchemaVersion: UInt? = nil
let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
let isFromLinkedDevice: Bool? = nil
let isLocalChange: Bool? = nil
let isViewOnceComplete: Bool? = model.isViewOnceComplete
@ -109,18 +109,18 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
let mostRecentFailureText: String? = nil
let outgoingMessageSchemaVersion: UInt? = nil
let preKeyBundle: Data? = nil
let protocolVersion: UInt? = serializationSafeUInt(model.protocolVersion)
let protocolVersion: UInt? = model.protocolVersion
let quotedMessage: Data? = optionalArchive(model.quotedMessage)
let read: Bool? = model.wasRead
let recipientAddress: Data? = nil
let recipientAddressStates: Data? = nil
let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
let schemaVersion: UInt? = model.schemaVersion
let sender: Data? = optionalArchive(model.sender)
let serverTimestamp: UInt64? = nil
let sourceDeviceId: UInt32? = nil
let storedMessageState: TSOutgoingMessageState? = nil
let storedShouldStartExpireTimer: Bool? = model.storedShouldStartExpireTimer
let unknownProtocolVersionMessageSchemaVersion: UInt? = serializationSafeUInt(model.unknownProtocolVersionMessageSchemaVersion)
let unknownProtocolVersionMessageSchemaVersion: UInt? = model.unknownProtocolVersionMessageSchemaVersion
let unregisteredAddress: Data? = optionalArchive(model.unregisteredAddress)
let verificationState: OWSVerificationState? = nil
let wasReceivedByUD: Bool? = nil

6
SignalServiceKit/src/Messages/TSCall+SDS.swift
View File

@ -61,8 +61,8 @@ class TSCallSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
let timestamp: UInt64 = model.timestamp
let threadUniqueId: String = model.uniqueThreadId
// Subclass properties
@ -72,7 +72,7 @@ class TSCallSerializer: SDSSerializer {
let authorUUID: String? = nil
let beforeInteractionId: String? = nil
let body: String? = nil
let callSchemaVersion: UInt? = serializationSafeUInt(model.callSchemaVersion)
let callSchemaVersion: UInt? = model.callSchemaVersion
let callType: RPRecentCallType? = model.callType
let configurationDurationSeconds: UInt32? = nil
let configurationIsEnabled: Bool? = nil

2
SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord+SDS.swift
View File

@ -61,7 +61,7 @@ class SSKMessageDecryptJobRecordSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let failureCount: UInt = serializationSafeUInt(model.failureCount)
let failureCount: UInt = model.failureCount
let label: String = model.label
let status: SSKJobRecordStatus = model.status

2
SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift
View File

@ -578,7 +578,7 @@ class OWSRecipientIdentitySerializer: SDSSerializer {
let createdAt: Double = archiveDate(model.createdAt)
let identityKey: Data = model.identityKey
let isFirstKnownKey: Bool = model.isFirstKnownKey
let recipientIdentitySchemaVersion: UInt = serializationSafeUInt(model.recipientIdentitySchemaVersion)
let recipientIdentitySchemaVersion: UInt = model.recipientIdentitySchemaVersion
let verificationState: OWSVerificationState = model.verificationState
return RecipientIdentityRecord(id: id, recordType: recordType, uniqueId: uniqueId, accountId: accountId, createdAt: createdAt, identityKey: identityKey, isFirstKnownKey: isFirstKnownKey, recipientIdentitySchemaVersion: recipientIdentitySchemaVersion, verificationState: verificationState)

25
SignalServiceKit/src/Storage/Database/SDSSerializable.swift
View File

@ -54,29 +54,4 @@ public extension SDSSerializer {
func requiredArchive(_ value: Any) -> Data {
return NSKeyedArchiver.archivedData(withRootObject: value)
}
// MARK: - Safe Numerics
func serializationSafeUInt(_ value: UInt) -> UInt {
guard UInt.max > Int64.max else {
return value
}
guard value < Int64.max else {
if !CurrentAppContext().isRunningTests {
owsFailDebug("Invalid value: \(value)")
}
return UInt(Int64.max)
}
return value
}
func serializationSafeUInt64(_ value: UInt64) -> UInt64 {
guard value < Int64.max else {
if !CurrentAppContext().isRunningTests {
owsFailDebug("Invalid value: \(value)")
}
return UInt64(Int64.max)
}
return value
}
}

2
SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord+SDS.swift
View File

@ -61,7 +61,7 @@ class OWSBroadcastMediaMessageJobRecordSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let failureCount: UInt = serializationSafeUInt(model.failureCount)
let failureCount: UInt = model.failureCount
let label: String = model.label
let status: SSKJobRecordStatus = model.status

2
SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord+SDS.swift
View File

@ -61,7 +61,7 @@ class OWSSessionResetJobRecordSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let failureCount: UInt = serializationSafeUInt(model.failureCount)
let failureCount: UInt = model.failureCount
let label: String = model.label
let status: SSKJobRecordStatus = model.status

2
SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift
View File

@ -676,7 +676,7 @@ class SSKJobRecordSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let failureCount: UInt = serializationSafeUInt(model.failureCount)
let failureCount: UInt = model.failureCount
let label: String = model.label
let status: SSKJobRecordStatus = model.status

2
SignalServiceKit/src/Storage/SSKMessageSenderJobRecord+SDS.swift
View File

@ -61,7 +61,7 @@ class SSKMessageSenderJobRecordSerializer: SDSSerializer {
let uniqueId: String = model.uniqueId
// Base class properties
let failureCount: UInt = serializationSafeUInt(model.failureCount)
let failureCount: UInt = model.failureCount
let label: String = model.label
let status: SSKJobRecordStatus = model.status

2
SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift
View File

@ -578,7 +578,7 @@ class OWSBackupFragmentSerializer: SDSSerializer {
let encryptionKey: Data = model.encryptionKey
let recordName: String = model.recordName
let relativeFilePath: String? = model.relativeFilePath
let uncompressedDataLength: UInt64? = archiveOptionalNSNumber(model.uncompressedDataLength, conversion: { serializationSafeUInt64($0.uint64Value) })
let uncompressedDataLength: UInt64? = archiveOptionalNSNumber(model.uncompressedDataLength, conversion: { $0.uint64Value })
return BackupFragmentRecord(id: id, recordType: recordType, uniqueId: uniqueId, attachmentId: attachmentId, downloadFilePath: downloadFilePath, encryptionKey: encryptionKey, recordName: recordName, relativeFilePath: relativeFilePath, uncompressedDataLength: uncompressedDataLength)
}

2
SignalServiceKit/src/Util/OWSUserProfile+SDS.swift
View File

@ -594,7 +594,7 @@ class OWSUserProfileSerializer: SDSSerializer {
let profileName: String? = model.profileName
let recipientPhoneNumber: String? = model.recipientPhoneNumber
let recipientUUID: String? = model.recipientUUID
let userProfileSchemaVersion: UInt = serializationSafeUInt(model.userProfileSchemaVersion)
let userProfileSchemaVersion: UInt = model.userProfileSchemaVersion
let username: String? = model.username
return UserProfileRecord(id: id, recordType: recordType, uniqueId: uniqueId, avatarFileName: avatarFileName, avatarUrlPath: avatarUrlPath, profileKey: profileKey, profileName: profileName, recipientPhoneNumber: recipientPhoneNumber, recipientUUID: recipientUUID, userProfileSchemaVersion: userProfileSchemaVersion, username: username)

6
SignalServiceKit/src/Util/TestModel+SDS.swift
View File

@ -601,9 +601,9 @@ class TestModelSerializer: SDSSerializer {
let int64Value: Int64 = model.int64Value
let nsIntegerValue: Int = model.nsIntegerValue
let nsNumberValueUsingInt64: Int64? = archiveOptionalNSNumber(model.nsNumberValueUsingInt64, conversion: { $0.int64Value })
let nsNumberValueUsingUInt64: UInt64? = archiveOptionalNSNumber(model.nsNumberValueUsingUInt64, conversion: { serializationSafeUInt64($0.uint64Value) })
let nsuIntegerValue: UInt = serializationSafeUInt(model.nsuIntegerValue)
let uint64Value: UInt64 = serializationSafeUInt64(model.uint64Value)
let nsNumberValueUsingUInt64: UInt64? = archiveOptionalNSNumber(model.nsNumberValueUsingUInt64, conversion: { $0.uint64Value })
let nsuIntegerValue: UInt = model.nsuIntegerValue
let uint64Value: UInt64 = model.uint64Value
return TestModelRecord(id: id, recordType: recordType, uniqueId: uniqueId, dateValue: dateValue, doubleValue: doubleValue, floatValue: floatValue, int64Value: int64Value, nsIntegerValue: nsIntegerValue, nsNumberValueUsingInt64: nsNumberValueUsingInt64, nsNumberValueUsingUInt64: nsNumberValueUsingUInt64, nsuIntegerValue: nsuIntegerValue, uint64Value: uint64Value)
}