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

refactor(client/cordova/apple): assorted cleanups #2071

Merged
merged 6 commits into from
Jul 26, 2024
Merged

Conversation

fortuna
Copy link
Collaborator

@fortuna fortuna commented Jul 26, 2024

I made a number of cleanups:

  • Use OutlineNotification for the url interception event, like we do for other events.
  • Remove CDVMacOsUrlHandler.swift, which was badly designed and was getting in the way of moving the plugin code.
  • Remove EventMonitor, no longer needed after fix(client/cordova/apple/macos): fix popover click and location issues #1845
  • JS-escape intercepted URL, which was not being done before!
  • Stop embedding Tun2socks framework. It's only needed for linking, we don't need to embed it. This solves the issue of needing to clean before rebuilding.
  • Remove unused dependency of VpnExtension on OutlineApplieLib

With this PR there are two less files to rsync!

Here are the log lines proving the URL interception and escaping work:
image

@fortuna fortuna requested a review from a team as a code owner July 26, 2024 00:02
@fortuna fortuna requested review from sbruens and removed request for a team July 26, 2024 00:02
@fortuna fortuna changed the title clean(client/cordova/apple): assorted cleanups refactor(client/cordova/apple): assorted cleanups Jul 26, 2024
@@ -31,7 +31,6 @@
FC0799F72037543F00A1C822 /* OutlineLauncher.app in Copy OutlineLauncher */ = {isa = PBXBuildFile; fileRef = FC0799E62037532900A1C822 /* OutlineLauncher.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
FC0799F92037545D00A1C822 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC0799F82037545D00A1C822 /* ServiceManagement.framework */; };
FC5FF9501F3E1FD40032A745 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC5FF9461F3E1E8B0032A745 /* NetworkExtension.framework */; };
FC6E7F8E204DC1BE003CB365 /* CDVMacOsUrlHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC6E7F8D204DC1BE003CB365 /* CDVMacOsUrlHandler.swift */; };
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aargh, I forgot to copy the project changes back into the rsync'd file. Hopefully we won't need much of that in the future!

This should fix the build.

@fortuna fortuna merged commit 180a650 into master Jul 26, 2024
21 checks passed
@fortuna fortuna deleted the fortuna-clean branch July 26, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants