From a241f40621f3f76e2db211392ab1470253035a0a Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Wed, 17 Apr 2024 19:11:13 -0500 Subject: [PATCH] Fix a few build warnings --- .../CVComponentGenericAttachment.swift | 2 +- .../Components/CVComponentState.swift | 2 +- ...ler+ConversationInputToolbarDelegate.swift | 2 +- .../RegistrationCoordinatorImpl.swift | 1 - ...dgeGiftingConfirmationViewController.swift | 2 +- .../Chat List/ThreadSwipeHandler.swift | 1 - SignalServiceKit/Jobs/JobQueue.swift | 2 +- .../BodyRanges/EditableMessageBody.swift | 2 +- .../Messages/BodyRanges/NSRangedValue.swift | 2 +- .../Messages/MessageFetcherJob.swift | 1 - .../Stickers/MessageStickerManager.swift | 3 ++- .../Receiving/GroupsV2MessageProcessor.swift | 2 -- .../Storage/Database/DatabaseRecovery.swift | 2 +- SignalUI/Payments/PaymentsProcessor.swift | 21 ++++++++++--------- 14 files changed, 21 insertions(+), 24 deletions(-) diff --git a/Signal/ConversationView/Components/CVComponentGenericAttachment.swift b/Signal/ConversationView/Components/CVComponentGenericAttachment.swift index b0da1b11e2..05b48c0324 100644 --- a/Signal/ConversationView/Components/CVComponentGenericAttachment.swift +++ b/Signal/ConversationView/Components/CVComponentGenericAttachment.swift @@ -302,7 +302,7 @@ public class CVComponentGenericAttachment: CVComponentBase, CVComponent { case .default: showShareUI(from: componentView.rootView) } - } else if let attachmentPointer = genericAttachment.attachmentPointer { + } else if genericAttachment.attachmentPointer != nil { switch genericAttachment.transitTierDownloadState { case .failed, .pendingMessageRequest, .pendingManualDownload: guard let message = renderItem.interaction as? TSMessage else { diff --git a/Signal/ConversationView/Components/CVComponentState.swift b/Signal/ConversationView/Components/CVComponentState.swift index 28a61bfbd4..b8d2262a6b 100644 --- a/Signal/ConversationView/Components/CVComponentState.swift +++ b/Signal/ConversationView/Components/CVComponentState.swift @@ -926,7 +926,7 @@ fileprivate extension CVComponentState.Builder { var mediaAlbumHasFailedAttachment = false var mediaAlbumHasPendingAttachment = false for attachment in bodyAttachments { - guard let attachmentPointer = attachment.attachment.asTransitTierPointer() else { + guard attachment.attachment.asTransitTierPointer() != nil else { continue } switch attachment.attachment.transitTierDownloadState(tx: transaction.asV2Read) { diff --git a/Signal/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift b/Signal/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift index 841ab901b6..48b52e91ee 100644 --- a/Signal/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift +++ b/Signal/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift @@ -213,7 +213,7 @@ extension ConversationViewController: ConversationInputToolbarDelegate { ImpactHapticFeedback.impactOccurred(style: .light) - let message = ThreadUtil.enqueueMessage(withInstalledSticker: stickerInfo, thread: thread) + ThreadUtil.enqueueMessage(withInstalledSticker: stickerInfo, thread: thread) messageWasSent() } diff --git a/Signal/Registration/RegistrationCoordinatorImpl.swift b/Signal/Registration/RegistrationCoordinatorImpl.swift index 8ad4171c7a..10c2ad8423 100644 --- a/Signal/Registration/RegistrationCoordinatorImpl.swift +++ b/Signal/Registration/RegistrationCoordinatorImpl.swift @@ -2973,7 +2973,6 @@ public class RegistrationCoordinatorImpl: RegistrationCoordinator { private func restoreFromStorageService( accountIdentity: AccountIdentity ) -> Guarantee { - let authedDevice = accountIdentity.authedDevice return deps .storageServiceManager.restoreOrCreateManifestIfNecessary( authedDevice: accountIdentity.authedDevice diff --git a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift index ff36884dbc..acf1d24c44 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift @@ -270,7 +270,7 @@ class BadgeGiftingConfirmationViewController: OWSTableViewController2 { })) let messageTextSection = OWSTableSection() - messageTextSection.add(self.textViewItem(self.messageTextView, minimumHeight: 102)) + messageTextSection.add(self.textViewItem(messageTextView, minimumHeight: 102)) var sections: [OWSTableSection] = [ badgeSection, diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift b/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift index a0e486c235..9aaac715d2 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift @@ -19,7 +19,6 @@ extension ThreadSwipeHandler where Self: UIViewController { return nil } - let thread = threadViewModel.threadRecord let isThreadPinned = threadViewModel.isPinned let pinnedStateAction: UIContextualAction if isThreadPinned { diff --git a/SignalServiceKit/Jobs/JobQueue.swift b/SignalServiceKit/Jobs/JobQueue.swift index 28b81c2a69..ebc2c7e88d 100644 --- a/SignalServiceKit/Jobs/JobQueue.swift +++ b/SignalServiceKit/Jobs/JobQueue.swift @@ -172,7 +172,7 @@ public extension JobQueue { } catch JobError.permanentFailure(let description) { owsFailDebug("permanent failure: \(description)") nextJob.saveAsPermanentlyFailed(transaction: transaction) - } catch JobError.obsolete(let description) { + } catch JobError.obsolete { // TODO is this even worthwhile to have obsolete state? Should we just delete the task outright? nextJob.saveAsObsolete(transaction: transaction) } catch { diff --git a/SignalServiceKit/Messages/BodyRanges/EditableMessageBody.swift b/SignalServiceKit/Messages/BodyRanges/EditableMessageBody.swift index 87e16b1a0c..13a36cb0e2 100644 --- a/SignalServiceKit/Messages/BodyRanges/EditableMessageBody.swift +++ b/SignalServiceKit/Messages/BodyRanges/EditableMessageBody.swift @@ -460,7 +460,7 @@ public class EditableMessageBodyTextStorage: NSTextStorage { } let newStyle = NSRangedValue(style, range: range) - let overlaps = NSRangedValue.overlaps( + let overlaps = NSRangedValue.overlaps( of: newStyle, in: self.body.flattenedStyles, isEqual: == diff --git a/SignalServiceKit/Messages/BodyRanges/NSRangedValue.swift b/SignalServiceKit/Messages/BodyRanges/NSRangedValue.swift index e6b9f8a61d..9aac997613 100644 --- a/SignalServiceKit/Messages/BodyRanges/NSRangedValue.swift +++ b/SignalServiceKit/Messages/BodyRanges/NSRangedValue.swift @@ -40,7 +40,7 @@ extension NSRangedValue { /// definition of equal. /// The array is assumed to contain no overlaps between "equal" elements; if there are /// the results of this method are undetermined. - static func overlaps( + static func overlaps( of range: NSRangedValue, in array: [NSRangedValue], isEqual: (T, T) -> Bool diff --git a/SignalServiceKit/Messages/MessageFetcherJob.swift b/SignalServiceKit/Messages/MessageFetcherJob.swift index 8c9af406b0..008f7d6fc5 100644 --- a/SignalServiceKit/Messages/MessageFetcherJob.swift +++ b/SignalServiceKit/Messages/MessageFetcherJob.swift @@ -587,7 +587,6 @@ private class MessageAckOperation: OWSOperation { return } - let envelopeInfo = self.envelopeInfo let inFlightAckId = self.inFlightAckId firstly(on: DispatchQueue.global()) { self.networkManager.makePromise(request: request) diff --git a/SignalServiceKit/Messages/Stickers/MessageStickerManager.swift b/SignalServiceKit/Messages/Stickers/MessageStickerManager.swift index 2e1b6b6047..ad74a588b5 100644 --- a/SignalServiceKit/Messages/Stickers/MessageStickerManager.swift +++ b/SignalServiceKit/Messages/Stickers/MessageStickerManager.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalCoreKit public protocol MessageStickerManager { @@ -125,7 +126,7 @@ public class MessageStickerManagerImpl: MessageStickerManager { owsFailDebug("Missing data for installed sticker.") return nil } - guard let fileSize = OWSFileSystem.fileSize(of: stickerDataUrl) else { + guard OWSFileSystem.fileSize(of: stickerDataUrl) != nil else { owsFailDebug("Could not determine file size for installed sticker.") return nil } diff --git a/SignalServiceKit/Network/Receiving/GroupsV2MessageProcessor.swift b/SignalServiceKit/Network/Receiving/GroupsV2MessageProcessor.swift index 900da24b1a..186d463651 100644 --- a/SignalServiceKit/Network/Receiving/GroupsV2MessageProcessor.swift +++ b/SignalServiceKit/Network/Receiving/GroupsV2MessageProcessor.swift @@ -371,8 +371,6 @@ internal class GroupsMessageProcessor: MessageProcessingPipelineStage, Dependenc let processedUniqueIds = processedJobs.map { $0.uniqueId } self.finder.removeJobs(withUniqueIds: processedUniqueIds, transaction: transaction.unwrapGrdbWrite) - let jobCount: UInt = self.finder.jobCount(forGroupId: self.groupId, transaction: transaction.unwrapGrdbRead) - transaction.addAsyncCompletionOffMain { assert(backgroundTask != nil) backgroundTask = nil diff --git a/SignalServiceKit/Storage/Database/DatabaseRecovery.swift b/SignalServiceKit/Storage/Database/DatabaseRecovery.swift index 9984fef660..85f390277b 100644 --- a/SignalServiceKit/Storage/Database/DatabaseRecovery.swift +++ b/SignalServiceKit/Storage/Database/DatabaseRecovery.swift @@ -392,7 +392,7 @@ public extension DatabaseRecovery { Logger.info("Replacing old database with the new one...") - let newDatabaseFileUrl = try FileManager.default.replaceItemAt( + _ = try FileManager.default.replaceItemAt( oldDatabaseStorage.databaseFileUrl, withItemAt: newDatabaseStorage.databaseFileUrl ) diff --git a/SignalUI/Payments/PaymentsProcessor.swift b/SignalUI/Payments/PaymentsProcessor.swift index 697bddf6a7..d81c8b99db 100644 --- a/SignalUI/Payments/PaymentsProcessor.swift +++ b/SignalUI/Payments/PaymentsProcessor.swift @@ -321,14 +321,17 @@ extension PaymentsProcessor: PaymentProcessingOperationDelegate { processingQueue(forPaymentModel: paymentModel).addOperation(operation) } - func scheduleRetryProcessing(paymentModel: TSPaymentModel, - retryDelayInteral: TimeInterval, - nextRetryDelayInteral: TimeInterval) { - let paymentId = paymentModel.uniqueId - add(retryScheduler: RetryScheduler(paymentModel: paymentModel, - retryDelayInteral: retryDelayInteral, - nextRetryDelayInteral: nextRetryDelayInteral, - delegate: self)) + func scheduleRetryProcessing( + paymentModel: TSPaymentModel, + retryDelayInteral: TimeInterval, + nextRetryDelayInteral: TimeInterval + ) { + add(retryScheduler: RetryScheduler( + paymentModel: paymentModel, + retryDelayInteral: retryDelayInteral, + nextRetryDelayInteral: nextRetryDelayInteral, + delegate: self + )) } func endProcessing(paymentModel: TSPaymentModel) { @@ -608,8 +611,6 @@ private class PaymentProcessingOperation: OWSOperation { owsAssertDebug(paymentModel.isValid) - let paymentId = paymentModel.uniqueId - switch paymentModel.paymentState { case .outgoingUnsubmitted: return self.submitOutgoingPayment(paymentModel: paymentModel)