diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigration+SDS.swift b/SignalMessaging/environment/migrations/OWSDatabaseMigration+SDS.swift index 8ba9adf9d3..a76e0d5047 100644 --- a/SignalMessaging/environment/migrations/OWSDatabaseMigration+SDS.swift +++ b/SignalMessaging/environment/migrations/OWSDatabaseMigration+SDS.swift @@ -275,6 +275,26 @@ extension OWSDatabaseMigration { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSDatabaseMigrationCursor diff --git a/SignalMessaging/profiles/OWSUserProfile+SDS.swift b/SignalMessaging/profiles/OWSUserProfile+SDS.swift index 6c0bd67370..eeee5a3bdd 100644 --- a/SignalMessaging/profiles/OWSUserProfile+SDS.swift +++ b/SignalMessaging/profiles/OWSUserProfile+SDS.swift @@ -219,6 +219,26 @@ extension OWSUserProfile { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSUserProfileCursor diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift index b3cd95f59f..3a8880e2f0 100644 --- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift +++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift @@ -200,6 +200,26 @@ extension OWSDisappearingMessagesConfiguration { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSDisappearingMessagesConfigurationCursor diff --git a/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift b/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift index 17903b8f54..335294a561 100644 --- a/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift +++ b/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift @@ -213,6 +213,26 @@ extension SignalAccount { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - SignalAccountCursor diff --git a/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift b/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift index 95396f03ac..384e97320f 100644 --- a/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift +++ b/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift @@ -195,6 +195,26 @@ extension SignalRecipient { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - SignalRecipientCursor diff --git a/SignalServiceKit/src/Contacts/TSThread+SDS.swift b/SignalServiceKit/src/Contacts/TSThread+SDS.swift index ec2123f14d..80bbc228ba 100644 --- a/SignalServiceKit/src/Contacts/TSThread+SDS.swift +++ b/SignalServiceKit/src/Contacts/TSThread+SDS.swift @@ -312,6 +312,26 @@ extension TSThread { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - TSThreadCursor diff --git a/SignalServiceKit/src/Devices/OWSDevice+SDS.swift b/SignalServiceKit/src/Devices/OWSDevice+SDS.swift index a1c6aa3d83..45ada37922 100644 --- a/SignalServiceKit/src/Devices/OWSDevice+SDS.swift +++ b/SignalServiceKit/src/Devices/OWSDevice+SDS.swift @@ -212,6 +212,26 @@ extension OWSDevice { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSDeviceCursor diff --git a/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift b/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift index c44657fff6..29dda9b2ad 100644 --- a/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift +++ b/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift @@ -206,6 +206,26 @@ extension OWSLinkedDeviceReadReceipt { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSLinkedDeviceReadReceiptCursor diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift b/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift index 57293fc2dd..9df0341494 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift @@ -405,6 +405,26 @@ extension TSAttachment { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - TSAttachmentCursor diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift index 74bb42a01d..ac958c41d3 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift +++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift @@ -1263,6 +1263,26 @@ extension TSInteraction { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - TSInteractionCursor diff --git a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor+SDS.swift b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor+SDS.swift index 1308112975..85be00c826 100644 --- a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor+SDS.swift +++ b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor+SDS.swift @@ -212,6 +212,26 @@ extension OWSMessageContentJob { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSMessageContentJobCursor diff --git a/SignalServiceKit/src/Messages/OWSMessageReceiver+SDS.swift b/SignalServiceKit/src/Messages/OWSMessageReceiver+SDS.swift index 920ae7be42..efb43a16b0 100644 --- a/SignalServiceKit/src/Messages/OWSMessageReceiver+SDS.swift +++ b/SignalServiceKit/src/Messages/OWSMessageReceiver+SDS.swift @@ -200,6 +200,26 @@ extension OWSMessageDecryptJob { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSMessageDecryptJobCursor diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift b/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift index db5cffbe3b..3b9dfb893a 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift @@ -201,6 +201,26 @@ extension TSRecipientReadReceipt { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - TSRecipientReadReceiptCursor diff --git a/SignalServiceKit/src/Messages/Stickers/InstalledSticker+SDS.swift b/SignalServiceKit/src/Messages/Stickers/InstalledSticker+SDS.swift index 2e1cec7994..5730f6a5fd 100644 --- a/SignalServiceKit/src/Messages/Stickers/InstalledSticker+SDS.swift +++ b/SignalServiceKit/src/Messages/Stickers/InstalledSticker+SDS.swift @@ -201,6 +201,26 @@ extension InstalledSticker { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - InstalledStickerCursor diff --git a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack+SDS.swift b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack+SDS.swift index 391536e133..4e6353ef75 100644 --- a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack+SDS.swift +++ b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack+SDS.swift @@ -201,6 +201,26 @@ extension KnownStickerPack { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - KnownStickerPackCursor diff --git a/SignalServiceKit/src/Messages/Stickers/StickerPack+SDS.swift b/SignalServiceKit/src/Messages/Stickers/StickerPack+SDS.swift index 780d47a75d..93bfbf65af 100644 --- a/SignalServiceKit/src/Messages/Stickers/StickerPack+SDS.swift +++ b/SignalServiceKit/src/Messages/Stickers/StickerPack+SDS.swift @@ -233,6 +233,26 @@ extension StickerPack { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - StickerPackCursor diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift b/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift index 96f3c34c31..0bfb288464 100644 --- a/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift +++ b/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift @@ -218,6 +218,26 @@ extension OWSRecipientIdentity { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSRecipientIdentityCursor diff --git a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift index b07c71fab6..a0001e47c4 100644 --- a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift +++ b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift @@ -299,6 +299,26 @@ extension SSKJobRecord { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - SSKJobRecordCursor diff --git a/SignalServiceKit/src/Util/ExperienceUpgrade+SDS.swift b/SignalServiceKit/src/Util/ExperienceUpgrade+SDS.swift index a1acdf471a..8e4f032453 100644 --- a/SignalServiceKit/src/Util/ExperienceUpgrade+SDS.swift +++ b/SignalServiceKit/src/Util/ExperienceUpgrade+SDS.swift @@ -185,6 +185,26 @@ extension ExperienceUpgrade { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - ExperienceUpgradeCursor diff --git a/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift b/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift index 190dd6c01c..eec7b0abcf 100644 --- a/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift +++ b/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift @@ -224,6 +224,26 @@ extension OWSBackupFragment { } } } + + public func anyReload(transaction: SDSAnyReadTransaction) { + anyReload(transaction: transaction, ignoreMissing: false) + } + + public func anyReload(transaction: SDSAnyReadTransaction, ignoreMissing: Bool) { + guard let uniqueId = self.uniqueId else { + owsFailDebug("uniqueId was unexpectedly nil") + return + } + + guard let latestVersion = type(of: self).anyFetch(uniqueId: uniqueId, transaction: transaction) else { + if !ignoreMissing { + owsFailDebug("`latest` was unexpectedly nil") + } + return + } + + setValuesForKeys(latestVersion.dictionaryValue) + } } // MARK: - OWSBackupFragmentCursor