Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes unused code and makes some other code platform specific #419

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions Sources/NetworkProtection/IPC/IPCThroughCFMessagePort.swift

This file was deleted.

52 changes: 0 additions & 52 deletions Sources/NetworkProtection/IPC/IPCThroughCFMessagePortClient.swift

This file was deleted.

86 changes: 0 additions & 86 deletions Sources/NetworkProtection/IPC/IPCThroughCFMessagePortServer.swift

This file was deleted.

75 changes: 0 additions & 75 deletions Sources/NetworkProtection/IPC/StatusServiceClient.swift

This file was deleted.

60 changes: 0 additions & 60 deletions Sources/NetworkProtection/IPC/StatusServiceServer.swift

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
// limitations under the License.
//

#if os(macOS)

import Foundation

/// JSONEncoder encrypts its output encoded as UTF8. This is just a convenience constant to make sure we're using
Expand Down Expand Up @@ -76,3 +78,5 @@ public struct DistributedNotificationObjectDecoder<T: Decodable> {
return object
}
}

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@ import Common

#if os(macOS)

fileprivate extension Bundle {
private static let networkProtectionDistributedNotificationPrefixKey = "DISTRIBUTED_NOTIFICATIONS_PREFIX"

var networkProtectionDistributedNotificationPrefix: String {
guard let bundleID = object(forInfoDictionaryKey: Self.networkProtectionDistributedNotificationPrefixKey) as? String else {
fatalError("Info.plist is missing \(Self.networkProtectionDistributedNotificationPrefixKey)")
}

return bundleID
}
}

samsymons marked this conversation as resolved.
Show resolved Hide resolved
extension DistributedNotificationCenter {
// MARK: - Logging

Expand All @@ -42,20 +54,6 @@ extension DistributedNotificationCenter: NetworkProtectionNotificationPosting {
}
}

#endif

fileprivate extension Bundle {
private static let networkProtectionDistributedNotificationPrefixKey = "DISTRIBUTED_NOTIFICATIONS_PREFIX"

var networkProtectionDistributedNotificationPrefix: String {
guard let bundleID = object(forInfoDictionaryKey: Self.networkProtectionDistributedNotificationPrefixKey) as? String else {
fatalError("Info.plist is missing \(Self.networkProtectionDistributedNotificationPrefixKey)")
}

return bundleID
}
}

public protocol NetworkProtectionNotificationPosting: AnyObject {
func post(_ networkProtectionNotification: NetworkProtectionNotification, object: String?, log: OSLog)
}
Expand Down Expand Up @@ -114,3 +112,5 @@ public enum NetworkProtectionNotification: String {
"\(Bundle.main.networkProtectionDistributedNotificationPrefix).\(notificationName)"
}
}

#endif
samsymons marked this conversation as resolved.
Show resolved Hide resolved
Loading