diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index aa78c324b6..0069521444 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -227,8 +227,6 @@ 345AE2B62317048300DB6225 /* GRDBFinderTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345AE2B52317048200DB6225 /* GRDBFinderTest.swift */; }; 345DE96023ED9AA500A8E6E3 /* GroupsV2ProfileKeyUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345DE95F23ED9AA500A8E6E3 /* GroupsV2ProfileKeyUpdater.swift */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; - 346129A51FD1F09100532771 /* OWSContactsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 346129A21FD1F09100532771 /* OWSContactsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 346129A61FD1F09100532771 /* OWSContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129A31FD1F09100532771 /* OWSContactsManager.m */; }; 346129AF1FD1F5D900532771 /* SystemContactsFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346129AE1FD1F5D900532771 /* SystemContactsFetcher.swift */; }; 34635330256EA52A003C5428 /* ConversationViewTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3463532E256EA525003C5428 /* ConversationViewTest.swift */; }; 34635332257549F2003C5428 /* CVReactionCountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34635331257549F1003C5428 /* CVReactionCountsView.swift */; }; @@ -2856,8 +2854,6 @@ 345AE2B52317048200DB6225 /* GRDBFinderTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GRDBFinderTest.swift; sourceTree = ""; }; 345DE95F23ED9AA500A8E6E3 /* GroupsV2ProfileKeyUpdater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupsV2ProfileKeyUpdater.swift; sourceTree = ""; }; 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAELoadViewController.swift; sourceTree = ""; }; - 346129A21FD1F09100532771 /* OWSContactsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactsManager.h; sourceTree = ""; }; - 346129A31FD1F09100532771 /* OWSContactsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsManager.m; sourceTree = ""; }; 346129AE1FD1F5D900532771 /* SystemContactsFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemContactsFetcher.swift; sourceTree = ""; }; 346129B11FD1F7E800532771 /* OWSProfileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSProfileManager.h; sourceTree = ""; }; 346129B21FD1F7E800532771 /* OWSProfileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSProfileManager.m; sourceTree = ""; }; @@ -5888,8 +5884,6 @@ 5096BE642AF3514800668F9F /* ContactSyncAttachmentBuilder.swift */, 50086B9B29DF5CB100F9C072 /* NameResolver.swift */, 4C6E446822AEDDEE007982E6 /* NewAccountDiscovery.swift */, - 346129A21FD1F09100532771 /* OWSContactsManager.h */, - 346129A31FD1F09100532771 /* OWSContactsManager.m */, 3498A0A524DC81E100CA492C /* OWSContactsManager.swift */, 885C354F2370DFD50004BA35 /* OWSSyncManager.swift */, 50CB431B298860C700841A34 /* SystemContactsDataProvider.swift */, @@ -10976,7 +10970,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 346129A51FD1F09100532771 /* OWSContactsManager.h in Headers */, 34480B5B1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch in Headers */, 453518961FC63DBF00210559 /* SignalMessaging.h in Headers */, ); @@ -12417,7 +12410,6 @@ 764981432A230F2C00EC1287 /* MockSMEnvironment.swift in Sources */, 50086B9F29DF60D900F9C072 /* NameResolver.swift in Sources */, 4C6E446922AEDDEE007982E6 /* NewAccountDiscovery.swift in Sources */, - 346129A61FD1F09100532771 /* OWSContactsManager.m in Sources */, 3498A0A624DC81E100CA492C /* OWSContactsManager.swift in Sources */, 4C046AA7236148880035B234 /* OWSGroupSyncProcessingJobQueue.swift in Sources */, 885C35502370DFD50004BA35 /* OWSSyncManager.swift in Sources */, diff --git a/Signal/Registration/ViewControllers/RegistrationNavigationController.swift b/Signal/Registration/ViewControllers/RegistrationNavigationController.swift index bddd7fda6e..febafc9eb9 100644 --- a/Signal/Registration/ViewControllers/RegistrationNavigationController.swift +++ b/Signal/Registration/ViewControllers/RegistrationNavigationController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class RegistrationNavigationController: OWSNavigationController { diff --git a/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift b/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift index 056a8aeeb4..ed2aaaf491 100644 --- a/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift +++ b/Signal/VoiceMessage/VoiceMessageInProgressDraft.swift @@ -5,6 +5,7 @@ import AVFoundation import SignalMessaging +import SignalServiceKit import SignalUI /// Represents a voice note that's actively being recorded. diff --git a/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift b/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift index 2779effd6a..11c31d5dde 100644 --- a/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift +++ b/Signal/VoiceMessage/VoiceMessageInterruptedDraft.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI /// Represents a voice note that was "interrupted" while being recorded. diff --git a/Signal/src/AppDelegate.swift b/Signal/src/AppDelegate.swift index e213dbc915..146c490991 100644 --- a/Signal/src/AppDelegate.swift +++ b/Signal/src/AppDelegate.swift @@ -5,6 +5,7 @@ import Intents import SignalMessaging +import SignalServiceKit import SignalUI import WebRTC diff --git a/Signal/src/Calls/CallService.swift b/Signal/src/Calls/CallService.swift index 7da24b78fe..442be10f31 100644 --- a/Signal/src/Calls/CallService.swift +++ b/Signal/src/Calls/CallService.swift @@ -6,6 +6,7 @@ import AVFoundation import LibSignalClient import SignalMessaging +import SignalServiceKit import SignalRingRTC import SignalUI import WebRTC diff --git a/Signal/src/Calls/CallStarter.swift b/Signal/src/Calls/CallStarter.swift index febe4eb4bd..d46c993e79 100644 --- a/Signal/src/Calls/CallStarter.swift +++ b/Signal/src/Calls/CallStarter.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit /// A type that allows calls to be started with a given recipient after various /// checks are performed. See ``startCall(from:)`` for details of those checks. diff --git a/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift b/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift index 5604511e3e..8d76d0a8fc 100644 --- a/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift +++ b/Signal/src/Calls/UserInterface/CallControlsConfirmationToast.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit class CallControlsConfirmationToastView: UIView { enum ControlType { diff --git a/Signal/src/Calls/UserInterface/CallHeader.swift b/Signal/src/Calls/UserInterface/CallHeader.swift index cf53f57a7e..896bf26635 100644 --- a/Signal/src/Calls/UserInterface/CallHeader.swift +++ b/Signal/src/Calls/UserInterface/CallHeader.swift @@ -6,6 +6,7 @@ import Foundation import LibSignalClient import SignalMessaging +import SignalServiceKit import SignalRingRTC import SignalUI import UIKit diff --git a/Signal/src/Calls/UserInterface/CallMemberVideoView.swift b/Signal/src/Calls/UserInterface/CallMemberVideoView.swift index 0537ee1fcc..bcccfb90f1 100644 --- a/Signal/src/Calls/UserInterface/CallMemberVideoView.swift +++ b/Signal/src/Calls/UserInterface/CallMemberVideoView.swift @@ -6,6 +6,7 @@ import AVFoundation import Foundation import SignalMessaging +import SignalServiceKit import SignalRingRTC class CallMemberVideoView: UIView, CallMemberComposableView { diff --git a/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift b/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift index 8fa6277c1f..bf1a849048 100644 --- a/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift +++ b/Signal/src/Calls/UserInterface/CallMemberWaitingAndErrorView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit /// Only used for group calls currently; adjust if individual calls come to need it. class CallMemberWaitingAndErrorView: UIView, CallMemberComposableView { diff --git a/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift b/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift index 920f8decc1..2db254dca6 100644 --- a/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift +++ b/Signal/src/Calls/UserInterface/Group/GroupCallMemberSheet.swift @@ -6,6 +6,7 @@ import LibSignalClient import SignalRingRTC import SignalMessaging +import SignalServiceKit import SignalUI class GroupCallMemberSheet: InteractiveSheetViewController { diff --git a/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift b/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift index ce5a4f2be8..bb427a7b5c 100644 --- a/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift +++ b/Signal/src/Calls/UserInterface/Group/GroupCallMemberView.swift @@ -6,6 +6,7 @@ import Foundation import LibSignalClient import SignalMessaging +import SignalServiceKit import SignalRingRTC import SignalUI diff --git a/Signal/src/Experience Upgrades/MegaphoneView.swift b/Signal/src/Experience Upgrades/MegaphoneView.swift index 09a7e48bce..b86e8de8cb 100644 --- a/Signal/src/Experience Upgrades/MegaphoneView.swift +++ b/Signal/src/Experience Upgrades/MegaphoneView.swift @@ -5,6 +5,7 @@ import Lottie import SignalMessaging +import SignalServiceKit import SignalUI class MegaphoneView: UIView, ExperienceUpgradeView { diff --git a/Signal/src/Experience Upgrades/SplashViewController.swift b/Signal/src/Experience Upgrades/SplashViewController.swift index 8c995f5d0f..141e3f14e2 100644 --- a/Signal/src/Experience Upgrades/SplashViewController.swift +++ b/Signal/src/Experience Upgrades/SplashViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class SplashViewController: OWSViewController, ExperienceUpgradeView { diff --git a/Signal/src/Experience Upgrades/Upgrade Views/CreateUsernameMegaphone.swift b/Signal/src/Experience Upgrades/Upgrade Views/CreateUsernameMegaphone.swift index 40d570d7d7..ec16f6fb92 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/CreateUsernameMegaphone.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/CreateUsernameMegaphone.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit class CreateUsernameMegaphone: MegaphoneView { private let usernameSelectionCoordinator: UsernameSelectionCoordinator diff --git a/Signal/src/Experience Upgrades/Upgrade Views/NotificationPermissionReminderMegaphone.swift b/Signal/src/Experience Upgrades/Upgrade Views/NotificationPermissionReminderMegaphone.swift index ecea5e240a..2a065a3d22 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/NotificationPermissionReminderMegaphone.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/NotificationPermissionReminderMegaphone.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class NotificationPermissionReminderMegaphone: MegaphoneView { diff --git a/Signal/src/Experience Upgrades/Upgrade Views/PinReminderMegaphone.swift b/Signal/src/Experience Upgrades/Upgrade Views/PinReminderMegaphone.swift index 6592cd1336..7148a70994 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/PinReminderMegaphone.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/PinReminderMegaphone.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit class PinReminderMegaphone: MegaphoneView { init(experienceUpgrade: ExperienceUpgrade, fromViewController: UIViewController) { diff --git a/Signal/src/Experience Upgrades/Upgrade Views/RemoteMegaphone.swift b/Signal/src/Experience Upgrades/Upgrade Views/RemoteMegaphone.swift index 808a38aac4..f831f854d8 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/RemoteMegaphone.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/RemoteMegaphone.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class RemoteMegaphone: MegaphoneView { diff --git a/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift b/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift index 0a0f29ef11..1442354fe8 100644 --- a/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift +++ b/Signal/src/Usernames/Links/UsernameLinkScanQRCodeSheet.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class UsernameLinkScanQRCodeSheet: UsernameLinkScanQRCodeViewController { diff --git a/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift b/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift index 47c90c201f..8964d1a77d 100644 --- a/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift +++ b/Signal/src/Usernames/Links/UsernameLinkShareSheetViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class UsernameLinkShareSheetViewController: OWSTableSheetViewController { diff --git a/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift b/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift index fa58dc452f..7d47fbf97c 100644 --- a/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift +++ b/Signal/src/Usernames/Selection/UsernameSelectionViewController.swift @@ -5,6 +5,7 @@ import BonMot import SignalMessaging +import SignalServiceKit import SignalUI protocol UsernameSelectionDelegate: AnyObject { diff --git a/Signal/src/Usernames/UsernameEducationViewController.swift b/Signal/src/Usernames/UsernameEducationViewController.swift index 98b7edd022..9d2dea3e17 100644 --- a/Signal/src/Usernames/UsernameEducationViewController.swift +++ b/Signal/src/Usernames/UsernameEducationViewController.swift @@ -6,6 +6,7 @@ import Foundation import SignalUI import SignalMessaging +import SignalServiceKit import SafariServices class UsernameEducationViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift b/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift index 372ec8e457..c8b18ec502 100644 --- a/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class DeleteAccountConfirmationViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift index 78ef986f52..721d657045 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class AppSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift b/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift index a6ac44a1c6..2271a4db8e 100644 --- a/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Appearance/AppIconSettingsTableViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit // MARK: - AppIcon diff --git a/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift index 0b26a3d647..55db3c7c7f 100644 --- a/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/ChatsSettingsViewController.swift @@ -5,6 +5,7 @@ import IntentsUI import SignalMessaging +import SignalServiceKit import SignalUI class ChatsSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift b/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift index b2e300a413..9f0ba2718f 100644 --- a/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/ContactSupportViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI class SupportConstants: NSObject { diff --git a/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift b/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift index 67cf5ddcf5..3be952c54c 100644 --- a/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/CurrencyPickerViewController.swift @@ -5,6 +5,7 @@ import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI protocol CurrencyPickerDataSource { diff --git a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift index 477f010c45..83f5f3f75f 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingChooseBadgeViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class BadgeGiftingChooseBadgeViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift index e3183d2bb3..c604046b1b 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+ApplePay.swift @@ -5,6 +5,7 @@ import PassKit import SignalMessaging +import SignalServiceKit import SignalUI extension BadgeGiftingConfirmationViewController { diff --git a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift index 90305eaa42..9fb7256a17 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/BadgeGiftingConfirmationViewController+Paypal.swift @@ -6,6 +6,7 @@ import Foundation import AuthenticationServices import SignalMessaging +import SignalServiceKit extension BadgeGiftingConfirmationViewController { typealias SendGiftError = DonationViewsUtil.Gifts.SendGiftError diff --git a/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift b/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift index 86cc123134..9b0c9b7385 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationReceiptViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class DonationReceiptViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift index ee0975116a..58757eb589 100644 --- a/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift @@ -7,6 +7,7 @@ import Foundation import SafariServices import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/AppSettings/HelpViewController.swift b/Signal/src/ViewControllers/AppSettings/HelpViewController.swift index 450728863d..bfefe8ab11 100644 --- a/Signal/src/ViewControllers/AppSettings/HelpViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/HelpViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI final class HelpViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift index 5c90347751..a4ec64da00 100644 --- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsContentViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class NotificationSettingsContentViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift index c579c4e293..724d2df002 100644 --- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsSoundViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class NotificationSettingsSoundViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift index 2aa954994a..883680e73a 100644 --- a/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Notifications/NotificationSettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class NotificationSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift index e7d96ef7a5..c4b842104f 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsBiometryLockPromptViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public protocol PaymentsBiometryLockPromptDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift index aaf0247194..1b712622c9 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDetailViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class PaymentsDetailViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift index 9ae03bcf87..f806dde80f 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsHistoryViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class PaymentsHistoryViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift index 4a828d1787..28622c0118 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletCompleteViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class PaymentsRestoreWalletCompleteViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift index 6abf99b7d7..7daa848ce3 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletPasteboardViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class PaymentsRestoreWalletPasteboardViewController: OWSViewController { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift index 49266f89bf..abd6bb403d 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletWordViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class PaymentsRestoreWalletWordViewController: OWSViewController { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift index 1a417d69c2..ce6c8db5b9 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift @@ -5,6 +5,7 @@ import Lottie import SignalMessaging +import SignalServiceKit import SignalUI public enum PaymentsSettingsMode: UInt, CustomStringConvertible { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift index 2fa7d90591..2251099c99 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferInViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class PaymentsTransferInViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift index 2e6fc5fad5..bee59de26c 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsTransferOutViewController.swift @@ -6,6 +6,7 @@ import Lottie import MobileCoin import SignalMessaging +import SignalServiceKit import SignalUI public class PaymentsTransferOutViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift index 0ac0c7e61b..2af7b39983 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseConfirmViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit public class PaymentsViewPassphraseConfirmViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift index 6b266df4e7..a121290a54 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseGridViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit public class PaymentsViewPassphraseGridViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift index 7721436432..3a9ffb2533 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public protocol PaymentsViewPassphraseDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift index c1f59bee9f..75649a515e 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewUtils.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class PaymentsViewUtils: Dependencies { diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift index f27c7bcbad..fb41c896a6 100644 --- a/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Privacy/AdvancedPrivacySettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class AdvancedPrivacySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift index d2afbfea0b..3908577d37 100644 --- a/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class PrivacySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift index 4aed77d86e..5b68b2241a 100644 --- a/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Privacy/ProxySettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class ProxySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift b/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift index afbb074f60..a5f79a1c2f 100644 --- a/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Profile/BadgeConfigurationViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI enum BadgeConfiguration { diff --git a/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift b/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift index 992d1f9727..70a290994a 100644 --- a/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift +++ b/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift @@ -5,6 +5,7 @@ import Photos import SignalMessaging +import SignalServiceKit import SignalUI protocol AttachmentKeyboardDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Attachment Keyboard/RecentPhotoCollectionView.swift b/Signal/src/ViewControllers/Attachment Keyboard/RecentPhotoCollectionView.swift index c0827391a3..1ed4e90291 100644 --- a/Signal/src/ViewControllers/Attachment Keyboard/RecentPhotoCollectionView.swift +++ b/Signal/src/ViewControllers/Attachment Keyboard/RecentPhotoCollectionView.swift @@ -6,6 +6,7 @@ import Photos import PhotosUI import SignalMessaging +import SignalServiceKit import SignalUI protocol RecentPhotosDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift b/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift index 9c3c717c14..d0becacc2e 100644 --- a/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift +++ b/Signal/src/ViewControllers/Avatars/AvatarEditViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class AvatarEditViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift b/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift index 8763b00fb1..95a80116c9 100644 --- a/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift +++ b/Signal/src/ViewControllers/Avatars/AvatarHistoryManager.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit enum AvatarContext { case groupId(Data) diff --git a/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift b/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift index 07ef1d4a11..6611977150 100644 --- a/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift +++ b/Signal/src/ViewControllers/Avatars/AvatarSettingsViewController.swift @@ -5,6 +5,7 @@ import CoreServices import SignalMessaging +import SignalServiceKit import SignalUI class AvatarSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Context Menus/ContextMenuActionsAccessory.swift b/Signal/src/ViewControllers/Context Menus/ContextMenuActionsAccessory.swift index efc54fdcd9..a28509f713 100644 --- a/Signal/src/ViewControllers/Context Menus/ContextMenuActionsAccessory.swift +++ b/Signal/src/ViewControllers/Context Menus/ContextMenuActionsAccessory.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class ContextMenuActionsAccessory: ContextMenuTargetedPreviewAccessory, ContextMenuActionsViewDelegate { diff --git a/Signal/src/ViewControllers/Context Menus/ContextMenuInteraction.swift b/Signal/src/ViewControllers/Context Menus/ContextMenuInteraction.swift index a35b0acc9a..03d993674f 100644 --- a/Signal/src/ViewControllers/Context Menus/ContextMenuInteraction.swift +++ b/Signal/src/ViewControllers/Context Menus/ContextMenuInteraction.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit /// UIContextMenuInteractionDelegate analog diff --git a/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift b/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift index 149f9e438c..2549005bfe 100644 --- a/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift +++ b/Signal/src/ViewControllers/ConversationView/BlockingAnnouncementOnlyView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class BlockingAnnouncementOnlyView: UIStackView { diff --git a/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift b/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift index a445688d55..a19d53a51a 100644 --- a/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift +++ b/Signal/src/ViewControllers/ConversationView/BlockingLegacyGroupView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class BlockingLegacyGroupView: UIStackView { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift b/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift index a0e0e72d6a..c31f8e448a 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI protocol CVAudioPlayerListener { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift b/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift index 428c4aa041..d71e656fd6 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVAvatarBuilder.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI // Caching builder used for a single CVC load. diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVColorOrGradientView.swift b/Signal/src/ViewControllers/ConversationView/CV/CVColorOrGradientView.swift index 3eec099a86..34340ce9f6 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVColorOrGradientView.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVColorOrGradientView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI // Compare with ColorOrGradientSwatchView: diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentAudioAttachment.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentAudioAttachment.swift index a159be59b8..a849180d21 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentAudioAttachment.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentAudioAttachment.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class CVComponentAudioAttachment: CVComponentBase, CVComponent { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentBodyMedia.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentBodyMedia.swift index edc6d765a1..dcff17556b 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentBodyMedia.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentBodyMedia.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class CVComponentBodyMedia: CVComponentBase, CVComponent { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentDateHeader.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentDateHeader.swift index df9c41e2ed..726346808f 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentDateHeader.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentDateHeader.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class CVComponentDateHeader: CVComponentBase, CVRootComponent { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGenericAttachment.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGenericAttachment.swift index e2a6cf47e6..17dabf5837 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGenericAttachment.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGenericAttachment.swift @@ -6,6 +6,7 @@ import PassKit import QuickLook import SignalMessaging +import SignalServiceKit import SignalUI public class CVComponentGenericAttachment: CVComponentBase, CVComponent { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGiftBadge.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGiftBadge.swift index 46347826ce..6ee37a4d4c 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGiftBadge.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentGiftBadge.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI public class CVComponentGiftBadge: CVComponentBase, CVComponent { diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentMessage.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentMessage.swift index 02edbb4280..24177e9a82 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentMessage.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentMessage.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentViewOnce.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentViewOnce.swift index 5bf91ccda3..9b590f0c9e 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentViewOnce.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentViewOnce.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI enum ViewOnceState: Equatable { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/CVContactShareView.swift b/Signal/src/ViewControllers/ConversationView/Cells/CVContactShareView.swift index 797426311d..00068c7128 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/CVContactShareView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/CVContactShareView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class CVContactShareView: ManualStackView { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/CVMediaAlbumView.swift b/Signal/src/ViewControllers/ConversationView/Cells/CVMediaAlbumView.swift index b37e31a399..ad8774e4ca 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/CVMediaAlbumView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/CVMediaAlbumView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class CVMediaAlbumView: ManualStackViewWithLayer { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/GiftBadgeView.swift b/Signal/src/ViewControllers/ConversationView/Cells/GiftBadgeView.swift index 595fc32323..5cbe84c59b 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/GiftBadgeView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/GiftBadgeView.swift @@ -8,6 +8,7 @@ import Foundation import Lottie import QuartzCore import SignalMessaging +import SignalServiceKit import SignalUI class GiftBadgeView: ManualStackView { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift b/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift index d3b02e2386..be613a3b54 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public protocol QuotedMessageViewDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.swift b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.swift index a002d04882..13609e4a16 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public protocol ConversationInputTextViewDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar+QuotedReplyPreview.swift b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar+QuotedReplyPreview.swift index a1044a63f0..6b398c8308 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar+QuotedReplyPreview.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar+QuotedReplyPreview.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol QuotedReplyPreviewDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift index 5744ccc27b..292abace24 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift @@ -5,6 +5,7 @@ import Photos import SignalMessaging +import SignalServiceKit import SignalUI protocol ConversationInputToolbarDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Banners.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Banners.swift index ffbdae3614..b029e2ffd9 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Banners.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Banners.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public extension ConversationViewController { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+BottomBar.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+BottomBar.swift index 54d1d62b37..dc74db0576 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+BottomBar.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+BottomBar.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit enum CVCBottomViewType: Equatable { // For perf reasons, we don't use a bottom view until diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Calls.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Calls.swift index 6efa88f900..42d0503d82 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Calls.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Calls.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public extension ConversationViewController { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift index c15d9077a4..a666bdfea9 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+ConversationInputToolbarDelegate.swift @@ -6,6 +6,7 @@ import CoreServices import Photos import SignalMessaging +import SignalServiceKit import SignalUI extension ConversationViewController: ConversationInputToolbarDelegate { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Delegates.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Delegates.swift index 8af3e75ccd..992829074a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Delegates.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Delegates.swift @@ -6,6 +6,7 @@ import AVFoundation import Foundation import SignalMessaging +import SignalServiceKit import SignalUI extension ConversationViewController: AttachmentApprovalViewControllerDelegate { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+OWS.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+OWS.swift index 3a0681a86b..0b5e4442c0 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+OWS.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+OWS.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI extension ConversationViewController { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Selection.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Selection.swift index 8a981ae101..d654980797 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+Selection.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+Selection.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public struct CVSelectionType: OptionSet { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+VoiceMessage.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+VoiceMessage.swift index 456b6762d8..0d749404a9 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+VoiceMessage.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+VoiceMessage.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension ConversationViewController { func checkPermissionsAndStartRecordingVoiceMessage() { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.swift index 7839f8ef93..fa02ca47e4 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public enum ScrollContinuity: CustomStringConvertible { diff --git a/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiSkinTonePicker.swift b/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiSkinTonePicker.swift index 961cd4d058..b3bfd54eff 100644 --- a/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiSkinTonePicker.swift +++ b/Signal/src/ViewControllers/ConversationView/Emoji Picker/EmojiSkinTonePicker.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class EmojiSkinTonePicker: UIView { diff --git a/Signal/src/ViewControllers/ConversationView/MemberRequestView.swift b/Signal/src/ViewControllers/ConversationView/MemberRequestView.swift index def35f06e9..dde70991ad 100644 --- a/Signal/src/ViewControllers/ConversationView/MemberRequestView.swift +++ b/Signal/src/ViewControllers/ConversationView/MemberRequestView.swift @@ -5,6 +5,7 @@ import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI class MemberRequestView: UIStackView { diff --git a/Signal/src/ViewControllers/ConversationView/Reactions Details/EmojiReactorsTableView.swift b/Signal/src/ViewControllers/ConversationView/Reactions Details/EmojiReactorsTableView.swift index 9f015f862b..e6967ea03a 100644 --- a/Signal/src/ViewControllers/ConversationView/Reactions Details/EmojiReactorsTableView.swift +++ b/Signal/src/ViewControllers/ConversationView/Reactions Details/EmojiReactorsTableView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class EmojiReactorsTableView: UITableView { diff --git a/Signal/src/ViewControllers/CropScaleImageViewController.swift b/Signal/src/ViewControllers/CropScaleImageViewController.swift index 0007e2c440..61002edf67 100644 --- a/Signal/src/ViewControllers/CropScaleImageViewController.swift +++ b/Signal/src/ViewControllers/CropScaleImageViewController.swift @@ -5,6 +5,7 @@ import MediaPlayer import SignalMessaging +import SignalServiceKit import SignalUI // This kind of view is tricky. I've tried to organize things in the diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.swift b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.swift index e8a245baa2..aa8cea502b 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI #if USE_DEBUG_UI diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.swift b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.swift index 8dd73971c1..07b4f68549 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI #if USE_DEBUG_UI diff --git a/Signal/src/ViewControllers/DebugUI/LogViewController.swift b/Signal/src/ViewControllers/DebugUI/LogViewController.swift index f6ed568916..da39e12bc8 100644 --- a/Signal/src/ViewControllers/DebugUI/LogViewController.swift +++ b/Signal/src/ViewControllers/DebugUI/LogViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class LogPickerViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Donations/BadgeGiftingThanksSheet.swift b/Signal/src/ViewControllers/Donations/BadgeGiftingThanksSheet.swift index 849b1b7792..341062680f 100644 --- a/Signal/src/ViewControllers/Donations/BadgeGiftingThanksSheet.swift +++ b/Signal/src/ViewControllers/Donations/BadgeGiftingThanksSheet.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class BadgeGiftingThanksSheet: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift b/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift index 7ebb17cd20..fd415bb568 100644 --- a/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift +++ b/Signal/src/ViewControllers/Donations/BadgeIssueSheet.swift @@ -6,6 +6,7 @@ import Foundation import UIKit import SignalMessaging +import SignalServiceKit import SignalUI protocol BadgeIssueSheetDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Donations/BankTransferMandateViewController.swift b/Signal/src/ViewControllers/Donations/BankTransferMandateViewController.swift index f86477b8e9..423692399f 100644 --- a/Signal/src/ViewControllers/Donations/BankTransferMandateViewController.swift +++ b/Signal/src/ViewControllers/Donations/BankTransferMandateViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit @MainActor class BankTransferMandateViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Donations/DonateViewController+MonthlyPaypalDonation.swift b/Signal/src/ViewControllers/Donations/DonateViewController+MonthlyPaypalDonation.swift index 1c4a25e93f..bf65cce879 100644 --- a/Signal/src/ViewControllers/Donations/DonateViewController+MonthlyPaypalDonation.swift +++ b/Signal/src/ViewControllers/Donations/DonateViewController+MonthlyPaypalDonation.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI extension DonateViewController { diff --git a/Signal/src/ViewControllers/Donations/DonateViewController+MonthlySubscriptionLevelView.swift b/Signal/src/ViewControllers/Donations/DonateViewController+MonthlySubscriptionLevelView.swift index 8690ae784d..da035b2f7e 100644 --- a/Signal/src/ViewControllers/Donations/DonateViewController+MonthlySubscriptionLevelView.swift +++ b/Signal/src/ViewControllers/Donations/DonateViewController+MonthlySubscriptionLevelView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI extension DonateViewController { diff --git a/Signal/src/ViewControllers/Donations/DonateViewController+OneTimePaypalDonation.swift b/Signal/src/ViewControllers/Donations/DonateViewController+OneTimePaypalDonation.swift index c5c16215ac..780736c299 100644 --- a/Signal/src/ViewControllers/Donations/DonateViewController+OneTimePaypalDonation.swift +++ b/Signal/src/ViewControllers/Donations/DonateViewController+OneTimePaypalDonation.swift @@ -6,6 +6,7 @@ import AuthenticationServices import Foundation import SignalMessaging +import SignalServiceKit import SignalUI extension DonateViewController { diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+3DSecure.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+3DSecure.swift index ef945d5c69..5f59ffa85b 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+3DSecure.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+3DSecure.swift @@ -6,6 +6,7 @@ import Foundation import AuthenticationServices import SignalMessaging +import SignalServiceKit extension DonationPaymentDetailsViewController { func show3DS(for redirectUrl: URL) -> Promise { diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+DonationMode.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+DonationMode.swift index 1cbae66ec0..a4b6fcb78f 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+DonationMode.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+DonationMode.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DonationPaymentDetailsViewController { enum DonationMode { diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+FormState.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+FormState.swift index 30163bec9b..75196fe49e 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+FormState.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+FormState.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DonationPaymentDetailsViewController { enum InvalidFormField: Hashable { diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+GiftDonation.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+GiftDonation.swift index 00f4bc105c..834db35df6 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+GiftDonation.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+GiftDonation.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DonationPaymentDetailsViewController { /// Make a gift donation. diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+MonthlyDonation.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+MonthlyDonation.swift index b8f4c6eb26..22cb44485e 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+MonthlyDonation.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+MonthlyDonation.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DonationPaymentDetailsViewController { /// Make a monthly donation. diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+OneTimeDonation.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+OneTimeDonation.swift index deef60b9d8..54907f3913 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+OneTimeDonation.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController+OneTimeDonation.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI extension DonationPaymentDetailsViewController { diff --git a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController.swift b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController.swift index 837360950b..11d51fd774 100644 --- a/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController.swift +++ b/Signal/src/ViewControllers/Donations/DonationPaymentDetailsViewController.swift @@ -5,6 +5,7 @@ import AuthenticationServices import SignalMessaging +import SignalServiceKit import SignalUI class DonationPaymentDetailsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil+Gifting.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil+Gifting.swift index c0a05157bb..c9754a1115 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil+Gifting.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil+Gifting.swift @@ -5,6 +5,7 @@ import PassKit import SignalMessaging +import SignalServiceKit import SignalUI extension DonationViewsUtil { diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil+IDEAL.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil+IDEAL.swift index 57c9f0e552..1c92e14ea2 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil+IDEAL.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil+IDEAL.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil+LocalizedStripeError.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil+LocalizedStripeError.swift index 27d9720c17..9bc606b099 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil+LocalizedStripeError.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil+LocalizedStripeError.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DonationViewsUtil { typealias ErrorSheetDetails = (message: String, actions: ErrorSheetActions) diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil+Paypal.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil+Paypal.swift index 9be1203ac8..940685831c 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil+Paypal.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil+Paypal.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI extension DonationViewsUtil { diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil+WaitForSubscriptionJob.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil+WaitForSubscriptionJob.swift index 22d56d72a5..f5fd958451 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil+WaitForSubscriptionJob.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil+WaitForSubscriptionJob.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit private extension Optional where Wrapped == DonationPaymentMethod { var timeoutDuration: TimeInterval { diff --git a/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift b/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift index f5d3c38ea0..afd9ffe557 100644 --- a/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift +++ b/Signal/src/ViewControllers/Donations/DonationViewsUtil.swift @@ -7,6 +7,7 @@ import BonMot import Foundation import Lottie import SignalMessaging +import SignalServiceKit import SignalUI import UIKit import SafariServices diff --git a/Signal/src/ViewControllers/Donations/OneTimeDonationCustomAmountTextField.swift b/Signal/src/ViewControllers/Donations/OneTimeDonationCustomAmountTextField.swift index d20a1b4ce4..9df15a984e 100644 --- a/Signal/src/ViewControllers/Donations/OneTimeDonationCustomAmountTextField.swift +++ b/Signal/src/ViewControllers/Donations/OneTimeDonationCustomAmountTextField.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit protocol OneTimeDonationCustomAmountTextFieldDelegate: AnyObject { func oneTimeDonationCustomAmountTextFieldStateDidChange(_ textField: OneTimeDonationCustomAmountTextField) diff --git a/Signal/src/ViewControllers/GroupInviteLinksUI.swift b/Signal/src/ViewControllers/GroupInviteLinksUI.swift index a5478c0754..242cf42d32 100644 --- a/Signal/src/ViewControllers/GroupInviteLinksUI.swift +++ b/Signal/src/ViewControllers/GroupInviteLinksUI.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI public class GroupInviteLinksUI: UIView { diff --git a/Signal/src/ViewControllers/GroupLinkPromotionActionSheet.swift b/Signal/src/ViewControllers/GroupLinkPromotionActionSheet.swift index 43797232bc..2ad2895736 100644 --- a/Signal/src/ViewControllers/GroupLinkPromotionActionSheet.swift +++ b/Signal/src/ViewControllers/GroupLinkPromotionActionSheet.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class CustomActionSheet: ActionSheetController { diff --git a/Signal/src/ViewControllers/HomeView/Calls/CallsListViewController.swift b/Signal/src/ViewControllers/HomeView/Calls/CallsListViewController.swift index bc36d7f7d6..0861f19f20 100644 --- a/Signal/src/ViewControllers/HomeView/Calls/CallsListViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Calls/CallsListViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit import SignalRingRTC // MARK: - CallCellDelegate diff --git a/Signal/src/ViewControllers/HomeView/Chat List/CLVTableDataSource.swift b/Signal/src/ViewControllers/HomeView/Chat List/CLVTableDataSource.swift index ef1c39b4f8..959e8b5df1 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/CLVTableDataSource.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/CLVTableDataSource.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class CLVTableDataSource: NSObject { diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Helpers.swift b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Helpers.swift index 3478321ea8..1c719b70a0 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Helpers.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Helpers.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public extension ChatListViewController { diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Multiselect.swift b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Multiselect.swift index f033bf33aa..880252c166 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Multiselect.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Multiselect.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI extension ChatListViewController { diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Notifications.swift b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Notifications.swift index 14001ee5f6..5d04e99c4f 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Notifications.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Notifications.swift @@ -5,6 +5,7 @@ import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI extension ChatListViewController { diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift b/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift index 78dee06c15..8c109b0cb6 100644 --- a/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift +++ b/Signal/src/ViewControllers/HomeView/Chat List/ThreadSwipeHandler.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol ThreadSwipeHandler { diff --git a/Signal/src/ViewControllers/HomeView/ConversationSplitViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSplitViewController.swift index aaacb26ac6..9913412529 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationSplitViewController.swift +++ b/Signal/src/ViewControllers/HomeView/ConversationSplitViewController.swift @@ -5,6 +5,7 @@ import MultipeerConnectivity import SignalMessaging +import SignalServiceKit import SignalUI class ConversationSplitViewController: UISplitViewController, ConversationSplit { diff --git a/Signal/src/ViewControllers/HomeView/HomeTabViewController.swift b/Signal/src/ViewControllers/HomeView/HomeTabViewController.swift index 1bf350c8f3..a93e10bbbf 100644 --- a/Signal/src/ViewControllers/HomeView/HomeTabViewController.swift +++ b/Signal/src/ViewControllers/HomeView/HomeTabViewController.swift @@ -5,6 +5,7 @@ import SignalUI import SignalMessaging +import SignalServiceKit protocol HomeTabViewController: UIViewController { } diff --git a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift index b47f0a68a3..99525897fb 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift @@ -8,6 +8,7 @@ import Foundation import SafariServices import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI import UIKit import YYImage diff --git a/Signal/src/ViewControllers/HomeView/Stories/MyStoryCell.swift b/Signal/src/ViewControllers/HomeView/Stories/MyStoryCell.swift index 4fcfd88a02..6241d04dc7 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/MyStoryCell.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/MyStoryCell.swift @@ -6,6 +6,7 @@ import Foundation import UIKit import SignalMessaging +import SignalServiceKit import SignalUI class MyStoryCell: UITableViewCell { diff --git a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyCell.swift b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyCell.swift index a2e42a8e24..f22c91eb9b 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyCell.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyCell.swift @@ -5,6 +5,7 @@ import BonMot import SignalMessaging +import SignalServiceKit import SignalUI class StoryGroupReplyCell: UITableViewCell { diff --git a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyLoader.swift b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyLoader.swift index 17dcf2f92e..c2781c9b13 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyLoader.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/Group Reply Sheet/StoryGroupReplyLoader.swift @@ -6,6 +6,7 @@ import LibSignalClient import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI class StoryGroupReplyLoader: Dependencies { diff --git a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyInputToolbar.swift b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyInputToolbar.swift index a50077b07a..1124f52219 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyInputToolbar.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyInputToolbar.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyPreviewView.swift b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyPreviewView.swift index 4a075f3e75..88003d9280 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyPreviewView.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryReplyPreviewView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryViewsViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryViewsViewController.swift index 7e178367f7..ef4699d5cc 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryViewsViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Replies & Views Sheets/StoryViewsViewController.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/HomeView/Stories/Settings/GroupStorySettingsViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Settings/GroupStorySettingsViewController.swift index 4b3413ebf2..30d215a5c5 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Settings/GroupStorySettingsViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Settings/GroupStorySettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class GroupStorySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/HomeView/Stories/Settings/PrivateStorySettingsViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Settings/PrivateStorySettingsViewController.swift index 80bc0cc3ae..8ec4daf1d1 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Settings/PrivateStorySettingsViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Settings/PrivateStorySettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class PrivateStorySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift index 666253c8a0..f6f4c0dcc7 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI class StoryPrivacySettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/HomeView/Stories/StoryCell.swift b/Signal/src/ViewControllers/HomeView/Stories/StoryCell.swift index cdc1beeb4c..a5edd48b4f 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/StoryCell.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/StoryCell.swift @@ -6,6 +6,7 @@ import Foundation import UIKit import SignalMessaging +import SignalServiceKit import SignalUI class StoryCell: UITableViewCell { diff --git a/Signal/src/ViewControllers/HomeView/Stories/StoryInfoSheet.swift b/Signal/src/ViewControllers/HomeView/Stories/StoryInfoSheet.swift index 632e5fedb9..2761faee87 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/StoryInfoSheet.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/StoryInfoSheet.swift @@ -6,6 +6,7 @@ import Foundation import LibSignalClient import SignalMessaging +import SignalServiceKit import SignalUI class StoryInfoSheet: OWSTableSheetViewController { diff --git a/Signal/src/ViewControllers/LegacyGroupLearnMoreViewController.swift b/Signal/src/ViewControllers/LegacyGroupLearnMoreViewController.swift index 48e861f6c4..854162a17d 100644 --- a/Signal/src/ViewControllers/LegacyGroupLearnMoreViewController.swift +++ b/Signal/src/ViewControllers/LegacyGroupLearnMoreViewController.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI /// Presents information about legacy (V1) and new (V2) groups. diff --git a/Signal/src/ViewControllers/LocationPicker.swift b/Signal/src/ViewControllers/LocationPicker.swift index 47e8d166d1..237345a57f 100644 --- a/Signal/src/ViewControllers/LocationPicker.swift +++ b/Signal/src/ViewControllers/LocationPicker.swift @@ -13,6 +13,7 @@ import CoreLocation import CoreServices import MapKit import SignalMessaging +import SignalServiceKit import SignalUI public protocol LocationPickerDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/MediaGallery/Cells/AudioCell.swift b/Signal/src/ViewControllers/MediaGallery/Cells/AudioCell.swift index 55012da6ac..70e2a9e9c0 100644 --- a/Signal/src/ViewControllers/MediaGallery/Cells/AudioCell.swift +++ b/Signal/src/ViewControllers/MediaGallery/Cells/AudioCell.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class AudioCell: MediaTileListModeCell { diff --git a/Signal/src/ViewControllers/MediaGallery/Cells/MediaTileListModeCell.swift b/Signal/src/ViewControllers/MediaGallery/Cells/MediaTileListModeCell.swift index 37f7ddfb76..cf2c33b235 100644 --- a/Signal/src/ViewControllers/MediaGallery/Cells/MediaTileListModeCell.swift +++ b/Signal/src/ViewControllers/MediaGallery/Cells/MediaTileListModeCell.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI // This is a base class for cells in All Media that have a wide, one-per-row diff --git a/Signal/src/ViewControllers/MediaGallery/Cells/WidePhotoCell.swift b/Signal/src/ViewControllers/MediaGallery/Cells/WidePhotoCell.swift index d9844b5f36..37b0c3653f 100644 --- a/Signal/src/ViewControllers/MediaGallery/Cells/WidePhotoCell.swift +++ b/Signal/src/ViewControllers/MediaGallery/Cells/WidePhotoCell.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI /// This is the collection view cell for "list mode" in All Media. diff --git a/Signal/src/ViewControllers/MessageReactionPicker.swift b/Signal/src/ViewControllers/MessageReactionPicker.swift index c6d23edd10..9d68667895 100644 --- a/Signal/src/ViewControllers/MessageReactionPicker.swift +++ b/Signal/src/ViewControllers/MessageReactionPicker.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI protocol MessageReactionPickerDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift index 5ad4a4e7b6..99c8a1465c 100644 --- a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift +++ b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol GroupMemberViewDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/NewGroupView/NewGroupConfirmViewController.swift b/Signal/src/ViewControllers/NewGroupView/NewGroupConfirmViewController.swift index 8477b7041a..fe47ee0970 100644 --- a/Signal/src/ViewControllers/NewGroupView/NewGroupConfirmViewController.swift +++ b/Signal/src/ViewControllers/NewGroupView/NewGroupConfirmViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI public class NewGroupConfirmViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/NewGroupView/NewGroupMembersViewController.swift b/Signal/src/ViewControllers/NewGroupView/NewGroupMembersViewController.swift index c292375825..20fcd46a62 100644 --- a/Signal/src/ViewControllers/NewGroupView/NewGroupMembersViewController.swift +++ b/Signal/src/ViewControllers/NewGroupView/NewGroupMembersViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI // TODO: Rename to NewGroupViewController; remove old view. diff --git a/Signal/src/ViewControllers/OWSPinConfirmationViewController.swift b/Signal/src/ViewControllers/OWSPinConfirmationViewController.swift index 64a1b80012..e3fa8d7898 100644 --- a/Signal/src/ViewControllers/OWSPinConfirmationViewController.swift +++ b/Signal/src/ViewControllers/OWSPinConfirmationViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class PinConfirmationViewController: OWSViewController { diff --git a/Signal/src/ViewControllers/OutgoingDeviceTransfer/OutgoingDeviceTransferInitialViewController.swift b/Signal/src/ViewControllers/OutgoingDeviceTransfer/OutgoingDeviceTransferInitialViewController.swift index 35d1f81b70..7397a0397a 100644 --- a/Signal/src/ViewControllers/OutgoingDeviceTransfer/OutgoingDeviceTransferInitialViewController.swift +++ b/Signal/src/ViewControllers/OutgoingDeviceTransfer/OutgoingDeviceTransferInitialViewController.swift @@ -6,6 +6,7 @@ import Foundation import Lottie import SignalMessaging +import SignalServiceKit class OutgoingDeviceTransferInitialViewController: DeviceTransferBaseViewController { let animationView = AnimationView(name: "transfer") diff --git a/Signal/src/ViewControllers/Payments/SendPaymentCompletionActionSheet.swift b/Signal/src/ViewControllers/Payments/SendPaymentCompletionActionSheet.swift index b714d5d46e..515779fdd8 100644 --- a/Signal/src/ViewControllers/Payments/SendPaymentCompletionActionSheet.swift +++ b/Signal/src/ViewControllers/Payments/SendPaymentCompletionActionSheet.swift @@ -6,6 +6,7 @@ import Foundation import Lottie import SignalMessaging +import SignalServiceKit import SignalUI public protocol SendPaymentCompletionDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Payments/SendPaymentHelper.swift b/Signal/src/ViewControllers/Payments/SendPaymentHelper.swift index eb0ea744c5..750ff92e93 100644 --- a/Signal/src/ViewControllers/Payments/SendPaymentHelper.swift +++ b/Signal/src/ViewControllers/Payments/SendPaymentHelper.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public struct SendPaymentInfo { diff --git a/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift b/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift index aa97f2522d..35f50de78d 100644 --- a/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift +++ b/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift @@ -5,6 +5,7 @@ import Lottie import SignalMessaging +import SignalServiceKit import SignalUI public protocol SendPaymentViewDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Photos/CameraCaptureSession.swift b/Signal/src/ViewControllers/Photos/CameraCaptureSession.swift index 1e2080dc20..2feeb0f6dc 100644 --- a/Signal/src/ViewControllers/Photos/CameraCaptureSession.swift +++ b/Signal/src/ViewControllers/Photos/CameraCaptureSession.swift @@ -9,6 +9,7 @@ import CoreServices import Foundation import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 31550cad15..1afb41c0cd 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -5,6 +5,7 @@ import Photos import SignalMessaging +import SignalServiceKit import SignalUI protocol ImagePickerGridControllerDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/Photos/MediaControls.swift b/Signal/src/ViewControllers/Photos/MediaControls.swift index fad678780e..d2602df8d6 100644 --- a/Signal/src/ViewControllers/Photos/MediaControls.swift +++ b/Signal/src/ViewControllers/Photos/MediaControls.swift @@ -5,6 +5,7 @@ import Photos import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/Photos/PhotoLibrary.swift b/Signal/src/ViewControllers/Photos/PhotoLibrary.swift index 78ca6eac8b..c59ab6fea3 100644 --- a/Signal/src/ViewControllers/Photos/PhotoLibrary.swift +++ b/Signal/src/ViewControllers/Photos/PhotoLibrary.swift @@ -7,6 +7,7 @@ import CoreServices import Foundation import Photos import SignalMessaging +import SignalServiceKit protocol PhotoLibraryDelegate: AnyObject { func photoLibraryDidChange(_ photoLibrary: PhotoLibrary) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 37c64bb0cd..10e089a3b3 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -5,6 +5,7 @@ import Photos import SignalMessaging +import SignalServiceKit import SignalUI protocol SendMediaNavDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ProxyLinkSheetViewController.swift b/Signal/src/ViewControllers/ProxyLinkSheetViewController.swift index fa4773ffa9..81a3c5eb76 100644 --- a/Signal/src/ViewControllers/ProxyLinkSheetViewController.swift +++ b/Signal/src/ViewControllers/ProxyLinkSheetViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class ProxyLinkSheetViewController: OWSTableSheetViewController { diff --git a/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift b/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift index 1e106adf84..4007eb0a72 100644 --- a/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift +++ b/Signal/src/ViewControllers/RecipientPicker/AddToBlockListViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol AddToBlockListDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift b/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift index 8ecaf00b5e..9c086d7e65 100644 --- a/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift +++ b/Signal/src/ViewControllers/RecipientPicker/ComposeViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI @objc diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningModeSwitchConfirmationViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningModeSwitchConfirmationViewController.swift index 9b6464fa98..586e6289a5 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningModeSwitchConfirmationViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningModeSwitchConfirmationViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class ProvisioningModeSwitchConfirmationViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPermissionsViewController.swift index 602dfe24e6..e3bfb2773b 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPermissionsViewController.swift @@ -6,6 +6,7 @@ import Contacts import Lottie import SignalMessaging +import SignalServiceKit import SignalUI public class ProvisioningPermissionsViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPrepViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPrepViewController.swift index d4a9ec7c49..75d340c390 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPrepViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningPrepViewController.swift @@ -5,6 +5,7 @@ import Lottie import SignalMessaging +import SignalServiceKit import SignalUI public class ProvisioningPrepViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningQRCodeViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningQRCodeViewController.swift index 9f0eca609c..d3309ef94c 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningQRCodeViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningQRCodeViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI public class ProvisioningQRCodeViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferProgressViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferProgressViewController.swift index 81899e0641..e52baae73d 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferProgressViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferProgressViewController.swift @@ -5,6 +5,7 @@ import MultipeerConnectivity import SignalMessaging +import SignalServiceKit import SignalUI public class ProvisioningTransferProgressViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferQRCodeViewController.swift b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferQRCodeViewController.swift index 401b356a60..d8e6e22119 100644 --- a/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferQRCodeViewController.swift +++ b/Signal/src/ViewControllers/Registration/Provisioning/ProvisioningTransferQRCodeViewController.swift @@ -5,6 +5,7 @@ import MultipeerConnectivity import SignalMessaging +import SignalServiceKit import SignalUI public class ProvisioningTransferQRCodeViewController: ProvisioningBaseViewController { diff --git a/Signal/src/ViewControllers/Registration/RegistrationConfirmModeSwitchViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationConfirmModeSwitchViewController.swift index 7531999185..0df0badec0 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationConfirmModeSwitchViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationConfirmModeSwitchViewController.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI protocol RegistrationConfimModeSwitchPresenter: AnyObject { diff --git a/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberDiscoverabilityViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberDiscoverabilityViewController.swift index 5cc00a82da..a45513e3db 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberDiscoverabilityViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberDiscoverabilityViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol RegistrationPhoneNumberDiscoverabilityPresenter: AnyObject { diff --git a/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberViewController.swift index 1900d00936..3d325a42b3 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationPhoneNumberViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - RegistrationPhoneNumberPresenter diff --git a/Signal/src/ViewControllers/Registration/RegistrationPinAttemptsExhaustedAndMustCreateNewPinViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationPinAttemptsExhaustedAndMustCreateNewPinViewController.swift index cd1b04489c..5080f01ed1 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationPinAttemptsExhaustedAndMustCreateNewPinViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationPinAttemptsExhaustedAndMustCreateNewPinViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI public struct RegistrationPinAttemptsExhaustedViewState: Equatable { diff --git a/Signal/src/ViewControllers/Registration/RegistrationPinViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationPinViewController.swift index 0305e7164c..0b24d40e4c 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationPinViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationPinViewController.swift @@ -7,6 +7,7 @@ import Foundation import SafariServices import SignalUI import SignalMessaging +import SignalServiceKit public enum RegistrationPinCharacterSet { case digitsOnly diff --git a/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift index 74b927f62a..aad587443d 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - RegistrationProfileState diff --git a/Signal/src/ViewControllers/Registration/RegistrationReglockTimeoutViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationReglockTimeoutViewController.swift index 1ad35df418..511d5b1e53 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationReglockTimeoutViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationReglockTimeoutViewController.swift @@ -5,6 +5,7 @@ import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - RegistrationReglockTimeoutAcknowledgeAction diff --git a/Signal/src/ViewControllers/Registration/RegistrationSplashViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationSplashViewController.swift index 9c6bc5205e..a7723ec9b2 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationSplashViewController.swift @@ -6,6 +6,7 @@ import PureLayout import SafariServices import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - RegistrationSplashPresenter diff --git a/Signal/src/ViewControllers/Registration/RegistrationTransferProgressViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationTransferProgressViewController.swift index 72b49524fd..3de9830e35 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationTransferProgressViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationTransferProgressViewController.swift @@ -5,6 +5,7 @@ import MultipeerConnectivity import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/Registration/RegistrationTransferQRCodeViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationTransferQRCodeViewController.swift index 57ed2807b6..7736b44118 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationTransferQRCodeViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationTransferQRCodeViewController.swift @@ -6,6 +6,7 @@ import Foundation import MultipeerConnectivity import SignalMessaging +import SignalServiceKit import SignalUI public class RegistrationTransferQRCodeViewController: OWSViewController, OWSNavigationChildController { diff --git a/Signal/src/ViewControllers/Registration/RegistrationVerificationViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationVerificationViewController.swift index d597c39c84..2bc4cd0657 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationVerificationViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - RegistrationVerificationValidationError diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewUtil.swift b/Signal/src/ViewControllers/Registration/RegistrationViewUtil.swift index cb02c668ee..78c7b57a9d 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewUtil.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationViewUtil.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - Strings diff --git a/Signal/src/ViewControllers/SafetyTipsViewController.swift b/Signal/src/ViewControllers/SafetyTipsViewController.swift index 393f68d7c4..8c4eb54116 100644 --- a/Signal/src/ViewControllers/SafetyTipsViewController.swift +++ b/Signal/src/ViewControllers/SafetyTipsViewController.swift @@ -6,6 +6,7 @@ import Foundation import SignalUI import SignalMessaging +import SignalServiceKit public enum SafetyTipsType { case contact diff --git a/Signal/src/ViewControllers/SendMessageFlow.swift b/Signal/src/ViewControllers/SendMessageFlow.swift index 5a9a492ed5..da627d39ce 100644 --- a/Signal/src/ViewControllers/SendMessageFlow.swift +++ b/Signal/src/ViewControllers/SendMessageFlow.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public protocol SendMessageDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift index 706eed0584..ff2475dfc0 100644 --- a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class AddToGroupViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+Contents.swift b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+Contents.swift index d9f325e4d0..9be14e8317 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+Contents.swift +++ b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+Contents.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+LegacyGroups.swift b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+LegacyGroups.swift index 6741b3b5ce..22191ca567 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+LegacyGroups.swift +++ b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController+LegacyGroups.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class LegacyGroupView: UIView { diff --git a/Signal/src/ViewControllers/ThreadSettings/DisappearingMessagesTimerSettingsViewController.swift b/Signal/src/ViewControllers/ThreadSettings/DisappearingMessagesTimerSettingsViewController.swift index 6d60c3ac0b..63eead83d0 100644 --- a/Signal/src/ViewControllers/ThreadSettings/DisappearingMessagesTimerSettingsViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/DisappearingMessagesTimerSettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class DisappearingMessagesTimerSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/ThreadSettings/GroupAttributesEditorHelper.swift b/Signal/src/ViewControllers/ThreadSettings/GroupAttributesEditorHelper.swift index 2cec08b6ff..50f701da34 100644 --- a/Signal/src/ViewControllers/ThreadSettings/GroupAttributesEditorHelper.swift +++ b/Signal/src/ViewControllers/ThreadSettings/GroupAttributesEditorHelper.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol GroupAttributesEditorHelperDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ThreadSettings/GroupDescriptionViewController.swift b/Signal/src/ViewControllers/ThreadSettings/GroupDescriptionViewController.swift index fd74a8abf8..2e1dfe2159 100644 --- a/Signal/src/ViewControllers/ThreadSettings/GroupDescriptionViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/GroupDescriptionViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol GroupDescriptionViewControllerDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ThreadSettings/GroupMemberRequestsAndInvitesViewController.swift b/Signal/src/ViewControllers/ThreadSettings/GroupMemberRequestsAndInvitesViewController.swift index 5fa3850e65..062466c38d 100644 --- a/Signal/src/ViewControllers/ThreadSettings/GroupMemberRequestsAndInvitesViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/GroupMemberRequestsAndInvitesViewController.swift @@ -6,6 +6,7 @@ import LibSignalClient import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI protocol GroupMemberRequestsAndInvitesViewControllerDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ThreadSettings/GroupPermissionsSettingsViewController.swift b/Signal/src/ViewControllers/ThreadSettings/GroupPermissionsSettingsViewController.swift index 78b37e9f4f..0861777c87 100644 --- a/Signal/src/ViewControllers/ThreadSettings/GroupPermissionsSettingsViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/GroupPermissionsSettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol GroupPermissionsSettingsDelegate: AnyObject { diff --git a/Signal/src/ViewControllers/ThreadSettings/SoundAndNotificationsSettingsViewController.swift b/Signal/src/ViewControllers/ThreadSettings/SoundAndNotificationsSettingsViewController.swift index 8befb2b56c..41d167ac71 100644 --- a/Signal/src/ViewControllers/ThreadSettings/SoundAndNotificationsSettingsViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/SoundAndNotificationsSettingsViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class SoundAndNotificationsSettingsViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Wallpapers/ChatColorViewController.swift b/Signal/src/ViewControllers/Wallpapers/ChatColorViewController.swift index 80dcc09614..35a850a808 100644 --- a/Signal/src/ViewControllers/Wallpapers/ChatColorViewController.swift +++ b/Signal/src/ViewControllers/Wallpapers/ChatColorViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class ChatColorViewController: OWSTableViewController2, Dependencies { diff --git a/Signal/src/ViewControllers/Wallpapers/CustomColorViewController.swift b/Signal/src/ViewControllers/Wallpapers/CustomColorViewController.swift index e52645e9dc..5b1b1a0c18 100644 --- a/Signal/src/ViewControllers/Wallpapers/CustomColorViewController.swift +++ b/Signal/src/ViewControllers/Wallpapers/CustomColorViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI class CustomColorViewController: OWSTableViewController2 { diff --git a/Signal/src/ViewControllers/Wallpapers/PreviewWallpaperViewController.swift b/Signal/src/ViewControllers/Wallpapers/PreviewWallpaperViewController.swift index 951fc33992..cd42b2e1d2 100644 --- a/Signal/src/ViewControllers/Wallpapers/PreviewWallpaperViewController.swift +++ b/Signal/src/ViewControllers/Wallpapers/PreviewWallpaperViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI protocol PreviewWallpaperDelegate: AnyObject { diff --git a/Signal/src/util/DebugLogger+MainApp.swift b/Signal/src/util/DebugLogger+MainApp.swift index 80d0a09a78..6408c7de79 100644 --- a/Signal/src/util/DebugLogger+MainApp.swift +++ b/Signal/src/util/DebugLogger+MainApp.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit extension DebugLogger { diff --git a/Signal/src/util/DebugLogs.swift b/Signal/src/util/DebugLogs.swift index d8345bf03c..be45284342 100644 --- a/Signal/src/util/DebugLogs.swift +++ b/Signal/src/util/DebugLogs.swift @@ -8,6 +8,7 @@ import SSZipArchive import zlib import SignalCoreKit import SignalMessaging +import SignalServiceKit import SignalUI typealias UploadDebugLogsSuccess = (URL) -> Void diff --git a/Signal/src/util/Dependencies+MainApp.swift b/Signal/src/util/Dependencies+MainApp.swift index fce72095ff..492355ec36 100644 --- a/Signal/src/util/Dependencies+MainApp.swift +++ b/Signal/src/util/Dependencies+MainApp.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import SignalUI // MARK: - NSObject diff --git a/Signal/src/views/MediaTileDateFormatter.swift b/Signal/src/views/MediaTileDateFormatter.swift index 197fb6ce2d..3f91885a74 100644 --- a/Signal/src/views/MediaTileDateFormatter.swift +++ b/Signal/src/views/MediaTileDateFormatter.swift @@ -4,7 +4,7 @@ // import Foundation -import SignalMessaging +import SignalServiceKit class MediaTileDateFormatter { private static var todayTimeFormatter: DateFormatter = { diff --git a/Signal/src/views/NameCollisionReviewCell.swift b/Signal/src/views/NameCollisionReviewCell.swift index 9ec91f8e8b..db38a1f436 100644 --- a/Signal/src/views/NameCollisionReviewCell.swift +++ b/Signal/src/views/NameCollisionReviewCell.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI struct NameCollisionCellModel { diff --git a/Signal/src/views/PhotoGridViewCell.swift b/Signal/src/views/PhotoGridViewCell.swift index d78f44475c..0f30c05579 100644 --- a/Signal/src/views/PhotoGridViewCell.swift +++ b/Signal/src/views/PhotoGridViewCell.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI import UIKit diff --git a/Signal/src/views/ReactionFlybyAnimation.swift b/Signal/src/views/ReactionFlybyAnimation.swift index f3474d19e3..f028c5c939 100644 --- a/Signal/src/views/ReactionFlybyAnimation.swift +++ b/Signal/src/views/ReactionFlybyAnimation.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import SignalUI public class ReactionFlybyAnimation: UIView { diff --git a/Signal/test/Groups/ZkGroupIntegrationTest.swift b/Signal/test/Groups/ZkGroupIntegrationTest.swift index ce4b088926..0c99571127 100644 --- a/Signal/test/Groups/ZkGroupIntegrationTest.swift +++ b/Signal/test/Groups/ZkGroupIntegrationTest.swift @@ -6,6 +6,7 @@ import XCTest @testable import Signal @testable import SignalMessaging +import SignalServiceKit class ZkGroupIntegrationTest: XCTestCase { func testServerParamsAreUpToDate() { diff --git a/Signal/test/ViewControllers/BadgeGiftingChooseBadgeViewControllerStateTest.swift b/Signal/test/ViewControllers/BadgeGiftingChooseBadgeViewControllerStateTest.swift index 1ca5b97445..72895774f2 100644 --- a/Signal/test/ViewControllers/BadgeGiftingChooseBadgeViewControllerStateTest.swift +++ b/Signal/test/ViewControllers/BadgeGiftingChooseBadgeViewControllerStateTest.swift @@ -6,6 +6,7 @@ import XCTest @testable import Signal @testable import SignalMessaging +import SignalServiceKit class BadgeGiftingChooseBadgeViewControllerStateTest: XCTestCase { typealias State = BadgeGiftingChooseBadgeViewController.State diff --git a/Signal/test/ViewControllers/BadgeIssueSheetStateTest.swift b/Signal/test/ViewControllers/BadgeIssueSheetStateTest.swift index 551f681818..05b4f0de71 100644 --- a/Signal/test/ViewControllers/BadgeIssueSheetStateTest.swift +++ b/Signal/test/ViewControllers/BadgeIssueSheetStateTest.swift @@ -6,6 +6,7 @@ import XCTest @testable import Signal @testable import SignalMessaging +import SignalServiceKit class BadgeIssueSheetStateTest: XCTestCase { typealias State = BadgeIssueSheetState diff --git a/Signal/test/ViewControllers/DonateViewControllerTest.swift b/Signal/test/ViewControllers/DonateViewControllerTest.swift index 1de7d4bd66..1c5c025486 100644 --- a/Signal/test/ViewControllers/DonateViewControllerTest.swift +++ b/Signal/test/ViewControllers/DonateViewControllerTest.swift @@ -6,6 +6,7 @@ import XCTest @testable import Signal @testable import SignalMessaging +import SignalServiceKit final class DonateViewControllerTest: SignalBaseTest { typealias State = DonateViewController.State diff --git a/Signal/test/ViewControllers/VisibleBadgeResolverTest.swift b/Signal/test/ViewControllers/VisibleBadgeResolverTest.swift index c6ebb910cd..e0ad763e08 100644 --- a/Signal/test/ViewControllers/VisibleBadgeResolverTest.swift +++ b/Signal/test/ViewControllers/VisibleBadgeResolverTest.swift @@ -7,6 +7,7 @@ import XCTest @testable import Signal import SignalMessaging +import SignalServiceKit class VisibleBadgeResolverTest: XCTestCase { diff --git a/Signal/test/subscriptions/SubscriptionManagerTest.swift b/Signal/test/subscriptions/SubscriptionManagerTest.swift index e5950db3fc..26bbc10205 100644 --- a/Signal/test/subscriptions/SubscriptionManagerTest.swift +++ b/Signal/test/subscriptions/SubscriptionManagerTest.swift @@ -5,6 +5,7 @@ import XCTest @testable import SignalMessaging +import SignalServiceKit class SubscriptionChargeFailureTest: XCTestCase { typealias ChargeFailure = Subscription.ChargeFailure diff --git a/Signal/test/util/DateUtilTest.swift b/Signal/test/util/DateUtilTest.swift index a79a5f137b..0d8a925e8e 100644 --- a/Signal/test/util/DateUtilTest.swift +++ b/Signal/test/util/DateUtilTest.swift @@ -5,7 +5,7 @@ import XCTest -@testable import SignalMessaging +import SignalServiceKit class DateUtilTest: XCTestCase { func buildDate(year: Int = 0, diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h index e42ee65b30..f0d18fd7c6 100644 --- a/SignalMessaging/SignalMessaging.h +++ b/SignalMessaging/SignalMessaging.h @@ -12,4 +12,3 @@ FOUNDATION_EXPORT double SignalMessagingVersionNumber; FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[]; // The public headers of the framework -#import diff --git a/SignalMessaging/Storage Service/StorageServiceUnknownFieldMigrator.swift b/SignalMessaging/Storage Service/StorageServiceUnknownFieldMigrator.swift index 14b93b7a96..25cdd7aa78 100644 --- a/SignalMessaging/Storage Service/StorageServiceUnknownFieldMigrator.swift +++ b/SignalMessaging/Storage Service/StorageServiceUnknownFieldMigrator.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit /** * Utility class to simplify the transition when we start handling a previously-unknown storage diff --git a/SignalMessaging/Subscriptions/Paypal+API.swift b/SignalMessaging/Subscriptions/Paypal+API.swift index ae44383e6d..e3b0ef2a32 100644 --- a/SignalMessaging/Subscriptions/Paypal+API.swift +++ b/SignalMessaging/Subscriptions/Paypal+API.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit // MARK: - Boost diff --git a/SignalMessaging/Subscriptions/Paypal+WebAuthentication.swift b/SignalMessaging/Subscriptions/Paypal+WebAuthentication.swift index 2d866425e5..8aed7791e1 100644 --- a/SignalMessaging/Subscriptions/Paypal+WebAuthentication.swift +++ b/SignalMessaging/Subscriptions/Paypal+WebAuthentication.swift @@ -5,6 +5,7 @@ import AuthenticationServices import Foundation +import SignalServiceKit // MARK: - Present a new auth session diff --git a/SignalMessaging/Subscriptions/Paypal.swift b/SignalMessaging/Subscriptions/Paypal.swift index b3efcf827c..b4e46e6f15 100644 --- a/SignalMessaging/Subscriptions/Paypal.swift +++ b/SignalMessaging/Subscriptions/Paypal.swift @@ -5,5 +5,6 @@ import AuthenticationServices import Foundation +import SignalServiceKit public struct Paypal: Dependencies {} diff --git a/SignalMessaging/Subscriptions/ProfileBadgesSnapshot+Constructors.swift b/SignalMessaging/Subscriptions/ProfileBadgesSnapshot+Constructors.swift index 192a5d928b..03db22deea 100644 --- a/SignalMessaging/Subscriptions/ProfileBadgesSnapshot+Constructors.swift +++ b/SignalMessaging/Subscriptions/ProfileBadgesSnapshot+Constructors.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit public extension ProfileBadgesSnapshot { static func current() -> ProfileBadgesSnapshot { diff --git a/SignalMessaging/Subscriptions/Stripe+IDEAL.swift b/SignalMessaging/Subscriptions/Stripe+IDEAL.swift index 5204ca5e7e..38aff6fe60 100644 --- a/SignalMessaging/Subscriptions/Stripe+IDEAL.swift +++ b/SignalMessaging/Subscriptions/Stripe+IDEAL.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit extension Stripe.PaymentMethod { diff --git a/SignalMessaging/Subscriptions/Stripe+PaymentMethod.swift b/SignalMessaging/Subscriptions/Stripe+PaymentMethod.swift index 3cd3ced986..7f9074682b 100644 --- a/SignalMessaging/Subscriptions/Stripe+PaymentMethod.swift +++ b/SignalMessaging/Subscriptions/Stripe+PaymentMethod.swift @@ -5,6 +5,7 @@ import Foundation import PassKit +import SignalServiceKit /// A fully valid payment method, ready to submit to Stripe. /// diff --git a/SignalMessaging/Subscriptions/Stripe+Subscriptions.swift b/SignalMessaging/Subscriptions/Stripe+Subscriptions.swift index 240bb1ad80..7f3070687c 100644 --- a/SignalMessaging/Subscriptions/Stripe+Subscriptions.swift +++ b/SignalMessaging/Subscriptions/Stripe+Subscriptions.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit extension Stripe { /// Create a payment method entry with the Signal service for a subscription diff --git a/SignalMessaging/contacts/OWSContactsManager.h b/SignalMessaging/contacts/OWSContactsManager.h deleted file mode 100644 index f82d4e3df8..0000000000 --- a/SignalMessaging/contacts/OWSContactsManager.h +++ /dev/null @@ -1,101 +0,0 @@ -// -// Copyright 2014 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -extern NSNotificationName const OWSContactsManagerSignalAccountsDidChangeNotification; -extern NSNotificationName const OWSContactsManagerContactsDidChangeNotification; - -@class AnyLRUCache; -@class AnyPromise; -@class AuthedAccount; -@class OWSContactsManagerSwiftValues; -@class SDSAnyReadTransaction; -@class SDSKeyValueStore; -@class SignalAccount; -@class SignalServiceAddress; -@class SystemContactsFetcher; -@class UIFont; - -@protocol ContactsManagerCache; - -typedef NS_CLOSED_ENUM(NSUInteger, RawContactAuthorizationStatus) { - RawContactAuthorizationStatusNotDetermined, - RawContactAuthorizationStatusDenied, - RawContactAuthorizationStatusRestricted, - RawContactAuthorizationStatusAuthorized, -}; - -typedef NS_CLOSED_ENUM(NSUInteger, ContactAuthorizationForEditing) { - ContactAuthorizationForEditingNotAllowed, - ContactAuthorizationForEditingDenied, - ContactAuthorizationForEditingRestricted, - ContactAuthorizationForEditingAuthorized, -}; - -typedef NS_CLOSED_ENUM(NSUInteger, ContactAuthorizationForSharing) { - ContactAuthorizationForSharingNotDetermined, - ContactAuthorizationForSharingDenied, - ContactAuthorizationForSharingAuthorized, -}; - -/** - * Get latest Signal contacts, and be notified when they change. - */ -@interface OWSContactsManager : NSObject - -- (id)new NS_UNAVAILABLE; - -- (id)init NS_UNAVAILABLE; - -- (id)initWithSwiftValues:(OWSContactsManagerSwiftValues *)swiftValues; - -@property (nonatomic, readonly) OWSContactsManagerSwiftValues *swiftValues; -@property (nonatomic, readonly) SystemContactsFetcher *systemContactsFetcher; - -#pragma mark - Accessors - -@property (nonatomic, readonly) SDSKeyValueStore *keyValueStore; - -#pragma mark - System Contact Fetching - -@property (nonatomic, readonly) BOOL isEditingAllowed; - -// Must call `requestSystemContactsOnce` before accessing this method -@property (nonatomic, readonly) ContactAuthorizationForEditing editingAuthorization; - -@property (nonatomic, readonly) ContactAuthorizationForSharing sharingAuthorization; - -@property (atomic, readonly) BOOL isSetup; - -/// Whether or not we've fetched system contacts on this launch. -/// -/// This property is set to true even if the user doesn't have any system -/// contacts. -/// -/// This property is only valid if the user has granted contacts access. -/// Otherwise, it's value is undefined. -@property (nonatomic) BOOL hasLoadedSystemContacts; - -// Request systems contacts and start syncing changes. The user will see an alert -// if they haven't previously. -- (void)requestSystemContactsOnce; -- (void)requestSystemContactsOnceWithCompletion:(void (^_Nullable)(NSError *_Nullable error))completion; - -// Ensure's the app has the latest contacts, but won't prompt the user for contact -// access if they haven't granted it. -- (void)fetchSystemContactsOnceIfAlreadyAuthorized; - -// This variant will fetch system contacts if contact access has already been granted, -// but not prompt for contact access. Also, it will always notify delegates, even if -// contacts haven't changed, and will clear out any stale cached SignalAccounts -- (AnyPromise *)userRequestedSystemContactsRefresh; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m deleted file mode 100644 index 033eb2dd55..0000000000 --- a/SignalMessaging/contacts/OWSContactsManager.m +++ /dev/null @@ -1,204 +0,0 @@ -// -// Copyright 2014 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only -// - -#import "OWSContactsManager.h" -#import "OWSProfileManager.h" -#import -#import -#import -#import -#import -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -NSNotificationName const OWSContactsManagerSignalAccountsDidChangeNotification -= @"OWSContactsManagerSignalAccountsDidChangeNotification"; -NSNotificationName const OWSContactsManagerContactsDidChangeNotification -= @"OWSContactsManagerContactsDidChangeNotification"; - -NSString *const OWSContactsManagerCollection = @"OWSContactsManagerCollection"; - -@interface OWSContactsManager () - -@property (nonatomic) BOOL isContactsUpdateInFlight; - -@property (atomic) BOOL isSetup; - -@end - -#pragma mark - - -@implementation OWSContactsManager - -- (id)initWithSwiftValues:(OWSContactsManagerSwiftValues *)swiftValues -{ - self = [super init]; - if (!self) { - return self; - } - - _keyValueStore = [[SDSKeyValueStore alloc] initWithCollection:OWSContactsManagerCollection]; - - _systemContactsFetcher = [SystemContactsFetcher new]; - _systemContactsFetcher.delegate = self; - _swiftValues = swiftValues; - - OWSSingletonAssert(); - - AppReadinessRunNowOrWhenAppWillBecomeReady(^{ - [self setup]; - }); - - return self; -} - -- (void)setup { - [self setUpSystemContacts]; - self.isSetup = YES; -} - -#pragma mark - Sharing Contacts - -- (ContactAuthorizationForSharing)sharingAuthorization -{ - switch (self.systemContactsFetcher.rawAuthorizationStatus) { - case RawContactAuthorizationStatusNotDetermined: - return ContactAuthorizationForSharingNotDetermined; - - case RawContactAuthorizationStatusDenied: - case RawContactAuthorizationStatusRestricted: - return ContactAuthorizationForSharingDenied; - - case RawContactAuthorizationStatusAuthorized: - return ContactAuthorizationForSharingAuthorized; - } -} - -#pragma mark - Editing/Syncing Contacts - -- (BOOL)isEditingAllowed -{ - return [TSAccountManagerObjcBridge isPrimaryDeviceWithMaybeTransaction]; -} - -- (ContactAuthorizationForEditing)editingAuthorization -{ - if (![self isEditingAllowed]) { - return ContactAuthorizationForEditingNotAllowed; - } - switch (self.systemContactsFetcher.rawAuthorizationStatus) { - case RawContactAuthorizationStatusNotDetermined: - OWSFailDebug(@"should have called `requestOnce` before checking authorization status."); - // fallthrough - case RawContactAuthorizationStatusDenied: - return ContactAuthorizationForEditingDenied; - - case RawContactAuthorizationStatusRestricted: - return ContactAuthorizationForEditingRestricted; - - case RawContactAuthorizationStatusAuthorized: - return ContactAuthorizationForEditingAuthorized; - } -} - -// Request contacts access if you haven't asked recently. -- (void)requestSystemContactsOnce -{ - [self requestSystemContactsOnceWithCompletion:nil]; -} - -- (void)requestSystemContactsOnceWithCompletion:(void (^_Nullable)(NSError *_Nullable error))completion -{ - OWSAssertIsOnMainThread(); - - if (![self isEditingAllowed]) { - if (completion != nil) { - completion(OWSErrorMakeGenericError(@"Editing contacts isn't available on linked devices.")); - } - return; - } - [self.systemContactsFetcher requestOnceWithCompletion:completion]; -} - -- (void)fetchSystemContactsOnceIfAlreadyAuthorized -{ - if (![self isEditingAllowed]) { - return; - } - [self.systemContactsFetcher fetchOnceIfAlreadyAuthorized]; -} - -- (AnyPromise *)userRequestedSystemContactsRefresh -{ - if (![self isEditingAllowed]) { - return [AnyPromise - promiseWithError:OWSErrorMakeAssertionError(@"Editing contacts isn't available on linked devices.")]; - } - return AnyPromise.withFuture(^(AnyFuture *future) { - [self.systemContactsFetcher userRequestedRefreshWithCompletion:^(NSError *error) { - if (error) { - OWSLogError(@"refreshing contacts failed with error: %@", error); - [future rejectWithError:error]; - } else { - [future resolveWithValue:@1]; - } - }]; - }); -} - -#pragma mark - SystemContactsFetcherDelegate - -- (void)systemContactsFetcher:(SystemContactsFetcher *)systemsContactsFetcher - updatedContacts:(NSArray *)contacts - isUserRequested:(BOOL)isUserRequested -{ - if (![self isEditingAllowed]) { - OWSFailDebug(@"Syncing contacts isn't available on linked devices."); - return; - } - [self updateContacts:contacts isUserRequested:isUserRequested]; -} - -- (void)systemContactsFetcher:(SystemContactsFetcher *)systemContactsFetcher - hasAuthorizationStatus:(RawContactAuthorizationStatus)authorizationStatus -{ - if (![self isEditingAllowed]) { - OWSFailDebug(@"Syncing contacts isn't available on linked devices."); - return; - } - switch (authorizationStatus) { - case RawContactAuthorizationStatusRestricted: - case RawContactAuthorizationStatusDenied: - // Clear the contacts cache if access to the system contacts is revoked. - [self updateContacts:nil isUserRequested:NO]; - case RawContactAuthorizationStatusNotDetermined: - case RawContactAuthorizationStatusAuthorized: - break; - } -} - -- (NSString *)displayNameStringForAddress:(SignalServiceAddress *)address - transaction:(SDSAnyReadTransaction *)transaction -{ - return [self _displayNameStringFor:address tx:transaction]; -} - -- (NSString *)shortDisplayNameStringForAddress:(SignalServiceAddress *)address - transaction:(SDSAnyReadTransaction *)transaction -{ - return [self _shortDisplayNameStringFor:address tx:transaction]; -} - -- (NSArray *)sortSignalServiceAddressesObjC:(NSArray *)addresses - transaction:(SDSAnyReadTransaction *)transaction -{ - return [self _sortSignalServiceAddressesObjC:addresses transaction:transaction]; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/contacts/OWSContactsManager.swift b/SignalMessaging/contacts/OWSContactsManager.swift index 265dffbccf..07bbdf2558 100644 --- a/SignalMessaging/contacts/OWSContactsManager.swift +++ b/SignalMessaging/contacts/OWSContactsManager.swift @@ -9,6 +9,173 @@ import LibSignalClient import SignalCoreKit import SignalServiceKit +extension Notification.Name { + public static let OWSContactsManagerSignalAccountsDidChange = Notification.Name("OWSContactsManagerSignalAccountsDidChangeNotification") + public static let OWSContactsManagerContactsDidChange = Notification.Name("OWSContactsManagerContactsDidChangeNotification") +} + +@objc +public enum RawContactAuthorizationStatus: UInt { + case notDetermined, denied, restricted, authorized +} + +public enum ContactAuthorizationForEditing { + case notAllowed, denied, restricted, authorized +} + +public enum ContactAuthorizationForSharing { + case notDetermined, denied, authorized +} + +@objc +public class OWSContactsManager: NSObject, ContactsManagerProtocol { + let isSetup: AtomicBool = AtomicBool(false, lock: .init()) + let swiftValues: OWSContactsManagerSwiftValues + let systemContactsFetcher: SystemContactsFetcher + let keyValueStore: SDSKeyValueStore + public var isEditingAllowed: Bool { + TSAccountManagerObjcBridge.isPrimaryDeviceWithMaybeTransaction + } + /// Must call `requestSystemContactsOnce` before accessing this method + public var editingAuthorization: ContactAuthorizationForEditing { + guard isEditingAllowed else { + return .notAllowed + } + switch systemContactsFetcher.rawAuthorizationStatus { + case .notDetermined: + owsFailDebug("should have called `requestOnce` before checking authorization status.") + fallthrough + case .denied: + return .denied + case .restricted: + return .restricted + case .authorized: + return .authorized + } + } + public var sharingAuthorization: ContactAuthorizationForSharing { + switch self.systemContactsFetcher.rawAuthorizationStatus { + case .notDetermined: + return .notDetermined + case .denied, .restricted: + return .denied + case .authorized: + return .authorized + } + } + /// Whether or not we've fetched system contacts on this launch. + /// + /// This property is set to true even if the user doesn't have any system + /// contacts. + /// + /// This property is only valid if the user has granted contacts access. + /// Otherwise, it's value is undefined. + public private(set) var hasLoadedSystemContacts: Bool = false + + init(swiftValues: OWSContactsManagerSwiftValues) { + keyValueStore = SDSKeyValueStore(collection: "OWSContactsManagerCollection") + systemContactsFetcher = SystemContactsFetcher() + self.swiftValues = swiftValues + super.init() + systemContactsFetcher.delegate = self + + SwiftSingletons.register(self) + + AppReadiness.runNowOrWhenAppWillBecomeReady { + self.setup() + } + } + + func setup() { + setUpSystemContacts() + isSetup.set(true) + } + + // Request systems contacts and start syncing changes. The user will see an alert + // if they haven't previously. + public func requestSystemContactsOnce(completion: (((any Error)?) -> Void)? = nil) { + AssertIsOnMainThread() + + guard isEditingAllowed else { + if let completion = completion { + Logger.warn("Editing contacts isn't available on linked devices.") + completion(OWSError(error: .genericFailure, description: OWSLocalizedString("ERROR_DESCRIPTION_UNKNOWN_ERROR", comment: "Worst case generic error message"), isRetryable: false)) + } + return + } + systemContactsFetcher.requestOnce(completion: completion) + } + + /// Ensure's the app has the latest contacts, but won't prompt the user for contact + /// access if they haven't granted it. + public func fetchSystemContactsOnceIfAlreadyAuthorized() { + guard isEditingAllowed else { + return + } + systemContactsFetcher.fetchOnceIfAlreadyAuthorized() + } + + /// This variant will fetch system contacts if contact access has already been granted, + /// but not prompt for contact access. Also, it will always notify delegates, even if + /// contacts haven't changed, and will clear out any stale cached SignalAccounts + public func userRequestedSystemContactsRefresh() -> AnyPromise { + guard isEditingAllowed else { + owsFailDebug("Editing contacts isn't available on linked devices.") + let promise = AnyPromise() + promise.reject(OWSError(error: .assertionFailure, description: OWSLocalizedString("ERROR_DESCRIPTION_UNKNOWN_ERROR", comment: "Worst case generic error message"), isRetryable: false)) + return promise + } + return AnyPromise(future: { (future: AnyFuture) in + self.systemContactsFetcher.userRequestedRefresh { (error: (any Error)?) in + if let error = error { + Logger.error("refreshing contacts failed with error: \(error)") + future.reject(error: error) + } else { + future.resolve(value: NSNumber(value: 1)) + } + } + }) + } +} + +// MARK: - SystemContactsFetcherDelegate + +extension OWSContactsManager: SystemContactsFetcherDelegate { + + public func systemContactsFetcher(_ systemContactsFetcher: SystemContactsFetcher, hasAuthorizationStatus authorizationStatus: RawContactAuthorizationStatus) { + guard isEditingAllowed else { + owsFailDebug("Syncing contacts isn't available on linked devices.") + return + } + switch authorizationStatus { + case .restricted, .denied: + self.updateContacts(nil, isUserRequested: false) + case .notDetermined, .authorized: + break + } + } + + public func systemContactsFetcher(_ systemContactsFetcher: SystemContactsFetcher, updatedContacts contacts: [Contact], isUserRequested: Bool) { + guard isEditingAllowed else { + owsFailDebug("Syncing contacts isn't available on linked devices.") + return + } + updateContacts(contacts, isUserRequested: isUserRequested) + } + + public func displayNameString(for address: SignalServiceAddress, transaction: SDSAnyReadTransaction) -> String { + displayName(for: address, tx: transaction).resolvedValue() + } + + public func shortDisplayNameString(for address: SignalServiceAddress, transaction: SDSAnyReadTransaction) -> String { + displayName(for: address, tx: transaction).resolvedValue(useShortNameIfAvailable: true) + } + + public func sortSignalServiceAddressesObjC(_ addresses: [SignalServiceAddress], transaction: SDSAnyReadTransaction) -> [SignalServiceAddress] { + sortSignalServiceAddresses(addresses, transaction: transaction) + } +} + // MARK: - OWSContactsMangerSwiftValues class OWSContactsManagerSwiftValues { @@ -1180,18 +1347,6 @@ extension OWSContactsManager: ContactManager { displayNamesRefinery(for: addresses, transaction: tx).values.map { $0! } } - @available(swift, obsoleted: 1.0) - @objc - func _displayNameString(for address: SignalServiceAddress, tx: SDSAnyReadTransaction) -> String { - return displayName(for: address, tx: tx).resolvedValue() - } - - @available(swift, obsoleted: 1.0) - @objc - func _shortDisplayNameString(for address: SignalServiceAddress, tx: SDSAnyReadTransaction) -> String { - return displayName(for: address, tx: tx).resolvedValue(useShortNameIfAvailable: true) - } - private func systemContactNames(for addresses: some Sequence, tx: SDSAnyReadTransaction) -> [DisplayName.SystemContactName?] { let phoneNumbers = addresses.map { $0.phoneNumber } var compactedResult = systemContactNames(for: phoneNumbers.compacted(), tx: tx).makeIterator() @@ -1239,12 +1394,6 @@ extension OWSContactsManager: ContactManager { return shortName } - - @objc - @available(swift, obsoleted: 1.0) - func _sortSignalServiceAddressesObjC(_ addresses: [SignalServiceAddress], transaction: SDSAnyReadTransaction) -> [SignalServiceAddress] { - sortSignalServiceAddresses(addresses, transaction: transaction) - } } // MARK: - ContactManager diff --git a/SignalMessaging/contacts/OWSSyncManager.swift b/SignalMessaging/contacts/OWSSyncManager.swift index 633f5654c1..94260d067a 100644 --- a/SignalMessaging/contacts/OWSSyncManager.swift +++ b/SignalMessaging/contacts/OWSSyncManager.swift @@ -27,7 +27,7 @@ public class OWSSyncManager: NSObject, SyncManagerProtocolObjc { self.addObservers() if TSAccountManagerObjcBridge.isRegisteredWithMaybeTransaction { - owsAssertDebug(self.contactsManagerImpl.isSetup) + owsAssertDebug(self.contactsManagerImpl.isSetup.get()) if TSAccountManagerObjcBridge.isPrimaryDeviceWithMaybeTransaction { // syncAllContactsIfNecessary will skip if nothing has changed, @@ -398,7 +398,7 @@ extension OWSSyncManager: SyncManagerProtocol, SyncManagerProtocolSwift { guard AppReadiness.isAppReady else { return false } - guard contactsManagerImpl.isSetup else { + guard contactsManagerImpl.isSetup.get() else { return false } let tsAccountManager = DependenciesBridge.shared.tsAccountManager diff --git a/SignalMessaging/test/CGPointExtensionsTest.swift b/SignalMessaging/test/CGPointExtensionsTest.swift index af3b1dadfa..24dddc99c4 100644 --- a/SignalMessaging/test/CGPointExtensionsTest.swift +++ b/SignalMessaging/test/CGPointExtensionsTest.swift @@ -5,6 +5,7 @@ import XCTest @testable import SignalMessaging +import SignalServiceKit class CGPointExtensionsTest: XCTestCase { func testPlusEquals() throws { diff --git a/SignalMessaging/test/StorageServiceContactTest.swift b/SignalMessaging/test/StorageServiceContactTest.swift index c386a3915f..e79fb641b5 100644 --- a/SignalMessaging/test/StorageServiceContactTest.swift +++ b/SignalMessaging/test/StorageServiceContactTest.swift @@ -5,6 +5,7 @@ import LibSignalClient import XCTest +import SignalServiceKit @testable import SignalMessaging diff --git a/SignalMessaging/test/StripeTest.swift b/SignalMessaging/test/StripeTest.swift index 28fd3910d4..3d363889ce 100644 --- a/SignalMessaging/test/StripeTest.swift +++ b/SignalMessaging/test/StripeTest.swift @@ -5,6 +5,7 @@ import XCTest @testable import SignalMessaging +import SignalServiceKit final class StripeTest: XCTestCase { private let unknownCurrency = "ZZZ" diff --git a/SignalMessaging/test/SystemContactsDataProviderTest.swift b/SignalMessaging/test/SystemContactsDataProviderTest.swift index 12d15d37c3..f105b3d2fd 100644 --- a/SignalMessaging/test/SystemContactsDataProviderTest.swift +++ b/SignalMessaging/test/SystemContactsDataProviderTest.swift @@ -5,6 +5,7 @@ import Contacts import XCTest +import SignalServiceKit @testable import SignalMessaging diff --git a/SignalMessaging/utils/Dependencies+SignalMessaging.swift b/SignalMessaging/utils/Dependencies+SignalMessaging.swift index 50015e6358..445ed9dc00 100644 --- a/SignalMessaging/utils/Dependencies+SignalMessaging.swift +++ b/SignalMessaging/utils/Dependencies+SignalMessaging.swift @@ -4,6 +4,7 @@ // import Foundation +import SignalServiceKit // MARK: - NSObject diff --git a/SignalShareExtension/SharingThreadPickerViewController.swift b/SignalShareExtension/SharingThreadPickerViewController.swift index 8fa0ae5848..2d3af19b30 100644 --- a/SignalShareExtension/SharingThreadPickerViewController.swift +++ b/SignalShareExtension/SharingThreadPickerViewController.swift @@ -5,6 +5,7 @@ import UIKit import Foundation +import SignalMessaging import SignalUI class SharingThreadPickerViewController: ConversationPickerViewController { diff --git a/SignalShareExtension/SignalShareExtension-Bridging-Header.h b/SignalShareExtension/SignalShareExtension-Bridging-Header.h index 16b4a913f7..91baa3c72d 100644 --- a/SignalShareExtension/SignalShareExtension-Bridging-Header.h +++ b/SignalShareExtension/SignalShareExtension-Bridging-Header.h @@ -11,7 +11,6 @@ #import #import #import -#import #import #import #import diff --git a/SignalUI/Appearance/ColorOrGradientSwatchView.swift b/SignalUI/Appearance/ColorOrGradientSwatchView.swift index b020676899..7307c73892 100644 --- a/SignalUI/Appearance/ColorOrGradientSwatchView.swift +++ b/SignalUI/Appearance/ColorOrGradientSwatchView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit // Compare with CVColorOrGradientView: // diff --git a/SignalUI/Categories/UIView+SignalUI.swift b/SignalUI/Categories/UIView+SignalUI.swift index 7c58138fb2..73472fd9d1 100644 --- a/SignalUI/Categories/UIView+SignalUI.swift +++ b/SignalUI/Categories/UIView+SignalUI.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit // MARK: - SpacerView diff --git a/SignalUI/Context Menus/DeleteSystemContactViewController.swift b/SignalUI/Context Menus/DeleteSystemContactViewController.swift index 3c9b272f9c..8de331787f 100644 --- a/SignalUI/Context Menus/DeleteSystemContactViewController.swift +++ b/SignalUI/Context Menus/DeleteSystemContactViewController.swift @@ -6,6 +6,7 @@ import Contacts import LibSignalClient import SignalMessaging +import SignalServiceKit /// If we try and hide a recipient but fail because they correspond to /// a system contact, we show this controller which provides a hook diff --git a/SignalUI/Payments/DebugLogger+Payments.swift b/SignalUI/Payments/DebugLogger+Payments.swift index 3d32ed095c..35cc447cf5 100644 --- a/SignalUI/Payments/DebugLogger+Payments.swift +++ b/SignalUI/Payments/DebugLogger+Payments.swift @@ -6,6 +6,7 @@ import Foundation import Logging import SignalMessaging +import SignalServiceKit // NOTE: There are two separate classes with the name Logger // being used in this file. diff --git a/SignalUI/Payments/MobileCoinAPI.swift b/SignalUI/Payments/MobileCoinAPI.swift index ccb3d15a1a..200739eef2 100644 --- a/SignalUI/Payments/MobileCoinAPI.swift +++ b/SignalUI/Payments/MobileCoinAPI.swift @@ -6,6 +6,7 @@ import Foundation import MobileCoin import SignalMessaging +import SignalServiceKit public class MobileCoinAPI: Dependencies { diff --git a/SignalUI/Payments/Payments.swift b/SignalUI/Payments/Payments.swift index 2d8c77d46a..ae4564935a 100644 --- a/SignalUI/Payments/Payments.swift +++ b/SignalUI/Payments/Payments.swift @@ -5,6 +5,7 @@ import MobileCoin import SignalMessaging +import SignalServiceKit @objc public protocol Payments: AnyObject { diff --git a/SignalUI/Payments/PaymentsReconciliation.swift b/SignalUI/Payments/PaymentsReconciliation.swift index 5882f90bd6..702f121544 100644 --- a/SignalUI/Payments/PaymentsReconciliation.swift +++ b/SignalUI/Payments/PaymentsReconciliation.swift @@ -6,6 +6,7 @@ import Foundation import MobileCoin import SignalMessaging +import SignalServiceKit public class PaymentsReconciliation: Dependencies { diff --git a/SignalUI/Utils/AppContext+SignalUI.swift b/SignalUI/Utils/AppContext+SignalUI.swift index e709583edb..3e07c975e0 100644 --- a/SignalUI/Utils/AppContext+SignalUI.swift +++ b/SignalUI/Utils/AppContext+SignalUI.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class AppContextUtils { diff --git a/SignalUI/Utils/Attachment Multisend/TSOutgoingMessage+AttachmentMultisend.swift b/SignalUI/Utils/Attachment Multisend/TSOutgoingMessage+AttachmentMultisend.swift index ea3551c75b..783d576380 100644 --- a/SignalUI/Utils/Attachment Multisend/TSOutgoingMessage+AttachmentMultisend.swift +++ b/SignalUI/Utils/Attachment Multisend/TSOutgoingMessage+AttachmentMultisend.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit extension TSOutgoingMessage { @objc diff --git a/SignalUI/Utils/AudioPlayer.swift b/SignalUI/Utils/AudioPlayer.swift index 0fb588d82d..b8f4300878 100644 --- a/SignalUI/Utils/AudioPlayer.swift +++ b/SignalUI/Utils/AudioPlayer.swift @@ -7,6 +7,7 @@ import AVFoundation import MediaPlayer import SignalCoreKit import SignalMessaging +import SignalServiceKit public enum AudioBehavior { case unknown diff --git a/SignalUI/Utils/AudioSession.swift b/SignalUI/Utils/AudioSession.swift index a0e128668c..2c0d6ee95d 100644 --- a/SignalUI/Utils/AudioSession.swift +++ b/SignalUI/Utils/AudioSession.swift @@ -6,6 +6,7 @@ import AVFoundation import Foundation import SignalMessaging +import SignalServiceKit public class AudioActivity: NSObject { let audioDescription: String diff --git a/SignalUI/Utils/GroupViewUtils.swift b/SignalUI/Utils/GroupViewUtils.swift index ed6daf104f..f9b46576e2 100644 --- a/SignalUI/Utils/GroupViewUtils.swift +++ b/SignalUI/Utils/GroupViewUtils.swift @@ -7,6 +7,7 @@ import Foundation import UIKit import SafariServices import SignalMessaging +import SignalServiceKit public class GroupViewUtils { diff --git a/SignalUI/Utils/Sounds+SignalUI.swift b/SignalUI/Utils/Sounds+SignalUI.swift index ee86c81a00..27a1b1db08 100644 --- a/SignalUI/Utils/Sounds+SignalUI.swift +++ b/SignalUI/Utils/Sounds+SignalUI.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit extension Sounds { diff --git a/SignalUI/Utils/TSInteraction+DeleteActionSheet.swift b/SignalUI/Utils/TSInteraction+DeleteActionSheet.swift index cb07fc0fb6..adc74fd566 100644 --- a/SignalUI/Utils/TSInteraction+DeleteActionSheet.swift +++ b/SignalUI/Utils/TSInteraction+DeleteActionSheet.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import UIKit public extension TSInteraction { diff --git a/SignalUI/ViewControllers/ApprovalFooterView.swift b/SignalUI/ViewControllers/ApprovalFooterView.swift index 280172bb6c..39570f12c9 100644 --- a/SignalUI/ViewControllers/ApprovalFooterView.swift +++ b/SignalUI/ViewControllers/ApprovalFooterView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit // Outgoing message approval can be a multi-step process. public enum ApprovalMode: UInt { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalToolbar.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalToolbar.swift index 43101ced83..4ca71c4fa6 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalToolbar.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalToolbar.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import UIKit class AttachmentApprovalToolbar: UIView { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalTopBar.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalTopBar.swift index 1127444fda..2075e69cc0 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalTopBar.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalTopBar.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit class AttachmentApprovalTopBar: MediaTopBar { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index b593f2a659..6f303d20dc 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -9,6 +9,7 @@ import MediaPlayer import Photos import CoreServices import SignalMessaging +import SignalServiceKit public protocol AttachmentApprovalViewControllerDelegate: AnyObject { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift index 46d01fc3c9..305d77ec36 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit class AddMoreRailItem: Equatable { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 262275a89c..afb3a19f76 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -6,6 +6,7 @@ import AVFoundation import Foundation import SignalMessaging +import SignalServiceKit import UIKit protocol AttachmentPrepViewControllerDelegate: AnyObject { diff --git a/SignalUI/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift b/SignalUI/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift index c9d230f79a..51fd766ad5 100644 --- a/SignalUI/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift +++ b/SignalUI/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift @@ -6,6 +6,7 @@ import Foundation import UIKit import SignalMessaging +import SignalServiceKit // Coincides with Android's max text message length let kMaxMessageBodyCharacterCount = 2000 diff --git a/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift b/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift index 7f8eb5855d..977cf35980 100644 --- a/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift +++ b/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public enum MessageRecipient: Equatable { case contact(_ address: SignalServiceAddress) diff --git a/SignalUI/ViewControllers/ConversationPicker/ConversationPickerFailedRecipientsSheet.swift b/SignalUI/ViewControllers/ConversationPicker/ConversationPickerFailedRecipientsSheet.swift index 9a3af37acd..e8691686f6 100644 --- a/SignalUI/ViewControllers/ConversationPicker/ConversationPickerFailedRecipientsSheet.swift +++ b/SignalUI/ViewControllers/ConversationPicker/ConversationPickerFailedRecipientsSheet.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class ConversationPickerFailedRecipientsSheet: OWSTableSheetViewController { diff --git a/SignalUI/ViewControllers/MediaMessageView.swift b/SignalUI/ViewControllers/MediaMessageView.swift index 7308c51cf4..e7cb5c7203 100644 --- a/SignalUI/ViewControllers/MediaMessageView.swift +++ b/SignalUI/ViewControllers/MediaMessageView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit import YYImage diff --git a/SignalUI/ViewControllers/OWSTableView/OWSTableItem.swift b/SignalUI/ViewControllers/OWSTableView/OWSTableItem.swift index db4f6d4abb..929c08b8de 100644 --- a/SignalUI/ViewControllers/OWSTableView/OWSTableItem.swift +++ b/SignalUI/ViewControllers/OWSTableView/OWSTableItem.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import UIKit public class OWSTableItem { diff --git a/SignalUI/ViewControllers/SpamCaptchaViewController.swift b/SignalUI/ViewControllers/SpamCaptchaViewController.swift index 88bed44ee1..9b07ab8c64 100644 --- a/SignalUI/ViewControllers/SpamCaptchaViewController.swift +++ b/SignalUI/ViewControllers/SpamCaptchaViewController.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit public class SpamCaptchaViewController: UIViewController, CaptchaViewDelegate { diff --git a/SignalUI/ViewControllers/Stickers/EditorSticker.swift b/SignalUI/ViewControllers/Stickers/EditorSticker.swift index 18a5e21102..f876444404 100644 --- a/SignalUI/ViewControllers/Stickers/EditorSticker.swift +++ b/SignalUI/ViewControllers/Stickers/EditorSticker.swift @@ -5,6 +5,7 @@ import UIKit import SignalMessaging +import SignalServiceKit private class LayerContainerView: UIView { let contentLayer: CALayer diff --git a/SignalUI/ViewControllers/Stickers/StickerPackCollectionView.swift b/SignalUI/ViewControllers/Stickers/StickerPackCollectionView.swift index 40522e8c69..6c2fd62f65 100644 --- a/SignalUI/ViewControllers/Stickers/StickerPackCollectionView.swift +++ b/SignalUI/ViewControllers/Stickers/StickerPackCollectionView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit // MARK: - Delegate Protocols diff --git a/SignalUI/ViewControllers/Stickers/StickerPickerSheet.swift b/SignalUI/ViewControllers/Stickers/StickerPickerSheet.swift index 594ee67ded..c4a2cb1137 100644 --- a/SignalUI/ViewControllers/Stickers/StickerPickerSheet.swift +++ b/SignalUI/ViewControllers/Stickers/StickerPickerSheet.swift @@ -5,6 +5,7 @@ import UIKit import SignalMessaging +import SignalServiceKit // MARK: - StickerPickerSheetDelegate diff --git a/SignalUI/ViewControllers/Stories/AllSignalConnectionsViewController.swift b/SignalUI/ViewControllers/Stories/AllSignalConnectionsViewController.swift index 9064621f78..b6fb28c722 100644 --- a/SignalUI/ViewControllers/Stories/AllSignalConnectionsViewController.swift +++ b/SignalUI/ViewControllers/Stories/AllSignalConnectionsViewController.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class AllSignalConnectionsViewController: OWSTableViewController2 { let collation = UILocalizedIndexedCollation.current() diff --git a/SignalUI/ViewControllers/Stories/MyStorySettingsViewController.swift b/SignalUI/ViewControllers/Stories/MyStorySettingsViewController.swift index a7bdb82cb4..53413807ac 100644 --- a/SignalUI/ViewControllers/Stories/MyStorySettingsViewController.swift +++ b/SignalUI/ViewControllers/Stories/MyStorySettingsViewController.swift @@ -6,6 +6,7 @@ import Foundation import UIKit import SignalMessaging +import SignalServiceKit import BonMot public class MyStorySettingsViewController: OWSTableViewController2, MyStorySettingsDataSourceDelegate { diff --git a/SignalUI/ViewControllers/Stories/NewStorySheet.swift b/SignalUI/ViewControllers/Stories/NewStorySheet.swift index e91a1f92e3..f14710b8f1 100644 --- a/SignalUI/ViewControllers/Stories/NewStorySheet.swift +++ b/SignalUI/ViewControllers/Stories/NewStorySheet.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit import UIKit public class NewStorySheet: OWSTableSheetViewController { diff --git a/SignalUI/ViewModels/TSGroupThread+ViewModel.swift b/SignalUI/ViewModels/TSGroupThread+ViewModel.swift index 3108769b74..e2e4f474d5 100644 --- a/SignalUI/ViewModels/TSGroupThread+ViewModel.swift +++ b/SignalUI/ViewModels/TSGroupThread+ViewModel.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public extension TSGroupThread { /// Returns a list of up to `limit` names of group members. diff --git a/SignalUI/ViewModels/ThreadUtil+SignalUI.swift b/SignalUI/ViewModels/ThreadUtil+SignalUI.swift index b5bedb66c7..200aa18302 100644 --- a/SignalUI/ViewModels/ThreadUtil+SignalUI.swift +++ b/SignalUI/ViewModels/ThreadUtil+SignalUI.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public extension ThreadUtil { // MARK: - Durable Message Enqueue diff --git a/SignalUI/Views/BodyRanges/BodyRangesTextView.swift b/SignalUI/Views/BodyRanges/BodyRangesTextView.swift index ec9cce7dfc..53d8ad024c 100644 --- a/SignalUI/Views/BodyRanges/BodyRangesTextView.swift +++ b/SignalUI/Views/BodyRanges/BodyRangesTextView.swift @@ -5,6 +5,7 @@ import LibSignalClient import SignalMessaging +import SignalServiceKit public protocol BodyRangesTextViewDelegate: UITextViewDelegate { func textViewDidBeginTypingMention(_ textView: BodyRangesTextView) diff --git a/SignalUI/Views/BodyRanges/MentionPicker.swift b/SignalUI/Views/BodyRanges/MentionPicker.swift index d94d038888..83dc460b46 100644 --- a/SignalUI/Views/BodyRanges/MentionPicker.swift +++ b/SignalUI/Views/BodyRanges/MentionPicker.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public enum MentionPickerStyle { case `default` diff --git a/SignalUI/Views/ContactCellView.swift b/SignalUI/Views/ContactCellView.swift index 8ef7e71cec..062e8b24a8 100644 --- a/SignalUI/Views/ContactCellView.swift +++ b/SignalUI/Views/ContactCellView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class ContactCellAccessoryView: NSObject { let accessoryView: UIView diff --git a/SignalUI/Views/ContactTableViewCell.swift b/SignalUI/Views/ContactTableViewCell.swift index 0a68071b61..073a48d301 100644 --- a/SignalUI/Views/ContactTableViewCell.swift +++ b/SignalUI/Views/ContactTableViewCell.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit open class ContactTableViewCell: UITableViewCell, ReusableTableViewCell { diff --git a/SignalUI/Views/ConversationAvatarView.swift b/SignalUI/Views/ConversationAvatarView.swift index 5a101147b7..7a3f80aa8c 100644 --- a/SignalUI/Views/ConversationAvatarView.swift +++ b/SignalUI/Views/ConversationAvatarView.swift @@ -7,6 +7,7 @@ import GRDB import LibSignalClient import UIKit import SignalMessaging +import SignalServiceKit // swiftlint:disable:next class_delegate_protocol public protocol ConversationAvatarViewDelegate: UIViewController { diff --git a/SignalUI/Views/DisappearingTimerConfigurationView.swift b/SignalUI/Views/DisappearingTimerConfigurationView.swift index 8effb45851..0dd0fc9a00 100644 --- a/SignalUI/Views/DisappearingTimerConfigurationView.swift +++ b/SignalUI/Views/DisappearingTimerConfigurationView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public protocol DisappearingTimerConfigurationViewDelegate: AnyObject { func disappearingTimerConfigurationViewWasTapped(_ disappearingTimerView: DisappearingTimerConfigurationView) diff --git a/SignalUI/Views/ImageEditor/ImageEditorViewController.swift b/SignalUI/Views/ImageEditor/ImageEditorViewController.swift index fe37804dbc..2563fbe013 100644 --- a/SignalUI/Views/ImageEditor/ImageEditorViewController.swift +++ b/SignalUI/Views/ImageEditor/ImageEditorViewController.swift @@ -5,6 +5,7 @@ import SignalCoreKit import SignalMessaging +import SignalServiceKit import UIKit // Base class for all tool view controllers. diff --git a/SignalUI/Views/ImageEditor/RotationControl.swift b/SignalUI/Views/ImageEditor/RotationControl.swift index 0934249705..c83b603853 100644 --- a/SignalUI/Views/ImageEditor/RotationControl.swift +++ b/SignalUI/Views/ImageEditor/RotationControl.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import UIKit class RotationControl: UIControl { diff --git a/SignalUI/Views/Link Preview/LinkPreviewView.swift b/SignalUI/Views/Link Preview/LinkPreviewView.swift index 34dddd2313..47dfa83369 100644 --- a/SignalUI/Views/Link Preview/LinkPreviewView.swift +++ b/SignalUI/Views/Link Preview/LinkPreviewView.swift @@ -5,6 +5,7 @@ import YYImage import SignalMessaging +import SignalServiceKit public protocol LinkPreviewViewDraftDelegate: AnyObject { func linkPreviewDidCancel() diff --git a/SignalUI/Views/ManualLayoutView.swift b/SignalUI/Views/ManualLayoutView.swift index 62e059746e..3b29a1eda4 100644 --- a/SignalUI/Views/ManualLayoutView.swift +++ b/SignalUI/Views/ManualLayoutView.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit // ManualLayoutView uses a CATransformLayer by default. // CATransformLayer does not render. diff --git a/SignalUI/Views/ManualStackView.swift b/SignalUI/Views/ManualStackView.swift index ded200e107..13debeb19d 100644 --- a/SignalUI/Views/ManualStackView.swift +++ b/SignalUI/Views/ManualStackView.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit // ManualStackView (like ManualLayoutView) uses a CATransformLayer // by default. CATransformLayer does not render. diff --git a/SignalUI/Views/NonContactTableViewCell.swift b/SignalUI/Views/NonContactTableViewCell.swift index 7cfc0bf595..99741f9d17 100644 --- a/SignalUI/Views/NonContactTableViewCell.swift +++ b/SignalUI/Views/NonContactTableViewCell.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public final class NonContactTableViewCell: UITableViewCell, ReusableTableViewCell { diff --git a/SignalUI/Views/OWSActionSheets.swift b/SignalUI/Views/OWSActionSheets.swift index a0f063eced..0ed6a71264 100644 --- a/SignalUI/Views/OWSActionSheets.swift +++ b/SignalUI/Views/OWSActionSheets.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit public enum OWSActionSheets { public static func showActionSheet( diff --git a/SignalUI/Views/OWSButton.swift b/SignalUI/Views/OWSButton.swift index 647170b539..a77f556a67 100644 --- a/SignalUI/Views/OWSButton.swift +++ b/SignalUI/Views/OWSButton.swift @@ -5,6 +5,7 @@ import UIKit import SignalMessaging +import SignalServiceKit open class OWSButton: UIButton { diff --git a/SignalUI/Views/PaymentActionSheets.swift b/SignalUI/Views/PaymentActionSheets.swift index 04fc46567c..b7cb7b9feb 100644 --- a/SignalUI/Views/PaymentActionSheets.swift +++ b/SignalUI/Views/PaymentActionSheets.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class PaymentActionSheets { public static func showBiometryAuthFailedActionSheet(_ handler: ActionSheetAction.Handler? = nil) { diff --git a/SignalUI/Views/PaymentOnboarding.swift b/SignalUI/Views/PaymentOnboarding.swift index 684107a855..f3b34d1bbe 100644 --- a/SignalUI/Views/PaymentOnboarding.swift +++ b/SignalUI/Views/PaymentOnboarding.swift @@ -5,6 +5,7 @@ import Foundation import SignalMessaging +import SignalServiceKit public class PaymentOnboarding { private class func ftPaymentsLockActionSheetMessage() -> String { diff --git a/SignalUI/Views/VideoEditor/VideoEditorView.swift b/SignalUI/Views/VideoEditor/VideoEditorView.swift index 3d75567c84..6720f73e18 100644 --- a/SignalUI/Views/VideoEditor/VideoEditorView.swift +++ b/SignalUI/Views/VideoEditor/VideoEditorView.swift @@ -6,6 +6,7 @@ import AVFoundation import Photos import SignalMessaging +import SignalServiceKit import UIKit protocol VideoEditorViewDelegate: AnyObject { diff --git a/SignalUITests/MobileCoinHelperTests.swift b/SignalUITests/MobileCoinHelperTests.swift index f7f03233df..ab2f6e7b07 100644 --- a/SignalUITests/MobileCoinHelperTests.swift +++ b/SignalUITests/MobileCoinHelperTests.swift @@ -4,6 +4,7 @@ // import SignalMessaging +import SignalServiceKit import XCTest @testable import SignalUI