[DO NOT MERGE] This is what we rsync into the Apple Cordova project #1517
Conversation
|
You mind adding a description of what you're attempting to achieve here? |
This commit shows the edits we make to the standard Cordova project. We obtain the diff by reversing the rsync call.
fortuna
force-pushed
the
fortuna-cordova-diff
branch
from
a9318f5
to
cbb283f
Compare
| <dict/> | ||
| <key>CFBundleIcons~ipad</key> | ||
| <dict/> | ||
| <string>$(EXECUTABLE_NAME)</string> |
There was a problem hiding this comment.
@eacrh What's the difference between ${} and $()?
There was a problem hiding this comment.
They're both valid, I believe ${} is a legacy way of referencing that Apple moved away from in favor of $()
| @@ -2,70 +2,53 @@ | |||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | |||
There was a problem hiding this comment.
The "old" file is what we currently use. The "new" file is what Cordova generates before our edits.
| andSelector:@selector(handleURLEvent:withReplyEvent:) | ||
| forEventClass:kInternetEventClass | ||
| andEventID:kAEGetURL]; | ||
| // Don't ever show the default Cordova window, as we will display its content view in a popover. |
There was a problem hiding this comment.
I think we should show the app window. Users have complained that they run the app and "nothing happens". The tray icon is not super visible.
There was a problem hiding this comment.
To confirm, this would be in addition to the tray?
There was a problem hiding this comment.
I don't know, maybe we need UX input.
Perhaps a simpler approach would be just to open the popup window on start.
i'm curious about what other VPN apps do.
There was a problem hiding this comment.
Yeah I think they do just that, show the open window under the tray icon on first load so it grabs the user's attention.
| #pragma mark - Launcher | ||
|
|
||
| // Enables or disables the embedded app launcher as a login item. | ||
| - (void)setAppLauncherEnabled:(bool)enabled { |
There was a problem hiding this comment.
We have logic to restart on login if the user was connected to the VPN.
There was a problem hiding this comment.
yes, this leads to two options for multi-server config:
- still connect to the previous connected IP:port
- rerun the entire selection process and might connect to a new server
| [self.eventMonitor stop]; | ||
| } | ||
|
|
||
| - (void)showPopover { |
There was a problem hiding this comment.
We added logic to show the system tray.
| @@ -288,49 +313,6 @@ | |||
| </items> | |||
| </menu> | |||
| </menuItem> | |||
| <menuItem title="Window" id="Wrb-DK-0VT"> | |||
There was a problem hiding this comment.
I don't know why we need these menu items, since we don't have a menu bar.
| <feature name="LocalStorage"> | ||
| <param name="osx-package" value="CDVLocalStorage" /> | ||
| </feature> | ||
| <feature name="Device"> |
There was a problem hiding this comment.
We need this file because there's a bug where cordova-osx fails to restore the plugins: apache/cordova-osx#106
| @@ -4,54 +4,8 @@ | |||
| "uninstalled": [] | |||
| }, | |||
| "config_munge": { | |||
| "files": { | |||
There was a problem hiding this comment.
Same bug: apache/cordova-osx#106
| @@ -8,6 +8,14 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { | |||
| "cordova.plugins.clipboard" | |||
| ] | |||
There was a problem hiding this comment.
I don't know why we rsync this file.
TODO: remove it from our code.
| // execSync(`rsync -avc src/cordova/apple/xcode/${outlinePlatform}/ platforms/${platform}/`, { | ||
| // stdio: 'inherit', | ||
| // }); | ||
| // Hack to find out what we edit in the standard platform that is created. |
There was a problem hiding this comment.
This is the trick to generate the diff.
daniellacosse
changed the title
daniellacosse
changed the title
This PR is for documentation purposes. It's not supposed to be merged at any time.