Removes unused code and makes some other code platform specific #419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jul 17, 2023
diegoreymendez
changed the title
diegoreymendez
commented
Jul 17, 2023
Sources/NetworkProtection/Notifications/NetworkProtectionNotification.swift
Show resolved
Hide resolved
diegoreymendez
commented
Jul 17, 2023
Sources/NetworkProtection/Notifications/NetworkProtectionNotification.swift
Show resolved
Hide resolved
diegoreymendez
commented
Jul 17, 2023
Comment on lines
+92
to
+98
| public var connectionStatus: ConnectionStatus = .disconnected { | ||
| didSet { | ||
| if oldValue != connectionStatus { | ||
| lastStatusChangeDate = Date() | ||
| broadcastConnectionStatus() | ||
| guard connectionStatus != oldValue else { | ||
| return | ||
| } | ||
|
|
||
| connectionStatusPublisher.send(connectionStatus) |
There was a problem hiding this comment.
Slightly different structure, we now just publish to any interested subscriber that the value was changed instead of broadcasting distributed notifications (which aren't relevant for iOS).
diegoreymendez
commented
Jul 17, 2023
| private func broadcastConnectionStatus() { | ||
| let lastStatusChange = ConnectionStatusChange(status: connectionStatus, on: lastStatusChangeDate) | ||
| let payload = ConnectionStatusChangeEncoder().encode(lastStatusChange) | ||
| public let connectionStatusPublisher = CurrentValueSubject<ConnectionStatus, Never>(.disconnected) |
There was a problem hiding this comment.
CurrentValueSubject publishes the last known value to any new subscriber, and any updates after the subscription is started.
diegoreymendez
commented
Jul 17, 2023
Comment on lines
-123
to
-132
| private func broadcastLastSelectedServerInfo() { | ||
| guard let serverInfo = lastSelectedServerInfo else { | ||
| return | ||
| } | ||
|
|
||
| let serverStatusInfo = NetworkProtectionStatusServerInfo(serverLocation: serverInfo.serverLocation, serverAddress: serverInfo.endpoint?.description) | ||
| let payload = ServerSelectedNotificationObjectEncoder().encode(serverStatusInfo) | ||
|
|
||
| notificationCenter.post(.serverSelected, object: payload) | ||
| } |
There was a problem hiding this comment.
Now more broadcasting distributed notifications from this class.
diegoreymendez
commented
Jul 17, 2023
Comment on lines
-317
to
+297
| public init(notificationCenter: NetworkProtectionNotificationCenter, | ||
| notificationsPresenter: NetworkProtectionNotificationsPresenter, | ||
| public init(notificationsPresenter: NetworkProtectionNotificationsPresenter, | ||
| tunnelHealthStore: NetworkProtectionTunnelHealthStore, | ||
| controllerErrorStore: NetworkProtectionTunnelErrorStore, |
There was a problem hiding this comment.
These changes should be fine because they make this class more testable in theory.
diegoreymendez
commented
Jul 17, 2023
| } | ||
|
|
||
| #endif | ||
|
|
There was a problem hiding this comment.
This code could be much nicer IMO if we had MacNetworkProtectionTunnelErrorStore sending out the distributed notifications and composing internally NetworkprotectionTunnelErrorStore.
But before doing that I think we may want to discuss a bit where we want the MacOS code to live.
diegoreymendez
commented
Jul 17, 2023
Comment on lines
-49
to
-51
| private func postLastErrorMessageChangedNotification(_ errorMessage: String?) { | ||
| notificationCenter.post(.tunnelErrorChanged, object: errorMessage) | ||
| } |
There was a problem hiding this comment.
This was moved up to be placed inside the platform specific section.
diegoreymendez
changed the title
graeme
approved these changes
Jul 18, 2023
diegoreymendez
deleted the
diego/remove-distributed-notification-code-from-netp-bsk
branch
diegoreymendez
added a commit
to duckduckgo/macos-browser
that referenced
this pull request
Jul 19, 2023
Task/Issue URL: https://app.asana.com/0/1203512625915051/1205074419464907/f BSK PR: duckduckgo/BrowserServicesKit#419 iOS PR: duckduckgo/iOS#1837 ## Description: Network Protection module cleanup: - We're not using the `CFMessagePort` IPC mechanism so we can delete the code for that. - We're not using the distributed notifications code in iOS, so we can make that code platform-specific.
diegoreymendez
added a commit
to duckduckgo/iOS
that referenced
this pull request
Jul 19, 2023
Task/Issue URL: https://app.asana.com/0/1203512625915051/1205074419464907/f BSK PR: duckduckgo/BrowserServicesKit#419 macOS PR: duckduckgo/macos-browser#1359 Description: Network Protection module cleanup: We're not using the CFMessagePort IPC mechanism. We're not using the distributed notifications code in iOS.
samsymons
added a commit
that referenced
this pull request
Jul 20, 2023
* main: Fix publisher, add option to override internal user state in debug (#422) Removes unused code and makes some other code platform specific (#419) Optimize first load of Content Rule Lists (#406) Automatically add the PR link to the Asana task (#311) NetP: Move bundle prefix to x-platform code (#418)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Required:
Task/Issue URL: https://app.asana.com/0/1203512625915051/1205074419464907/f
iOS PR: duckduckgo/iOS#1837
macOS PR: duckduckgo/macos-browser#1359
What kind of version bump will this require?: Major
Description:
Network Protection module cleanup:
CFMessagePortIPC mechanism.Testing:
Refer to the instructions in the macOS and iOS PRs.
Internal references:
Software Engineering Expectations
Technical Design Template