From 13d5fe93dc271e878f2ae43f08cf24ebf8890b03 Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Thu, 26 Mar 2026 17:10:38 -0500 Subject: [PATCH] Run `swiftformat .` using v0.60.1 --- Signal/Calls/AudioSource.swift | 2 +- Signal/Calls/UserInterface/CallHeader.swift | 1 + Signal/Calls/UserInterface/CallUIAdapter.swift | 2 +- Signal/ConversationView/CellViews/ReusableMediaView.swift | 2 +- Signal/ConversationView/Components/CVComponentState.swift | 2 +- .../ConversationView/Components/CVComponentThreadDetails.swift | 2 +- .../ConversationViewController+MessageActionsDelegate.swift | 2 +- .../ConversationViewController+PinnedMessages.swift | 2 +- .../ConversationView/ConversationViewController+Selection.swift | 2 +- Signal/ConversationView/TSInteraction+DeleteActionSheet.swift | 2 +- Signal/Provisioning/DeviceProvisioningURL.swift | 2 +- Signal/Provisioning/ProvisioningManager.swift | 2 +- Signal/Provisioning/ProvisioningSocketManager.swift | 2 +- .../RegistrationCoordinatorBackupErrorPresenter.swift | 2 +- .../Payments/PaymentsViewPassphraseConfirmViewController.swift | 2 +- .../Payments/PaymentsViewPassphraseGridViewController.swift | 2 +- .../AppSettings/Profile/BadgeCollectionView.swift | 1 + Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift | 2 +- Signal/src/ViewControllers/Donations/DonationViewsUtil.swift | 2 +- Signal/src/ViewControllers/HomeView/HomeTabBarController.swift | 2 +- Signal/src/ViewControllers/Photos/MediaControls.swift | 1 + .../ViewControllers/Photos/SendMediaNavigationController.swift | 2 +- Signal/src/ViewControllers/SafetyTipsViewController.swift | 2 +- Signal/src/views/MarqueeLabel.swift | 2 +- Signal/test/Provisioning/ProvisioningCoordinatorTest.swift | 2 +- Signal/test/Registration/RegistrationCoordinatorTestShims.swift | 2 +- .../DonationPaymentDetailsViewControllerTest.swift | 1 + Signal/test/attachments/SignalAttachmentTest.swift | 1 + SignalServiceKit/Account/ProfileKey.swift | 2 +- SignalServiceKit/Account/ServiceId.swift | 2 +- .../Backups/Archiving/BackupArchiveManagerImpl.swift | 2 +- SignalServiceKit/Contacts/SystemContactsFetcher.swift | 2 +- SignalServiceKit/Environment/RemoteConfigManager.swift | 2 -- .../Messages/Interactions/AdminDelete/AdminDeleteManager.swift | 2 +- SignalServiceKit/Messages/Interactions/TSInfoMessage.swift | 1 + SignalServiceKit/Messages/Payments/ArchivedPayment.swift | 2 +- SignalServiceKit/Messages/RecipientHidingManager.swift | 2 +- SignalServiceKit/Network/API/NetworkManager.swift | 2 +- SignalServiceKit/Network/OWSURLSessionProtocol.swift | 1 + SignalServiceKit/Notifications/UserNotificationsPresenter.swift | 2 +- .../Storage/Database/SDSDatabaseStorage/V2/DBTransaction.swift | 2 +- .../Subscriptions/Donations/DonationSubscriptionManager.swift | 2 +- SignalServiceKit/Threads/TSContactThread.swift | 2 +- SignalServiceKit/Threads/TSGroupThread.swift | 2 +- SignalServiceKit/Upload/AttachmentUpload.swift | 1 + .../tests/Network/RegistrationRequestFactoryTest.swift | 2 +- .../tests/Registration/RegistrationSessionManagerTest.swift | 2 +- SignalServiceKit/tests/SSKBaseTest.swift | 2 +- .../Database/CreateV2AttachmentTablesMigrationTest.swift | 2 +- .../tests/Storage/Database/DatabaseRecoveryTest.swift | 1 + SignalServiceKit/tests/Util/URLPathComponentsTest.swift | 1 + SignalServiceKit/tests/Util/UnfairLockTest.swift | 1 + SignalServiceKit/tests/Util/UnknownEnumCodableTest.swift | 2 +- SignalShareExtension/SharingThreadPickerProgressSheet.swift | 2 +- SignalUI/Appearance/UIColor+Signal.swift | 2 +- SignalUI/AttachmentMultisend/AttachmentMultisend.swift | 2 +- SignalUI/Attachments/TypedItemProvider.swift | 2 +- SignalUI/ConversationView/CVUtils.swift | 2 +- SignalUI/Payments/MobileCoinHelperSDK.swift | 2 +- SignalUI/RecipientPickers/ContactCell.swift | 2 +- SignalUI/RecipientPickers/CountryCodeViewController.swift | 2 +- SignalUI/Sending/QuotedReplyModel.swift | 2 +- SignalUI/Sending/ThreadUtil+SignalUI.swift | 1 + SignalUI/Stickers/EditorSticker.swift | 2 +- SignalUI/Stickers/StickerView.swift | 2 +- SignalUI/SwiftUIExtensions/Text+Links.swift | 2 +- SignalUI/Utils/SpamReportingUIUtils.swift | 2 +- SignalUI/Views/CaptchaView.swift | 2 +- SignalUI/Views/ConversationAvatarView+SwiftUI.swift | 2 +- SignalUI/Views/ConversationAvatarView.swift | 2 +- SignalUI/Views/ProfileDetailLabel.swift | 2 +- SignalUI/Views/TextAttachmentView.swift | 2 +- SignalUI/Views/TextViewWithPlaceholder.swift | 2 ++ 73 files changed, 73 insertions(+), 61 deletions(-) diff --git a/Signal/Calls/AudioSource.swift b/Signal/Calls/AudioSource.swift index b10c4ab3e9..70d8e75f5d 100644 --- a/Signal/Calls/AudioSource.swift +++ b/Signal/Calls/AudioSource.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import Foundation public import AVFoundation +import Foundation import SignalServiceKit import UIKit diff --git a/Signal/Calls/UserInterface/CallHeader.swift b/Signal/Calls/UserInterface/CallHeader.swift index 3bca678079..dda5c24ba8 100644 --- a/Signal/Calls/UserInterface/CallHeader.swift +++ b/Signal/Calls/UserInterface/CallHeader.swift @@ -17,6 +17,7 @@ protocol CallHeaderDelegate: AnyObject { } class CallHeader: UIView { + // MARK: - Views private lazy var gradientView: UIView = { diff --git a/Signal/Calls/UserInterface/CallUIAdapter.swift b/Signal/Calls/UserInterface/CallUIAdapter.swift index b9322a4e49..545fee56f8 100644 --- a/Signal/Calls/UserInterface/CallUIAdapter.swift +++ b/Signal/Calls/UserInterface/CallUIAdapter.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import Foundation import CallKit +public import Foundation import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/ConversationView/CellViews/ReusableMediaView.swift b/Signal/ConversationView/CellViews/ReusableMediaView.swift index 379d956b02..68531dcf9e 100644 --- a/Signal/ConversationView/CellViews/ReusableMediaView.swift +++ b/Signal/ConversationView/CellViews/ReusableMediaView.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalServiceKit import SDWebImage +public import SignalServiceKit import SignalUI public import UIKit diff --git a/Signal/ConversationView/Components/CVComponentState.swift b/Signal/ConversationView/Components/CVComponentState.swift index 90d4431775..87f33ba648 100644 --- a/Signal/ConversationView/Components/CVComponentState.swift +++ b/Signal/ConversationView/Components/CVComponentState.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // +import LibSignalClient import MobileCoin public import SignalServiceKit -import LibSignalClient import SignalUI public enum CVAttachment: Equatable { diff --git a/Signal/ConversationView/Components/CVComponentThreadDetails.swift b/Signal/ConversationView/Components/CVComponentThreadDetails.swift index de90b648e7..06719eb0c5 100644 --- a/Signal/ConversationView/Components/CVComponentThreadDetails.swift +++ b/Signal/ConversationView/Components/CVComponentThreadDetails.swift @@ -4,9 +4,9 @@ // import Foundation +import Lottie import SignalServiceKit public import SignalUI -import Lottie public class CVComponentThreadDetails: CVComponentBase, CVRootComponent { diff --git a/Signal/ConversationView/ConversationViewController+MessageActionsDelegate.swift b/Signal/ConversationView/ConversationViewController+MessageActionsDelegate.swift index d680e24d31..2e9bb502e5 100644 --- a/Signal/ConversationView/ConversationViewController+MessageActionsDelegate.swift +++ b/Signal/ConversationView/ConversationViewController+MessageActionsDelegate.swift @@ -4,8 +4,8 @@ // import AVFAudio -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit import SignalUI public import UIKit diff --git a/Signal/ConversationView/ConversationViewController+PinnedMessages.swift b/Signal/ConversationView/ConversationViewController+PinnedMessages.swift index 219d9f856f..98b089fe69 100644 --- a/Signal/ConversationView/ConversationViewController+PinnedMessages.swift +++ b/Signal/ConversationView/ConversationViewController+PinnedMessages.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import SignalUI public import SignalServiceKit +import SignalUI public import UIKit protocol PinnedMessageInteractionManagerDelegate: AnyObject { diff --git a/Signal/ConversationView/ConversationViewController+Selection.swift b/Signal/ConversationView/ConversationViewController+Selection.swift index ed75879161..d45c441e11 100644 --- a/Signal/ConversationView/ConversationViewController+Selection.swift +++ b/Signal/ConversationView/ConversationViewController+Selection.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // +import LibSignalClient public import SignalServiceKit public import SignalUI -import LibSignalClient public struct CVSelectionType: OptionSet { public let rawValue: UInt diff --git a/Signal/ConversationView/TSInteraction+DeleteActionSheet.swift b/Signal/ConversationView/TSInteraction+DeleteActionSheet.swift index 5e14a8e0c7..794c48c380 100644 --- a/Signal/ConversationView/TSInteraction+DeleteActionSheet.swift +++ b/Signal/ConversationView/TSInteraction+DeleteActionSheet.swift @@ -4,8 +4,8 @@ // import Foundation -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit import SignalUI public import UIKit diff --git a/Signal/Provisioning/DeviceProvisioningURL.swift b/Signal/Provisioning/DeviceProvisioningURL.swift index c7cee860bf..c25e3f3d98 100644 --- a/Signal/Provisioning/DeviceProvisioningURL.swift +++ b/Signal/Provisioning/DeviceProvisioningURL.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import SignalServiceKit public import LibSignalClient +import SignalServiceKit public class DeviceProvisioningURL { diff --git a/Signal/Provisioning/ProvisioningManager.swift b/Signal/Provisioning/ProvisioningManager.swift index 8d496a6ee9..a1d425d5e8 100644 --- a/Signal/Provisioning/ProvisioningManager.swift +++ b/Signal/Provisioning/ProvisioningManager.swift @@ -4,8 +4,8 @@ // import Foundation -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit public class ProvisioningManager { diff --git a/Signal/Provisioning/ProvisioningSocketManager.swift b/Signal/Provisioning/ProvisioningSocketManager.swift index aab2626278..09b5e95337 100644 --- a/Signal/Provisioning/ProvisioningSocketManager.swift +++ b/Signal/Provisioning/ProvisioningSocketManager.swift @@ -4,8 +4,8 @@ // import Foundation -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit // MARK: - DecryptableProvisioningMessage diff --git a/Signal/Registration/RegistrationCoordinatorBackupErrorPresenter.swift b/Signal/Registration/RegistrationCoordinatorBackupErrorPresenter.swift index b71603a767..5cbb190e19 100644 --- a/Signal/Registration/RegistrationCoordinatorBackupErrorPresenter.swift +++ b/Signal/Registration/RegistrationCoordinatorBackupErrorPresenter.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SafariServices import LibSignalClient +public import SafariServices import SignalServiceKit import SignalUI diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift index 3762092a04..f1c1ab31e4 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalUI public import SignalServiceKit +public import SignalUI public class PaymentsViewPassphraseConfirmViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift index 95732e38a6..6cd9babca9 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalUI public import SignalServiceKit +public import SignalUI public class PaymentsViewPassphraseGridViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Profile/BadgeCollectionView.swift b/Signal/src/ViewControllers/AppSettings/Profile/BadgeCollectionView.swift index ac753f41b6..bd16977761 100644 --- a/Signal/src/ViewControllers/AppSettings/Profile/BadgeCollectionView.swift +++ b/Signal/src/ViewControllers/AppSettings/Profile/BadgeCollectionView.swift @@ -116,6 +116,7 @@ class BadgeCollectionView: UICollectionView { } extension BadgeCollectionView: UICollectionViewDelegateFlowLayout, UICollectionViewDataSource { + // MARK: Selection func collectionView(_ collectionView: UICollectionView, shouldHighlightItemAt indexPath: IndexPath) -> Bool { diff --git a/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift b/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift index aec675fa6e..464f7732a4 100644 --- a/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift +++ b/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift @@ -4,9 +4,9 @@ // import Foundation -import UIKit public import SignalServiceKit import SignalUI +import UIKit protocol BadgeIssueSheetDelegate: AnyObject { func badgeIssueSheetActionTapped(_ action: BadgeIssueSheetAction) diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift index 4806bcd8ed..0be01bcae4 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift @@ -6,9 +6,9 @@ import BonMot import Foundation import Lottie +import SafariServices public import SignalServiceKit public import SignalUI -import SafariServices import UIKit // MARK: - Profile badge lookup diff --git a/Signal/src/ViewControllers/HomeView/HomeTabBarController.swift b/Signal/src/ViewControllers/HomeView/HomeTabBarController.swift index e695375212..1ce9a103d9 100644 --- a/Signal/src/ViewControllers/HomeView/HomeTabBarController.swift +++ b/Signal/src/ViewControllers/HomeView/HomeTabBarController.swift @@ -4,9 +4,9 @@ // public import Foundation -public import UIKit import SignalServiceKit import SignalUI +public import UIKit class HomeTabBarController: UITabBarController { diff --git a/Signal/src/ViewControllers/Photos/MediaControls.swift b/Signal/src/ViewControllers/Photos/MediaControls.swift index ca821f2c0b..a9a01773c3 100644 --- a/Signal/src/ViewControllers/Photos/MediaControls.swift +++ b/Signal/src/ViewControllers/Photos/MediaControls.swift @@ -11,6 +11,7 @@ import UIKit // MARK: - Camera Controls protocol CameraCaptureControlDelegate: AnyObject { + // MARK: Photo func cameraCaptureControlDidRequestCapturePhoto(_ control: CameraCaptureControl) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 17968539f6..cd4417569f 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -410,7 +410,7 @@ extension SendMediaNavigationController: PHPickerViewControllerDelegate { }, ) - let resolvablePendingAttachments = results.compactMap { (result) -> (() async throws -> PendingAttachment)? in + let resolvablePendingAttachments = results.compactMap { result -> (() async throws -> PendingAttachment)? in guard let assetIdentifier = result.assetIdentifier else { owsFailDebug("can't select asset without an identifier") return nil diff --git a/Signal/src/ViewControllers/SafetyTipsViewController.swift b/Signal/src/ViewControllers/SafetyTipsViewController.swift index 7995448771..25311b0993 100644 --- a/Signal/src/ViewControllers/SafetyTipsViewController.swift +++ b/Signal/src/ViewControllers/SafetyTipsViewController.swift @@ -4,8 +4,8 @@ // import Foundation -public import SignalUI import SignalServiceKit +public import SignalUI public enum SafetyTipsType { case contact diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index f3dfa2874b..8a6d06f66f 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import UIKit import QuartzCore +public import UIKit @IBDesignable open class MarqueeLabel: UILabel, CAAnimationDelegate { diff --git a/Signal/test/Provisioning/ProvisioningCoordinatorTest.swift b/Signal/test/Provisioning/ProvisioningCoordinatorTest.swift index 1895e46446..cfe3968a83 100644 --- a/Signal/test/Provisioning/ProvisioningCoordinatorTest.swift +++ b/Signal/test/Provisioning/ProvisioningCoordinatorTest.swift @@ -4,8 +4,8 @@ // import Foundation -public import XCTest import LibSignalClient +public import XCTest @testable import Signal @testable import SignalServiceKit diff --git a/Signal/test/Registration/RegistrationCoordinatorTestShims.swift b/Signal/test/Registration/RegistrationCoordinatorTestShims.swift index 09d7ba8fad..29a17a70fe 100644 --- a/Signal/test/Registration/RegistrationCoordinatorTestShims.swift +++ b/Signal/test/Registration/RegistrationCoordinatorTestShims.swift @@ -5,8 +5,8 @@ import Foundation import LibSignalClient -@testable public import SignalServiceKit @testable public import Signal +@testable public import SignalServiceKit extension RegistrationCoordinatorImpl { diff --git a/Signal/test/ViewControllers/DonationPaymentDetailsViewControllerTest.swift b/Signal/test/ViewControllers/DonationPaymentDetailsViewControllerTest.swift index ad34284dfa..764f0de51f 100644 --- a/Signal/test/ViewControllers/DonationPaymentDetailsViewControllerTest.swift +++ b/Signal/test/ViewControllers/DonationPaymentDetailsViewControllerTest.swift @@ -7,6 +7,7 @@ import XCTest @testable import Signal final class DonationPaymentDetailsViewControllerTest: XCTestCase { + // MARK: - Formatting tests func testFormatCardNumber() { diff --git a/Signal/test/attachments/SignalAttachmentTest.swift b/Signal/test/attachments/SignalAttachmentTest.swift index a14c188e8b..577c37bccb 100644 --- a/Signal/test/attachments/SignalAttachmentTest.swift +++ b/Signal/test/attachments/SignalAttachmentTest.swift @@ -10,6 +10,7 @@ import XCTest @testable import SignalUI class SignalAttachmentTest: XCTestCase { + // MARK: - Utilities func testMetadataStrippingDoesNotChangeOrientation(url: URL) throws { diff --git a/SignalServiceKit/Account/ProfileKey.swift b/SignalServiceKit/Account/ProfileKey.swift index cc2dfb31cf..0a1fb7eb51 100644 --- a/SignalServiceKit/Account/ProfileKey.swift +++ b/SignalServiceKit/Account/ProfileKey.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import LibSignalClient import Foundation +public import LibSignalClient extension ProfileKey { public convenience init(_ profileKey: Aes256Key) { diff --git a/SignalServiceKit/Account/ServiceId.swift b/SignalServiceKit/Account/ServiceId.swift index 427627e82b..048fab6318 100644 --- a/SignalServiceKit/Account/ServiceId.swift +++ b/SignalServiceKit/Account/ServiceId.swift @@ -4,8 +4,8 @@ // import Foundation -public import LibSignalClient public import GRDB +public import LibSignalClient extension Aci { /// Parses an ACI from its string representation. diff --git a/SignalServiceKit/Backups/Archiving/BackupArchiveManagerImpl.swift b/SignalServiceKit/Backups/Archiving/BackupArchiveManagerImpl.swift index 9e23435321..c850bb89ec 100644 --- a/SignalServiceKit/Backups/Archiving/BackupArchiveManagerImpl.swift +++ b/SignalServiceKit/Backups/Archiving/BackupArchiveManagerImpl.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import LibSignalClient import GRDB +public import LibSignalClient public enum BackupValidationError: Error { case unknownFields([String]) diff --git a/SignalServiceKit/Contacts/SystemContactsFetcher.swift b/SignalServiceKit/Contacts/SystemContactsFetcher.swift index 481d74efca..7cd62cbdab 100644 --- a/SignalServiceKit/Contacts/SystemContactsFetcher.swift +++ b/SignalServiceKit/Contacts/SystemContactsFetcher.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import Foundation public import Contacts import ContactsUI +import Foundation protocol ContactStoreAdaptee { var rawAuthorizationStatus: RawContactAuthorizationStatus { get } diff --git a/SignalServiceKit/Environment/RemoteConfigManager.swift b/SignalServiceKit/Environment/RemoteConfigManager.swift index 5e1cafe6af..bbd1a53476 100644 --- a/SignalServiceKit/Environment/RemoteConfigManager.swift +++ b/SignalServiceKit/Environment/RemoteConfigManager.swift @@ -639,7 +639,6 @@ private enum IsEnabledFlag: String, FlagType { case .ringrtcNwPathMonitorTrialKillSwitch: true // cached during launch, so not hot-swapped in practice case .ringrtcVp9Enabled: true case .serviceExtensionFailureKillSwitch: true - #if TESTABLE_BUILD case .hotSwappable: true case .nonSwappable: false @@ -729,7 +728,6 @@ private enum ValueFlag: String, FlagType { case .sepaEnabledRegions: true case .standardMediaQualityLevel: true case .videoAttachmentMaxEncryptedBytes: true - #if TESTABLE_BUILD case .hotSwappable: true case .nonSwappable: false diff --git a/SignalServiceKit/Messages/Interactions/AdminDelete/AdminDeleteManager.swift b/SignalServiceKit/Messages/Interactions/AdminDelete/AdminDeleteManager.swift index 7db79f1e52..52c63f12d2 100644 --- a/SignalServiceKit/Messages/Interactions/AdminDelete/AdminDeleteManager.swift +++ b/SignalServiceKit/Messages/Interactions/AdminDelete/AdminDeleteManager.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import LibSignalClient import GRDB +public import LibSignalClient public enum RemoteDeleteAuthor: Equatable { case admin(aci: Aci, displayName: String) diff --git a/SignalServiceKit/Messages/Interactions/TSInfoMessage.swift b/SignalServiceKit/Messages/Interactions/TSInfoMessage.swift index 504c58ae08..4665cb46ee 100644 --- a/SignalServiceKit/Messages/Interactions/TSInfoMessage.swift +++ b/SignalServiceKit/Messages/Interactions/TSInfoMessage.swift @@ -7,6 +7,7 @@ import Foundation import LibSignalClient extension TSInfoMessage { + // MARK: - Convenience initializers public convenience init( diff --git a/SignalServiceKit/Messages/Payments/ArchivedPayment.swift b/SignalServiceKit/Messages/Payments/ArchivedPayment.swift index 5b0f35c9c4..dff30db504 100644 --- a/SignalServiceKit/Messages/Payments/ArchivedPayment.swift +++ b/SignalServiceKit/Messages/Payments/ArchivedPayment.swift @@ -4,8 +4,8 @@ // import Foundation -public import LibSignalClient public import GRDB +public import LibSignalClient public struct ArchivedPayment: Codable, Hashable, FetchableRecord, PersistableRecord { public static let databaseTableName: String = "ArchivedPayment" diff --git a/SignalServiceKit/Messages/RecipientHidingManager.swift b/SignalServiceKit/Messages/RecipientHidingManager.swift index 4be148476d..ca1c0efd7f 100644 --- a/SignalServiceKit/Messages/RecipientHidingManager.swift +++ b/SignalServiceKit/Messages/RecipientHidingManager.swift @@ -4,8 +4,8 @@ // import Foundation -import Intents public import GRDB +import Intents // Recipient hiding (also called "contact hiding," "contact management," or // "contact removal/deletion" by Product) is a feature that allows users to diff --git a/SignalServiceKit/Network/API/NetworkManager.swift b/SignalServiceKit/Network/API/NetworkManager.swift index 8ea171c079..8a8b6da6bb 100644 --- a/SignalServiceKit/Network/API/NetworkManager.swift +++ b/SignalServiceKit/Network/API/NetworkManager.swift @@ -4,8 +4,8 @@ // import Foundation -import Reachability public import LibSignalClient +import Reachability public protocol NetworkManagerProtocol { func asyncRequestImpl( diff --git a/SignalServiceKit/Network/OWSURLSessionProtocol.swift b/SignalServiceKit/Network/OWSURLSessionProtocol.swift index 865ed77df6..3ffb31f321 100644 --- a/SignalServiceKit/Network/OWSURLSessionProtocol.swift +++ b/SignalServiceKit/Network/OWSURLSessionProtocol.swift @@ -180,6 +180,7 @@ extension OWSURLSessionProtocol { // MARK: - public extension OWSURLSessionProtocol { + // MARK: - Upload Tasks Convenience func performUpload( diff --git a/SignalServiceKit/Notifications/UserNotificationsPresenter.swift b/SignalServiceKit/Notifications/UserNotificationsPresenter.swift index 4868602616..feebdc10fb 100644 --- a/SignalServiceKit/Notifications/UserNotificationsPresenter.swift +++ b/SignalServiceKit/Notifications/UserNotificationsPresenter.swift @@ -5,8 +5,8 @@ import Foundation import Intents -import UserNotifications public import UIKit +import UserNotifications public class UserNotificationConfig { diff --git a/SignalServiceKit/Storage/Database/SDSDatabaseStorage/V2/DBTransaction.swift b/SignalServiceKit/Storage/Database/SDSDatabaseStorage/V2/DBTransaction.swift index ef9bf7c18a..876149c4fe 100644 --- a/SignalServiceKit/Storage/Database/SDSDatabaseStorage/V2/DBTransaction.swift +++ b/SignalServiceKit/Storage/Database/SDSDatabaseStorage/V2/DBTransaction.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import LibSignalClient public import GRDB +public import LibSignalClient @objc public class DBReadTransaction: NSObject { diff --git a/SignalServiceKit/Subscriptions/Donations/DonationSubscriptionManager.swift b/SignalServiceKit/Subscriptions/Donations/DonationSubscriptionManager.swift index ce7fdc85bf..d981e3c9f4 100644 --- a/SignalServiceKit/Subscriptions/Donations/DonationSubscriptionManager.swift +++ b/SignalServiceKit/Subscriptions/Donations/DonationSubscriptionManager.swift @@ -4,8 +4,8 @@ // import Foundation -import PassKit public import LibSignalClient +import PassKit public enum OneTimeBadgeLevel: Hashable { case boostBadge diff --git a/SignalServiceKit/Threads/TSContactThread.swift b/SignalServiceKit/Threads/TSContactThread.swift index 6f110f9c9e..4c120053b6 100644 --- a/SignalServiceKit/Threads/TSContactThread.swift +++ b/SignalServiceKit/Threads/TSContactThread.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import LibSignalClient public import GRDB +import LibSignalClient open class TSContactThread: TSThread { override public class var recordType: SDSRecordType { .contactThread } diff --git a/SignalServiceKit/Threads/TSGroupThread.swift b/SignalServiceKit/Threads/TSGroupThread.swift index f97182f3aa..52e9f813a3 100644 --- a/SignalServiceKit/Threads/TSGroupThread.swift +++ b/SignalServiceKit/Threads/TSGroupThread.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import LibSignalClient public import GRDB +public import LibSignalClient extension Notification.Name { public static let TSGroupThreadAvatarChanged = Notification.Name("TSGroupThreadAvatarChangedNotification") diff --git a/SignalServiceKit/Upload/AttachmentUpload.swift b/SignalServiceKit/Upload/AttachmentUpload.swift index fbabfaf615..2d3c64b053 100644 --- a/SignalServiceKit/Upload/AttachmentUpload.swift +++ b/SignalServiceKit/Upload/AttachmentUpload.swift @@ -12,6 +12,7 @@ extension Upload.Constants { } public enum AttachmentUpload { + // MARK: - Upload Entrypoint /// The main entry point into the CDN2/CDN3 upload flow. diff --git a/SignalServiceKit/tests/Network/RegistrationRequestFactoryTest.swift b/SignalServiceKit/tests/Network/RegistrationRequestFactoryTest.swift index 534d6b2a08..7894fc0983 100644 --- a/SignalServiceKit/tests/Network/RegistrationRequestFactoryTest.swift +++ b/SignalServiceKit/tests/Network/RegistrationRequestFactoryTest.swift @@ -4,8 +4,8 @@ // import Foundation -@testable import SignalServiceKit public import XCTest +@testable import SignalServiceKit public class RegistrationRequestFactoryTest: XCTestCase { diff --git a/SignalServiceKit/tests/Registration/RegistrationSessionManagerTest.swift b/SignalServiceKit/tests/Registration/RegistrationSessionManagerTest.swift index a7f1edcbfe..ab6fca7d44 100644 --- a/SignalServiceKit/tests/Registration/RegistrationSessionManagerTest.swift +++ b/SignalServiceKit/tests/Registration/RegistrationSessionManagerTest.swift @@ -4,8 +4,8 @@ // import Foundation -@testable import SignalServiceKit public import XCTest +@testable import SignalServiceKit public class RegistrationSessionManagerTest: XCTestCase { diff --git a/SignalServiceKit/tests/SSKBaseTest.swift b/SignalServiceKit/tests/SSKBaseTest.swift index bbe4165594..9486a7f889 100644 --- a/SignalServiceKit/tests/SSKBaseTest.swift +++ b/SignalServiceKit/tests/SSKBaseTest.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // +import CocoaLumberjack public import XCTest @testable public import SignalServiceKit -import CocoaLumberjack public class SSKBaseTest: XCTestCase { private var oldContext: (any AppContext)! diff --git a/SignalServiceKit/tests/Storage/Database/CreateV2AttachmentTablesMigrationTest.swift b/SignalServiceKit/tests/Storage/Database/CreateV2AttachmentTablesMigrationTest.swift index 9539e398b4..5db6f2ab98 100644 --- a/SignalServiceKit/tests/Storage/Database/CreateV2AttachmentTablesMigrationTest.swift +++ b/SignalServiceKit/tests/Storage/Database/CreateV2AttachmentTablesMigrationTest.swift @@ -4,8 +4,8 @@ // import GRDB -@testable import SignalServiceKit public import XCTest +@testable import SignalServiceKit public class AttachmentV2MigrationTest: XCTestCase { diff --git a/SignalServiceKit/tests/Storage/Database/DatabaseRecoveryTest.swift b/SignalServiceKit/tests/Storage/Database/DatabaseRecoveryTest.swift index f4aa8fb55b..eabf374369 100644 --- a/SignalServiceKit/tests/Storage/Database/DatabaseRecoveryTest.swift +++ b/SignalServiceKit/tests/Storage/Database/DatabaseRecoveryTest.swift @@ -10,6 +10,7 @@ import XCTest @testable import SignalServiceKit final class DatabaseRecoveryTest: SSKBaseTest { + // MARK: - Setup override func setUp() { diff --git a/SignalServiceKit/tests/Util/URLPathComponentsTest.swift b/SignalServiceKit/tests/Util/URLPathComponentsTest.swift index 856c3f412f..319f50ded3 100644 --- a/SignalServiceKit/tests/Util/URLPathComponentsTest.swift +++ b/SignalServiceKit/tests/Util/URLPathComponentsTest.swift @@ -7,6 +7,7 @@ import SignalServiceKit import XCTest final class URLPathComponentsTest: XCTestCase { + // MARK: - URLPathComponents tests func testExpressibleByArrayLiteral() { diff --git a/SignalServiceKit/tests/Util/UnfairLockTest.swift b/SignalServiceKit/tests/Util/UnfairLockTest.swift index 66de431f0d..3a158f442e 100644 --- a/SignalServiceKit/tests/Util/UnfairLockTest.swift +++ b/SignalServiceKit/tests/Util/UnfairLockTest.swift @@ -7,6 +7,7 @@ import SignalServiceKit import XCTest final class UnfairLockTest: XCTestCase { + // MARK: - Lock + Unlock func testSimpleLockAndUnlock() { diff --git a/SignalServiceKit/tests/Util/UnknownEnumCodableTest.swift b/SignalServiceKit/tests/Util/UnknownEnumCodableTest.swift index f087310173..5be340b449 100644 --- a/SignalServiceKit/tests/Util/UnknownEnumCodableTest.swift +++ b/SignalServiceKit/tests/Util/UnknownEnumCodableTest.swift @@ -4,8 +4,8 @@ // import Foundation -@testable import SignalServiceKit public import XCTest +@testable import SignalServiceKit public class UnknownEnumCodableTest: XCTestCase { diff --git a/SignalShareExtension/SharingThreadPickerProgressSheet.swift b/SignalShareExtension/SharingThreadPickerProgressSheet.swift index c57f80a225..ab13fe1e75 100644 --- a/SignalShareExtension/SharingThreadPickerProgressSheet.swift +++ b/SignalShareExtension/SharingThreadPickerProgressSheet.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalUI public import SignalServiceKit +public import SignalUI public class SharingThreadPickerProgressSheet: ActionSheetController { diff --git a/SignalUI/Appearance/UIColor+Signal.swift b/SignalUI/Appearance/UIColor+Signal.swift index 73b4310119..3268f04523 100644 --- a/SignalUI/Appearance/UIColor+Signal.swift +++ b/SignalUI/Appearance/UIColor+Signal.swift @@ -4,8 +4,8 @@ // import SignalServiceKit -import UIKit public import SwiftUI +import UIKit // MARK: - Custom Colors - diff --git a/SignalUI/AttachmentMultisend/AttachmentMultisend.swift b/SignalUI/AttachmentMultisend/AttachmentMultisend.swift index e3c3028b12..d8e7f7687e 100644 --- a/SignalUI/AttachmentMultisend/AttachmentMultisend.swift +++ b/SignalUI/AttachmentMultisend/AttachmentMultisend.swift @@ -4,8 +4,8 @@ // import Foundation -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit public class AttachmentMultisend { diff --git a/SignalUI/Attachments/TypedItemProvider.swift b/SignalUI/Attachments/TypedItemProvider.swift index 6015703efb..81bf1651c6 100644 --- a/SignalUI/Attachments/TypedItemProvider.swift +++ b/SignalUI/Attachments/TypedItemProvider.swift @@ -4,8 +4,8 @@ // import Foundation -import UniformTypeIdentifiers public import SignalServiceKit +import UniformTypeIdentifiers // MARK: - ItemProviderError diff --git a/SignalUI/ConversationView/CVUtils.swift b/SignalUI/ConversationView/CVUtils.swift index e40fa66263..34efa814ac 100644 --- a/SignalUI/ConversationView/CVUtils.swift +++ b/SignalUI/ConversationView/CVUtils.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // +public import SDWebImage import SignalServiceKit import UIKit -public import SDWebImage public class CVUtils { diff --git a/SignalUI/Payments/MobileCoinHelperSDK.swift b/SignalUI/Payments/MobileCoinHelperSDK.swift index d23a37c21e..8b1ec49e86 100644 --- a/SignalUI/Payments/MobileCoinHelperSDK.swift +++ b/SignalUI/Payments/MobileCoinHelperSDK.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalServiceKit import MobileCoin +public import SignalServiceKit public class MobileCoinHelperSDK: MobileCoinHelper { diff --git a/SignalUI/RecipientPickers/ContactCell.swift b/SignalUI/RecipientPickers/ContactCell.swift index 963e0f3f68..5ec90f9e97 100644 --- a/SignalUI/RecipientPickers/ContactCell.swift +++ b/SignalUI/RecipientPickers/ContactCell.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import UIKit public import Contacts public import SignalServiceKit +import UIKit public class ContactCell: UITableViewCell, ReusableTableViewCell { public static let reuseIdentifier = "ContactCell" diff --git a/SignalUI/RecipientPickers/CountryCodeViewController.swift b/SignalUI/RecipientPickers/CountryCodeViewController.swift index 5a074ecd9a..920ea8b4fd 100644 --- a/SignalUI/RecipientPickers/CountryCodeViewController.swift +++ b/SignalUI/RecipientPickers/CountryCodeViewController.swift @@ -3,9 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SwiftUI import Combine import SignalServiceKit +public import SwiftUI public protocol CountryCodeViewControllerDelegate: AnyObject { func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountry: PhoneNumberCountry) diff --git a/SignalUI/Sending/QuotedReplyModel.swift b/SignalUI/Sending/QuotedReplyModel.swift index 1b143f4ad0..20a8afc688 100644 --- a/SignalUI/Sending/QuotedReplyModel.swift +++ b/SignalUI/Sending/QuotedReplyModel.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalServiceKit public import LibSignalClient +public import SignalServiceKit /// View model for an existing quoted reply which has already fetched any attachments. /// NOT used for draft quoted replies; this is for TSMessages with quoted replies (or story replies) diff --git a/SignalUI/Sending/ThreadUtil+SignalUI.swift b/SignalUI/Sending/ThreadUtil+SignalUI.swift index 2d517f92db..27a86cd716 100644 --- a/SignalUI/Sending/ThreadUtil+SignalUI.swift +++ b/SignalUI/Sending/ThreadUtil+SignalUI.swift @@ -7,6 +7,7 @@ import Foundation public import SignalServiceKit extension ThreadUtil { + // MARK: - Durable Message Enqueue public class func enqueueMessage( diff --git a/SignalUI/Stickers/EditorSticker.swift b/SignalUI/Stickers/EditorSticker.swift index 9f9c2e2496..f4afca8d6d 100644 --- a/SignalUI/Stickers/EditorSticker.swift +++ b/SignalUI/Stickers/EditorSticker.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import UIKit public import SignalServiceKit +import UIKit private class LayerContainerView: UIView { let contentLayer: CALayer diff --git a/SignalUI/Stickers/StickerView.swift b/SignalUI/Stickers/StickerView.swift index e56ae09b11..88a6f11db2 100644 --- a/SignalUI/Stickers/StickerView.swift +++ b/SignalUI/Stickers/StickerView.swift @@ -4,8 +4,8 @@ // import Lottie -public import SignalServiceKit import SDWebImage +public import SignalServiceKit public class StickerView { diff --git a/SignalUI/SwiftUIExtensions/Text+Links.swift b/SignalUI/SwiftUIExtensions/Text+Links.swift index 13fa44cdb8..6a001f8d80 100644 --- a/SignalUI/SwiftUIExtensions/Text+Links.swift +++ b/SignalUI/SwiftUIExtensions/Text+Links.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SwiftUI import SignalServiceKit +public import SwiftUI extension Text { /// Appends a tappable link with a custom action to the end of a `Text`. diff --git a/SignalUI/Utils/SpamReportingUIUtils.swift b/SignalUI/Utils/SpamReportingUIUtils.swift index be9a6328f9..afdb3917a9 100644 --- a/SignalUI/Utils/SpamReportingUIUtils.swift +++ b/SignalUI/Utils/SpamReportingUIUtils.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SignalServiceKit import LibSignalClient +public import SignalServiceKit public enum ReportSpamUIUtils { public typealias Completion = (Bool) -> Void diff --git a/SignalUI/Views/CaptchaView.swift b/SignalUI/Views/CaptchaView.swift index 4ff8276cdd..1f23c0f863 100644 --- a/SignalUI/Views/CaptchaView.swift +++ b/SignalUI/Views/CaptchaView.swift @@ -4,8 +4,8 @@ // import Foundation -public import WebKit import SignalServiceKit +public import WebKit public protocol CaptchaViewDelegate: NSObjectProtocol { func captchaView(_: CaptchaView, didCompleteCaptchaWithToken: String) diff --git a/SignalUI/Views/ConversationAvatarView+SwiftUI.swift b/SignalUI/Views/ConversationAvatarView+SwiftUI.swift index 3630c4071b..a10a4f336d 100644 --- a/SignalUI/Views/ConversationAvatarView+SwiftUI.swift +++ b/SignalUI/Views/ConversationAvatarView+SwiftUI.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -public import SwiftUI public import SignalServiceKit +public import SwiftUI public struct AvatarView: View { public typealias Configuration = ConversationAvatarView.Configuration diff --git a/SignalUI/Views/ConversationAvatarView.swift b/SignalUI/Views/ConversationAvatarView.swift index c5d118215f..a53cb135e5 100644 --- a/SignalUI/Views/ConversationAvatarView.swift +++ b/SignalUI/Views/ConversationAvatarView.swift @@ -5,8 +5,8 @@ import GRDB import LibSignalClient -import UIKit public import SignalServiceKit +import UIKit public protocol ConversationAvatarViewDelegate: UIViewController { func didTapBadge() diff --git a/SignalUI/Views/ProfileDetailLabel.swift b/SignalUI/Views/ProfileDetailLabel.swift index fb75ba0376..6087b953ca 100644 --- a/SignalUI/Views/ProfileDetailLabel.swift +++ b/SignalUI/Views/ProfileDetailLabel.swift @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0-only // -import UIKit public import SignalServiceKit +import UIKit // MARK: - ProfileDetailLabel diff --git a/SignalUI/Views/TextAttachmentView.swift b/SignalUI/Views/TextAttachmentView.swift index 2bbc0a65bb..e36cf77804 100644 --- a/SignalUI/Views/TextAttachmentView.swift +++ b/SignalUI/Views/TextAttachmentView.swift @@ -4,8 +4,8 @@ // import Foundation -import UIKit public import SignalServiceKit +import UIKit open class TextAttachmentView: UIView { diff --git a/SignalUI/Views/TextViewWithPlaceholder.swift b/SignalUI/Views/TextViewWithPlaceholder.swift index e0d5becddc..327176249d 100644 --- a/SignalUI/Views/TextViewWithPlaceholder.swift +++ b/SignalUI/Views/TextViewWithPlaceholder.swift @@ -33,6 +33,7 @@ public extension TextViewWithPlaceholderDelegate { func textView(_ textView: TextViewWithPlaceholder, uiTextView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { return true } + func textViewDidBeginEditing(_ textView: TextViewWithPlaceholder) {} func textViewDidEndEditing(_ textView: TextViewWithPlaceholder) {} } @@ -40,6 +41,7 @@ public extension TextViewWithPlaceholderDelegate { // MARK: - public class TextViewWithPlaceholder: UIView, UITextViewDelegate { + // MARK: - Public Properties /// A delegate to receive callbacks on any data updates