Fix a few warnings

signalapp · Jan 8, 2025 · 357e05e · 357e05e
1 parent f62f6c4
commit 357e05e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/SignalServiceKit/Messages/Interactions/Quotes/QuotedReplyManagerImpl.swift b/SignalServiceKit/Messages/Interactions/Quotes/QuotedReplyManagerImpl.swift
@@ -637,8 +637,7 @@ public class QuotedReplyManagerImpl: QuotedReplyManager {
         }
 
         // Find the original message and any attachment
-        let (originalMessage, originalAttachmentReference, originalAttachment): (
-            TSMessage?,
+        let (originalAttachmentReference, originalAttachment): (
             AttachmentReference?,
             Attachment?
         ) = db.read { tx in
@@ -651,14 +650,14 @@ public class QuotedReplyManagerImpl: QuotedReplyManager {
                     transaction: SDSDB.shimOnlyBridge(tx)
                 )
             else {
-                return (nil, nil, nil)
+                return (nil, nil)
             }
             let attachmentReference = attachmentStore.attachmentToUseInQuote(
                 originalMessageRowId: originalMessage.sqliteRowId!,
                 tx: tx
             )
             let attachment = attachmentStore.fetch(ids: [attachmentReference?.attachmentRowId].compacted(), tx: tx).first
-            return (originalMessage, attachmentReference, attachment)
+            return (attachmentReference, attachment)
         }
 
         let quoteAttachment = { () -> DraftQuotedReplyModel.ForSending.Attachment? in

diff --git a/SignalServiceKit/Messages/OutgoingMessagePreparer/UnpreparedOutgoingMessage.swift b/SignalServiceKit/Messages/OutgoingMessagePreparer/UnpreparedOutgoingMessage.swift
@@ -270,8 +270,7 @@ public class UnpreparedOutgoingMessage {
             let unsavedBodyMediaAttachments: [AttachmentDataSource]
             if quotedReplyBuilder != nil {
                 unsavedBodyMediaAttachments = message.unsavedBodyMediaAttachments.map {
-                    var attachment = $0
-                    return attachment.removeBorderlessRenderingFlagIfPresent()
+                    return $0.removeBorderlessRenderingFlagIfPresent()
                 }
             } else {
                 unsavedBodyMediaAttachments = message.unsavedBodyMediaAttachments

diff --git a/...ase/IncrementalMigrations/TSAttachment/TSAttachmentMigration+StoryMessageAttachment.swift b/...ase/IncrementalMigrations/TSAttachment/TSAttachmentMigration+StoryMessageAttachment.swift
@@ -80,7 +80,7 @@ extension TSAttachmentMigration {
                     let storyAttachmentString,
                     let storyMessageAttachmentData = storyAttachmentString.data(using: .utf8)
                 else {
-                    try reservedFileIds.cleanUpFiles()
+                    reservedFileIds.cleanUpFiles()
                     continue
                 }
                 // The `attachment` column is a SerializedStoryMessageAttachment encoded as a JSON string.
@@ -89,7 +89,7 @@ extension TSAttachmentMigration {
                     from: storyMessageAttachmentData
                 )
                 guard let tsAttachmentUniqueId = storyAttachment.tsAttachmentUniqueId else {
-                    try reservedFileIds.cleanUpFiles()
+                    reservedFileIds.cleanUpFiles()
                     continue
                 }
                 try Self.migrateStoryMessageAttachment(
@@ -157,7 +157,7 @@ extension TSAttachmentMigration {
                 .filter(Column("uniqueId") == tsAttachmentUniqueId)
                 .fetchOne(tx.database)
             guard let oldAttachment else {
-                try reservedFileIds.cleanUpFiles()
+                reservedFileIds.cleanUpFiles()
                 return
             }
 
@@ -181,14 +181,14 @@ extension TSAttachmentMigration {
                 } catch {
                     Logger.error("Failed to read story attachment file \((error as NSError).domain) \((error as NSError).code)")
                     // Clean up files just in case.
-                    try reservedFileIds.cleanUpFiles()
+                    reservedFileIds.cleanUpFiles()
                     pendingAttachment = nil
                 }
             } else {
                 // A pointer; no validation needed.
                 pendingAttachment = nil
                 // Clean up files just in case.
-                try reservedFileIds.cleanUpFiles()
+                reservedFileIds.cleanUpFiles()
             }
 
             let v2AttachmentId: Int64
@@ -202,7 +202,7 @@ extension TSAttachmentMigration {
                 // create new references to it and drop the pending attachment.
                 v2AttachmentId = existingV2Attachment.id!
                 // Delete the reserved files being used by the pending attachment.
-                try reservedFileIds.cleanUpFiles()
+                reservedFileIds.cleanUpFiles()
             } else {
                 var v2Attachment: TSAttachmentMigration.V2Attachment
                 if let pendingAttachment {

diff --git a/SignalServiceKit/Storage/Database/SDSModel.swift b/SignalServiceKit/Storage/Database/SDSModel.swift
@@ -36,12 +36,8 @@ public extension SDSModel {
 
         switch transaction.writeTransaction {
         case .grdbWrite(let grdbTransaction):
-            do {
-                let record = try asRecord()
-                record.sdsSave(saveMode: saveMode, transaction: grdbTransaction)
-            } catch {
-                owsFail("Write failed: \(error)")
-            }
+            let record = asRecord()
+            record.sdsSave(saveMode: saveMode, transaction: grdbTransaction)
         }
 
         switch saveMode {