Add public keyword to fix compilation for framework integration

pull/2/head
Carola Nitz 7 years ago committed by Michael Kirk
parent c48679abfd
commit 117411009b

@ -5,10 +5,10 @@
import Foundation import Foundation
@objc(OWSLegacyContactDiscoveryOperation) @objc(OWSLegacyContactDiscoveryOperation)
class LegacyContactDiscoveryBatchOperation: OWSOperation { public class LegacyContactDiscoveryBatchOperation: OWSOperation {
@objc @objc
var registeredRecipientIds: Set<String> public var registeredRecipientIds: Set<String>
private let recipientIdsToLookup: [String] private let recipientIdsToLookup: [String]
private var networkManager: TSNetworkManager { private var networkManager: TSNetworkManager {
@ -18,7 +18,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation {
// MARK: Initializers // MARK: Initializers
@objc @objc
required init(recipientIdsToLookup: [String]) { public required init(recipientIdsToLookup: [String]) {
self.recipientIdsToLookup = recipientIdsToLookup self.recipientIdsToLookup = recipientIdsToLookup
self.registeredRecipientIds = Set() self.registeredRecipientIds = Set()
@ -30,7 +30,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation {
// MARK: OWSOperation Overrides // MARK: OWSOperation Overrides
// Called every retry, this is where the bulk of the operation's work should go. // Called every retry, this is where the bulk of the operation's work should go.
override func run() { override public func run() {
Logger.debug("") Logger.debug("")
guard !isCancelled else { guard !isCancelled else {
@ -82,7 +82,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation {
} }
// Called at most one time. // Called at most one time.
override func didSucceed() { override public func didSucceed() {
// Compare against new CDS service // Compare against new CDS service
let modernCDSOperation = CDSOperation(recipientIdsToLookup: self.recipientIdsToLookup) let modernCDSOperation = CDSOperation(recipientIdsToLookup: self.recipientIdsToLookup)
let cdsFeedbackOperation = CDSFeedbackOperation(legacyRegisteredRecipientIds: self.registeredRecipientIds) let cdsFeedbackOperation = CDSFeedbackOperation(legacyRegisteredRecipientIds: self.registeredRecipientIds)

@ -32,7 +32,7 @@ public class SSKWebSocketError: NSObject, CustomNSError {
// MARK: - // MARK: -
@objc @objc
static let kStatusCodeKey = "SSKWebSocketErrorStatusCode" public static let kStatusCodeKey = "SSKWebSocketErrorStatusCode"
let underlyingError: Starscream.WSError let underlyingError: Starscream.WSError
} }

@ -3,42 +3,42 @@
// //
@objc(OWSFakeContactsManager) @objc(OWSFakeContactsManager)
class FakeContactsManager: NSObject, ContactsManagerProtocol { public class FakeContactsManager: NSObject, ContactsManagerProtocol {
func displayName(forPhoneIdentifier recipientId: String?) -> String { public func displayName(forPhoneIdentifier recipientId: String?) -> String {
return "Fake name" 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) return self.displayName(forPhoneIdentifier: recipientId)
} }
func signalAccounts() -> [SignalAccount] { public func signalAccounts() -> [SignalAccount] {
return [] return []
} }
func isSystemContact(_ recipientId: String) -> Bool { public func isSystemContact(_ recipientId: String) -> Bool {
return true return true
} }
func isSystemContact(withSignalAccount recipientId: String) -> Bool { public func isSystemContact(withSignalAccount recipientId: String) -> Bool {
return true 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. // If this method ends up being used by the tests, we should provide a better implementation.
assertionFailure("TODO") assertionFailure("TODO")
return ComparisonResult.orderedAscending return ComparisonResult.orderedAscending
} }
func cnContact(withId contactId: String?) -> CNContact? { public func cnContact(withId contactId: String?) -> CNContact? {
return nil return nil
} }
func avatarData(forCNContactId contactId: String?) -> Data? { public func avatarData(forCNContactId contactId: String?) -> Data? {
return nil return nil
} }
func avatarImage(forCNContactId contactId: String?) -> UIImage? { public func avatarImage(forCNContactId contactId: String?) -> UIImage? {
return nil return nil
} }
} }

Loading…
Cancel
Save