remove import SignalMessaging statements

2024-03-12 02:43:39 -05:00 · 2024-03-12 02:43:39 -05:00 · d4e17730f3
commit d4e17730f3
parent a164473500
424 changed files with 0 additions and 425 deletions
--- a/Signal/OrphanData/OWSOrphanDataCleaner.swift
+++ b/Signal/OrphanData/OWSOrphanDataCleaner.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/Provisioning/ProvisioningCoordinator+Shims.swift
+++ b/Signal/Provisioning/ProvisioningCoordinator+Shims.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit

 extension ProvisioningCoordinatorImpl {
--- a/Signal/Registration/RegistrationCoodinatorShims.swift
+++ b/Signal/Registration/RegistrationCoodinatorShims.swift
@ -6,7 +6,6 @@
 import Contacts
 import Foundation
 import LibSignalClient
-import SignalMessaging
 import SignalServiceKit

 extension RegistrationCoordinatorImpl {
--- a/Signal/Registration/ViewControllers/RegistrationNavigationController.swift
+++ b/Signal/Registration/ViewControllers/RegistrationNavigationController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/URLs/UrlOpener.swift
+++ b/Signal/URLs/UrlOpener.swift
@ -6,7 +6,6 @@
 import Foundation
 import SignalServiceKit
 import SignalUI
-import SignalMessaging

 private enum OpenableUrl {
    case phoneNumberLink(URL)
--- a/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift
+++ b/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift
@ -4,7 +4,6 @@
 //

 import AVFoundation
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift
+++ b/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/AppDelegate.swift
+++ b/Signal/src/AppDelegate.swift
@ -4,7 +4,6 @@
 //

 import Intents
-import SignalMessaging
 import SignalServiceKit
 import SignalUI
 import WebRTC
--- a/Signal/src/Calls/CallAudioService.swift
+++ b/Signal/src/Calls/CallAudioService.swift
@ -5,7 +5,6 @@

 import AVFoundation
 import AVKit
-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit
 import SignalUI
--- a/Signal/src/Calls/CallService.swift
+++ b/Signal/src/Calls/CallService.swift
@ -5,7 +5,6 @@

 import AVFoundation
 import LibSignalClient
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC
 import SignalUI
--- a/Signal/src/Calls/CallStarter.swift
+++ b/Signal/src/Calls/CallStarter.swift
@ -4,7 +4,6 @@
 //

 import SignalUI
-import SignalMessaging
 import SignalServiceKit

 /// A type that allows calls to be started with a given recipient after various
--- a/Signal/src/Calls/Group/GroupCallRecordRingingCleanupManager.swift
+++ b/Signal/src/Calls/Group/GroupCallRecordRingingCleanupManager.swift
@ -4,7 +4,6 @@
 //

 import SignalCoreKit
-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit

--- a/Signal/src/Calls/Individual/IndividualCall.swift
+++ b/Signal/src/Calls/Individual/IndividualCall.swift
@ -4,7 +4,6 @@
 //

 import AVFoundation
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC
 import WebRTC
--- a/Signal/src/Calls/Individual/IndividualCallService.swift
+++ b/Signal/src/Calls/Individual/IndividualCallService.swift
@ -7,7 +7,6 @@ import Foundation
 import SignalRingRTC
 import WebRTC
 import SignalServiceKit
-import SignalMessaging
 import CallKit

 // MARK: - CallService
--- a/Signal/src/Calls/SignalCall.swift
+++ b/Signal/src/Calls/SignalCall.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit
 import SignalUI
--- a/Signal/src/Calls/Signaling/WebRTCCallMessageHandler.swift
+++ b/Signal/src/Calls/Signaling/WebRTCCallMessageHandler.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalServiceKit
-import SignalMessaging

 public class WebRTCCallMessageHandler: NSObject, OWSCallMessageHandler {

--- a/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift
+++ b/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit

 class CallControlsConfirmationToastView: UIView {
--- a/Signal/src/Calls/UserInterface/CallHeader.swift
+++ b/Signal/src/Calls/UserInterface/CallHeader.swift
@ -5,7 +5,6 @@

 import Foundation
 import LibSignalClient
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC
 import SignalUI
--- a/Signal/src/Calls/UserInterface/CallKit/CallKitCallUIAdaptee.swift
+++ b/Signal/src/Calls/UserInterface/CallKit/CallKitCallUIAdaptee.swift
@ -5,7 +5,6 @@

 import AVFoundation
 import CallKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Calls/UserInterface/CallMemberCameraOffView.swift
+++ b/Signal/src/Calls/UserInterface/CallMemberCameraOffView.swift
@ -5,7 +5,6 @@

 import Foundation
 import LibSignalClient
-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit
 import SignalUI
--- a/Signal/src/Calls/UserInterface/CallMemberVideoView.swift
+++ b/Signal/src/Calls/UserInterface/CallMemberVideoView.swift
@ -5,7 +5,6 @@

 import AVFoundation
 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC

--- a/Signal/src/Calls/UserInterface/CallMemberView.swift
+++ b/Signal/src/Calls/UserInterface/CallMemberView.swift
@ -5,7 +5,6 @@

 import Foundation
 import LibSignalClient
-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit
 import SignalUI
--- a/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift
+++ b/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit

--- a/Signal/src/Calls/UserInterface/CallUIAdapter.swift
+++ b/Signal/src/Calls/UserInterface/CallUIAdapter.swift
@ -6,7 +6,6 @@
 import Foundation
 import CallKit
 import SignalServiceKit
-import SignalMessaging
 import WebRTC
 import UIKit

--- a/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift
+++ b/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift
@ -5,7 +5,6 @@

 import LibSignalClient
 import SignalRingRTC
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift
+++ b/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift
@ -5,7 +5,6 @@

 import Foundation
 import LibSignalClient
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC
 import SignalUI
--- a/Signal/src/Calls/UserInterface/Group/GroupCallViewController.swift
+++ b/Signal/src/Calls/UserInterface/Group/GroupCallViewController.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalRingRTC
 import SignalUI
--- a/Signal/src/Calls/UserInterface/Individual/IndividualCallViewController.swift
+++ b/Signal/src/Calls/UserInterface/Individual/IndividualCallViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalRingRTC
 import SignalServiceKit
 import SignalUI
--- a/Signal/src/Calls/UserInterface/NonCallKitCallUIAdaptee.swift
+++ b/Signal/src/Calls/UserInterface/NonCallKitCallUIAdaptee.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalServiceKit
-import SignalMessaging

 /**
 * Manage call related UI in a pre-CallKit world.
--- a/Upgrades/MegaphoneView.swift
+++ b/Upgrades/MegaphoneView.swift
@ -4,7 +4,6 @@
 //

 import Lottie
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Upgrades/SplashViewController.swift
+++ b/Upgrades/SplashViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Views/CreateUsernameMegaphone.swift
+++ b/Views/CreateUsernameMegaphone.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit

 class CreateUsernameMegaphone: MegaphoneView {
--- a/Views/NotificationPermissionReminderMegaphone.swift
+++ b/Views/NotificationPermissionReminderMegaphone.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Views/PinReminderMegaphone.swift
+++ b/Views/PinReminderMegaphone.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit

 class PinReminderMegaphone: MegaphoneView {
--- a/Views/RemoteMegaphone.swift
+++ b/Views/RemoteMegaphone.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ResendMessagePromptBuilder.swift
+++ b/Signal/src/ResendMessagePromptBuilder.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Usernames/Links/UsernameLinkPresentQRCodeViewController.swift
+++ b/Signal/src/Usernames/Links/UsernameLinkPresentQRCodeViewController.swift
@ -5,7 +5,6 @@

 import SignalCoreKit
 import SignalServiceKit
-import SignalMessaging
 import SignalUI

 class UsernameLinkPresentQRCodeViewController: OWSTableViewController2 {
--- a/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift
+++ b/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Usernames/Links/UsernameLinkScanQRCodeViewController.swift
+++ b/Signal/src/Usernames/Links/UsernameLinkScanQRCodeViewController.swift
@ -6,7 +6,6 @@
 import Photos
 import PureLayout
 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift
+++ b/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift
+++ b/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift
@ -4,7 +4,6 @@
 //

 import BonMot
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/Usernames/UsernameEducationViewController.swift
+++ b/Signal/src/Usernames/UsernameEducationViewController.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalUI
-import SignalMessaging
 import SignalServiceKit
 import SafariServices

--- a/Signal/src/ViewControllers/AppSettings/Account/AccountSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Account/AccountSettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Account/RequestAccountDataReportViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Account/RequestAccountDataReportViewController.swift
@ -5,7 +5,6 @@

 import Foundation
 import SignalUI
-import SignalMessaging
 import SignalServiceKit

 class RequestAccountDataReportViewController: OWSTableViewController2 {
--- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift
@ -4,7 +4,6 @@
 //

 import SignalUI
-import SignalMessaging
 import SignalServiceKit

 // MARK: - AppIcon
--- a/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift
@ -4,7 +4,6 @@
 //

 import IntentsUI
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift
@ -4,7 +4,6 @@
 //

 import SafariServices
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift
@ -4,7 +4,6 @@
 //

 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseRecipientViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseRecipientViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift
@ -4,7 +4,6 @@
 //

 import PassKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift
@ -5,7 +5,6 @@

 import Foundation
 import AuthenticationServices
-import SignalMessaging
 import SignalServiceKit

 extension BadgeGiftingConfirmationViewController {
--- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController+MySupport.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController+MySupport.swift
@ -6,7 +6,6 @@
 import SafariServices

 import SignalServiceKit
-import SignalMessaging
 import SignalUI

 private enum MySupportErrorState {
--- a/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift
@ -6,7 +6,6 @@
 import Foundation
 import SafariServices
 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI
 import UIKit
--- a/Signal/src/ViewControllers/AppSettings/HelpViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/HelpViewController.swift
@ -4,7 +4,6 @@
 //

 import SafariServices
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Internal/InternalSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Internal/InternalSettingsViewController.swift
@ -5,7 +5,6 @@

 import AVFoundation
 import SignalServiceKit
-import SignalMessaging
 import SignalUI

 class InternalSettingsViewController: OWSTableViewController2 {
--- a/Signal/src/ViewControllers/AppSettings/Internal/TestingViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Internal/TestingViewController.swift
@ -4,7 +4,6 @@
 //

 import MobileCoin
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Linked
+++ b/Signal/src/ViewControllers/AppSettings/Linked
@ -4,7 +4,6 @@
 //

 import LibSignalClient
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Devices/LinkedDevicesTableViewController.swift
+++ b/Devices/LinkedDevicesTableViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift
@ -4,7 +4,6 @@
 //

 import Lottie
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift
@ -5,7 +5,6 @@

 import Lottie
 import MobileCoin
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift
@ -4,7 +4,6 @@
 //

 import SignalUI
-import SignalMessaging
 import SignalServiceKit

 public class PaymentsViewPassphraseConfirmViewController: OWSTableViewController2 {
--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift
@ -4,7 +4,6 @@
 //

 import SignalUI
-import SignalMessaging
 import SignalServiceKit

 public class PaymentsViewPassphraseGridViewController: OWSTableViewController2 {
--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift
+++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/AppSettings/Profile/ProfileSettingsViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Profile/ProfileSettingsViewController.swift
@ -4,7 +4,6 @@
 //

 import SignalCoreKit
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/Attachment
+++ b/Signal/src/ViewControllers/Attachment
@ -4,7 +4,6 @@
 //

 import Photos
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Keyboard/RecentPhotoCollectionView.swift
+++ b/Keyboard/RecentPhotoCollectionView.swift
@ -5,7 +5,6 @@

 import Photos
 import PhotosUI
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift
+++ b/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift
+++ b/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit

 enum AvatarContext {
--- a/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift
+++ b/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift
@ -4,7 +4,6 @@
 //

 import CoreServices
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/CameraFirstCaptureSendFlow.swift
+++ b/Signal/src/ViewControllers/CameraFirstCaptureSendFlow.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/ContactShareViewHelper.swift
+++ b/Signal/src/ViewControllers/ContactShareViewHelper.swift
@ -5,7 +5,6 @@

 import ContactsUI
 import MessageUI
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/ContactViewController.swift
+++ b/Signal/src/ViewControllers/ContactViewController.swift
@ -5,7 +5,6 @@

 import ContactsUI
 import MessageUI
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Menus/ContextMenuActionsAccessory.swift
+++ b/Menus/ContextMenuActionsAccessory.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Menus/ContextMenuInteraction.swift
+++ b/Menus/ContextMenuInteraction.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import UIKit

--- a/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift
+++ b/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift
+++ b/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift
@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //

-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift
+++ b/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift
+++ b/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift
@ -4,7 +4,6 @@
 //

 import Foundation
-import SignalMessaging
 import SignalServiceKit
 import SignalUI

--- a/Show More
+++ b/Show More