FIX(macos): Update some of macOS obj-c code for 10.15 minimum #7004
+105
−115
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,6 @@ | |
| #include <xar/xar.h> | ||
| } | ||
|
|
||
|
|
||
| static NSString *MumbleOverlayLoaderBundle = @"/Library/ScriptingAdditions/MumbleOverlay.osax"; | ||
| static NSString *MumbleOverlayLoaderBundleIdentifier = @"net.sourceforge.mumble.OverlayScriptingAddition"; | ||
|
|
@@ -80,53 +78,52 @@ - (void) dealloc { | |
| - (void) appLaunched:(NSNotification *)notification { | ||
| if (active) { | ||
| BOOL overlayEnabled = NO; | ||
| @autoreleasepool { | ||
| NSDictionary *userInfo = [notification userInfo]; | ||
|
|
||
| NSString *bundleId = userInfo[@"NSApplicationBundleIdentifier"]; | ||
| if ([bundleId isEqualToString:[[NSBundle mainBundle] bundleIdentifier]]) | ||
| return; | ||
|
|
||
| QString qsBundleIdentifier = QString::fromUtf8([bundleId UTF8String]); | ||
|
|
||
| switch (Global::get().s.os.oemOverlayExcludeMode) { | ||
| case OverlaySettings::LauncherFilterExclusionMode: { | ||
| qWarning("Overlay_macx: launcher filter mode not implemented on macOS, allowing everything"); | ||
| overlayEnabled = YES; | ||
| break; | ||
| } | ||
| case OverlaySettings::WhitelistExclusionMode: { | ||
| if (Global::get().s.os.qslWhitelist.contains(qsBundleIdentifier)) { | ||
| overlayEnabled = YES; | ||
| } | ||
| break; | ||
| } | ||
| case OverlaySettings::BlacklistExclusionMode: { | ||
| if (! Global::get().s.os.qslBlacklist.contains(qsBundleIdentifier)) { | ||
| overlayEnabled = YES; | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (overlayEnabled) { | ||
| pid_t pid = [userInfo[@"NSApplicationProcessIdentifier"] intValue]; | ||
| SBApplication *app = [SBApplication applicationWithProcessIdentifier:pid]; | ||
| [app setDelegate:self]; | ||
|
|
||
| // This timeout is specified in 'ticks'. | ||
| // A tick defined as: "[...] (a tick is approximately 1/60 of a second) [...]" in the | ||
| // Apple Event Manager Reference documentation: | ||
| // http://developer.apple.com/legacy/mac/library/documentation/Carbon/reference/Event_Manager/Event_Manager.pdf | ||
| [app setTimeout:10*60]; | ||
|
|
||
| [app setSendMode:kAEWaitReply]; | ||
| [app sendEvent:kASAppleScriptSuite id:kGetAEUT parameters:0]; | ||
|
|
||
| [app setSendMode:kAENoReply]; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -308,7 +305,7 @@ static bool isInstallerNewer(QString path, NSUInteger curVer) { | |
| bool OverlayConfig::needsUpgrade() { | ||
| NSDictionary *infoPlist = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/Contents/Info.plist", MumbleOverlayLoaderBundle]]; | ||
| if (infoPlist) { | ||
| NSUInteger curVersion = [infoPlist[@"MumbleOverlayVersion"] unsignedIntegerValue]; | ||
|
|
||
| QString path = installerPath(); | ||
| if (path.isEmpty()) | ||
|
|
@@ -321,10 +318,12 @@ static bool isInstallerNewer(QString path, NSUInteger curVer) { | |
| } | ||
|
|
||
| static bool authExec(AuthorizationRef ref, const char **argv) { | ||
| Q_UNUSED(ref); | ||
| Q_UNUSED(argv); | ||
| OSStatus err = noErr; | ||
| int pid = 0, status = 0; | ||
|
|
||
| // Deprecated: AuthorizationExecuteWithPrivileges removed. Consider using SMJobBless or a helper tool for privileged operations. | ||
|
Member
There was a problem hiding this comment. It seems like this effectively removes the entire functionality of
Contributor
There was a problem hiding this comment. Instead of removing the functionality entirely, we can replace it with a supported approach. /bin/mv /Library/ScriptingAdditions/MumbleOverlay.osax /tmp/%1_Uninstalled_MumbleOverlay.osaxWe can achieve the same effect using AppleScript. From the AppleScript documentation under
We can use the NSAppleScript class to create the commands and execute them. This should keep the functionality the same but use the supported Apple API. |
||
| if (err == errAuthorizationSuccess) { | ||
| do { | ||
| pid = wait(&status); | ||
|
|
||
This file contains hidden or 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 file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment above should be removed as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, definitely can do