migrate OWSContactsManager to swift

as the last remaining objective-c file, this removed direct dependency
from the SignalMessaging framework headers on SignalServiceKit and
thus required adding lots of import statements
This commit is contained in:
Ehren Kret 2024-03-09 10:30:51 -06:00
parent c5daaa3966
commit 9c7078b3f8
279 changed files with 441 additions and 337 deletions

View File

@ -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 = "<group>"; };
345DE95F23ED9AA500A8E6E3 /* GroupsV2ProfileKeyUpdater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupsV2ProfileKeyUpdater.swift; sourceTree = "<group>"; };
3461284A1FD0B93F00532771 /* SAELoadViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAELoadViewController.swift; sourceTree = "<group>"; };
346129A21FD1F09100532771 /* OWSContactsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactsManager.h; sourceTree = "<group>"; };
346129A31FD1F09100532771 /* OWSContactsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsManager.m; sourceTree = "<group>"; };
346129AE1FD1F5D900532771 /* SystemContactsFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemContactsFetcher.swift; sourceTree = "<group>"; };
346129B11FD1F7E800532771 /* OWSProfileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSProfileManager.h; sourceTree = "<group>"; };
346129B21FD1F7E800532771 /* OWSProfileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSProfileManager.m; sourceTree = "<group>"; };
@ -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 */,

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class RegistrationNavigationController: OWSNavigationController {

View File

@ -5,6 +5,7 @@
import AVFoundation
import SignalMessaging
import SignalServiceKit
import SignalUI
/// Represents a voice note that's actively being recorded.

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
/// Represents a voice note that was "interrupted" while being recorded.

View File

@ -5,6 +5,7 @@
import Intents
import SignalMessaging
import SignalServiceKit
import SignalUI
import WebRTC

View File

@ -6,6 +6,7 @@
import AVFoundation
import LibSignalClient
import SignalMessaging
import SignalServiceKit
import SignalRingRTC
import SignalUI
import WebRTC

View File

@ -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.

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
class CallControlsConfirmationToastView: UIView {
enum ControlType {

View File

@ -6,6 +6,7 @@
import Foundation
import LibSignalClient
import SignalMessaging
import SignalServiceKit
import SignalRingRTC
import SignalUI
import UIKit

View File

@ -6,6 +6,7 @@
import AVFoundation
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalRingRTC
class CallMemberVideoView: UIView, CallMemberComposableView {

View File

@ -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 {

View File

@ -6,6 +6,7 @@
import LibSignalClient
import SignalRingRTC
import SignalMessaging
import SignalServiceKit
import SignalUI
class GroupCallMemberSheet: InteractiveSheetViewController {

View File

@ -6,6 +6,7 @@
import Foundation
import LibSignalClient
import SignalMessaging
import SignalServiceKit
import SignalRingRTC
import SignalUI

View File

@ -5,6 +5,7 @@
import Lottie
import SignalMessaging
import SignalServiceKit
import SignalUI
class MegaphoneView: UIView, ExperienceUpgradeView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class SplashViewController: OWSViewController, ExperienceUpgradeView {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
class CreateUsernameMegaphone: MegaphoneView {
private let usernameSelectionCoordinator: UsernameSelectionCoordinator

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class NotificationPermissionReminderMegaphone: MegaphoneView {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
class PinReminderMegaphone: MegaphoneView {
init(experienceUpgrade: ExperienceUpgrade, fromViewController: UIViewController) {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class RemoteMegaphone: MegaphoneView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class UsernameLinkScanQRCodeSheet: UsernameLinkScanQRCodeViewController {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class UsernameLinkShareSheetViewController: OWSTableSheetViewController {

View File

@ -5,6 +5,7 @@
import BonMot
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol UsernameSelectionDelegate: AnyObject {

View File

@ -6,6 +6,7 @@
import Foundation
import SignalUI
import SignalMessaging
import SignalServiceKit
import SafariServices
class UsernameEducationViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class DeleteAccountConfirmationViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class AppSettingsViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import SignalUI
import SignalMessaging
import SignalServiceKit
// MARK: - AppIcon

View File

@ -5,6 +5,7 @@
import IntentsUI
import SignalMessaging
import SignalServiceKit
import SignalUI
class ChatsSettingsViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import SafariServices
import SignalMessaging
import SignalServiceKit
import SignalUI
class SupportConstants: NSObject {

View File

@ -5,6 +5,7 @@
import SignalCoreKit
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol CurrencyPickerDataSource {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class BadgeGiftingChooseBadgeViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import PassKit
import SignalMessaging
import SignalServiceKit
import SignalUI
extension BadgeGiftingConfirmationViewController {

View File

@ -6,6 +6,7 @@
import Foundation
import AuthenticationServices
import SignalMessaging
import SignalServiceKit
extension BadgeGiftingConfirmationViewController {
typealias SendGiftError = DonationViewsUtil.Gifts.SendGiftError

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class DonationReceiptViewController: OWSTableViewController2 {

View File

@ -7,6 +7,7 @@ import Foundation
import SafariServices
import SignalCoreKit
import SignalMessaging
import SignalServiceKit
import SignalUI
import UIKit

View File

@ -5,6 +5,7 @@
import SafariServices
import SignalMessaging
import SignalServiceKit
import SignalUI
final class HelpViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class NotificationSettingsContentViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class NotificationSettingsSoundViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class NotificationSettingsViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public protocol PaymentsBiometryLockPromptDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class PaymentsDetailViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class PaymentsHistoryViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class PaymentsRestoreWalletCompleteViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class PaymentsRestoreWalletPasteboardViewController: OWSViewController {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class PaymentsRestoreWalletWordViewController: OWSViewController {

View File

@ -5,6 +5,7 @@
import Lottie
import SignalMessaging
import SignalServiceKit
import SignalUI
public enum PaymentsSettingsMode: UInt, CustomStringConvertible {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class PaymentsTransferInViewController: OWSTableViewController2 {

View File

@ -6,6 +6,7 @@
import Lottie
import MobileCoin
import SignalMessaging
import SignalServiceKit
import SignalUI
public class PaymentsTransferOutViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import SignalUI
import SignalMessaging
import SignalServiceKit
public class PaymentsViewPassphraseConfirmViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import SignalUI
import SignalMessaging
import SignalServiceKit
public class PaymentsViewPassphraseGridViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public protocol PaymentsViewPassphraseDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class PaymentsViewUtils: Dependencies {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class AdvancedPrivacySettingsViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class PrivacySettingsViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class ProxySettingsViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
enum BadgeConfiguration {

View File

@ -5,6 +5,7 @@
import Photos
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol AttachmentKeyboardDelegate: AnyObject {

View File

@ -6,6 +6,7 @@
import Photos
import PhotosUI
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol RecentPhotosDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class AvatarEditViewController: OWSTableViewController2 {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
enum AvatarContext {
case groupId(Data)

View File

@ -5,6 +5,7 @@
import CoreServices
import SignalMessaging
import SignalServiceKit
import SignalUI
class AvatarSettingsViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class ContextMenuActionsAccessory: ContextMenuTargetedPreviewAccessory, ContextMenuActionsViewDelegate {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import UIKit
/// UIContextMenuInteractionDelegate analog

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class BlockingAnnouncementOnlyView: UIStackView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class BlockingLegacyGroupView: UIStackView {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol CVAudioPlayerListener {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
// Caching builder used for a single CVC load.

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
// Compare with ColorOrGradientSwatchView:

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVComponentAudioAttachment: CVComponentBase, CVComponent {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVComponentBodyMedia: CVComponentBase, CVComponent {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVComponentDateHeader: CVComponentBase, CVRootComponent {

View File

@ -6,6 +6,7 @@
import PassKit
import QuickLook
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVComponentGenericAttachment: CVComponentBase, CVComponent {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVComponentGiftBadge: CVComponentBase, CVComponent {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
import UIKit

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
enum ViewOnceState: Equatable {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVContactShareView: ManualStackView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class CVMediaAlbumView: ManualStackViewWithLayer {

View File

@ -8,6 +8,7 @@ import Foundation
import Lottie
import QuartzCore
import SignalMessaging
import SignalServiceKit
import SignalUI
class GiftBadgeView: ManualStackView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public protocol QuotedMessageViewDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public protocol ConversationInputTextViewDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol QuotedReplyPreviewDelegate: AnyObject {

View File

@ -5,6 +5,7 @@
import Photos
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol ConversationInputToolbarDelegate: AnyObject {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public extension ConversationViewController {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
enum CVCBottomViewType: Equatable {
// For perf reasons, we don't use a bottom view until

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public extension ConversationViewController {

View File

@ -6,6 +6,7 @@
import CoreServices
import Photos
import SignalMessaging
import SignalServiceKit
import SignalUI
extension ConversationViewController: ConversationInputToolbarDelegate {

View File

@ -6,6 +6,7 @@
import AVFoundation
import Foundation
import SignalMessaging
import SignalServiceKit
import SignalUI
extension ConversationViewController: AttachmentApprovalViewControllerDelegate {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
extension ConversationViewController {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public struct CVSelectionType: OptionSet {

View File

@ -5,6 +5,7 @@
import Foundation
import SignalMessaging
import SignalServiceKit
extension ConversationViewController {
func checkPermissionsAndStartRecordingVoiceMessage() {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public enum ScrollContinuity: CustomStringConvertible {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class EmojiSkinTonePicker: UIView {

View File

@ -5,6 +5,7 @@
import SignalCoreKit
import SignalMessaging
import SignalServiceKit
import SignalUI
class MemberRequestView: UIStackView {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class EmojiReactorsTableView: UITableView {

View File

@ -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

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
#if USE_DEBUG_UI

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
#if USE_DEBUG_UI

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
public class LogPickerViewController: OWSTableViewController2 {

View File

@ -4,6 +4,7 @@
//
import SignalMessaging
import SignalServiceKit
import SignalUI
class BadgeGiftingThanksSheet: OWSTableViewController2 {

View File

@ -6,6 +6,7 @@
import Foundation
import UIKit
import SignalMessaging
import SignalServiceKit
import SignalUI
protocol BadgeIssueSheetDelegate: AnyObject {

View File

@ -5,6 +5,7 @@
import SignalUI
import SignalMessaging
import SignalServiceKit
@MainActor
class BankTransferMandateViewController: OWSTableViewController2 {

Some files were not shown because too many files have changed in this diff Show More