diff --git a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift index e3dd4c81e..30b3440d7 100644 --- a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift +++ b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift @@ -5,10 +5,10 @@ import Foundation @objc(OWSLegacyContactDiscoveryOperation) -class LegacyContactDiscoveryBatchOperation: OWSOperation { +public class LegacyContactDiscoveryBatchOperation: OWSOperation { @objc - var registeredRecipientIds: Set + public var registeredRecipientIds: Set private let recipientIdsToLookup: [String] private var networkManager: TSNetworkManager { @@ -18,7 +18,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { // MARK: Initializers @objc - required init(recipientIdsToLookup: [String]) { + public required init(recipientIdsToLookup: [String]) { self.recipientIdsToLookup = recipientIdsToLookup self.registeredRecipientIds = Set() @@ -30,7 +30,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { // MARK: OWSOperation Overrides // Called every retry, this is where the bulk of the operation's work should go. - override func run() { + override public func run() { Logger.debug("") guard !isCancelled else { @@ -82,7 +82,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { } // Called at most one time. - override func didSucceed() { + override public func didSucceed() { // Compare against new CDS service let modernCDSOperation = CDSOperation(recipientIdsToLookup: self.recipientIdsToLookup) let cdsFeedbackOperation = CDSFeedbackOperation(legacyRegisteredRecipientIds: self.registeredRecipientIds) diff --git a/SignalServiceKit/src/Network/SSKWebSocket.swift b/SignalServiceKit/src/Network/SSKWebSocket.swift index 339fc75c2..c2a887a4a 100644 --- a/SignalServiceKit/src/Network/SSKWebSocket.swift +++ b/SignalServiceKit/src/Network/SSKWebSocket.swift @@ -32,7 +32,7 @@ public class SSKWebSocketError: NSObject, CustomNSError { // MARK: - @objc - static let kStatusCodeKey = "SSKWebSocketErrorStatusCode" + public static let kStatusCodeKey = "SSKWebSocketErrorStatusCode" let underlyingError: Starscream.WSError } diff --git a/SignalServiceKit/src/TestUtils/FakeContactsManager.swift b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift index 8cd52a61f..94c3eb437 100644 --- a/SignalServiceKit/src/TestUtils/FakeContactsManager.swift +++ b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift @@ -3,42 +3,42 @@ // @objc(OWSFakeContactsManager) -class FakeContactsManager: NSObject, ContactsManagerProtocol { - func displayName(forPhoneIdentifier recipientId: String?) -> String { +public class FakeContactsManager: NSObject, ContactsManagerProtocol { + public func displayName(forPhoneIdentifier recipientId: String?) -> String { return "Fake name" } - func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String { + public func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String { return self.displayName(forPhoneIdentifier: recipientId) } - func signalAccounts() -> [SignalAccount] { + public func signalAccounts() -> [SignalAccount] { return [] } - func isSystemContact(_ recipientId: String) -> Bool { + public func isSystemContact(_ recipientId: String) -> Bool { return true } - func isSystemContact(withSignalAccount recipientId: String) -> Bool { + public func isSystemContact(withSignalAccount recipientId: String) -> Bool { return true } - func compare(signalAccount left: SignalAccount, with right: SignalAccount) -> ComparisonResult { + public func compare(signalAccount left: SignalAccount, with right: SignalAccount) -> ComparisonResult { // If this method ends up being used by the tests, we should provide a better implementation. assertionFailure("TODO") return ComparisonResult.orderedAscending } - func cnContact(withId contactId: String?) -> CNContact? { + public func cnContact(withId contactId: String?) -> CNContact? { return nil } - func avatarData(forCNContactId contactId: String?) -> Data? { + public func avatarData(forCNContactId contactId: String?) -> Data? { return nil } - func avatarImage(forCNContactId contactId: String?) -> UIImage? { + public func avatarImage(forCNContactId contactId: String?) -> UIImage? { return nil } }