Compare commits

..
Author SHA1 Message Date
Zorg c7a67e1028 Use macOS 15 arm64 build runners 2025-08-19 19:26:57 -07:00
Zorg 782e2bf5d7 Don't use new test app icon for now to unblock CI (#2755) 2025-08-17 19:48:27 -07:00
Zorg 97bea2fcd4 Modernize update alert (#2737)
This changes the UI for the update alert to have the app icon be more stacked / inlined with the UI, refines the box view for release notes, and removes some title labels that aren't strictly needed. For Tahoe, we opt into using large size buttons which get a capsule shape.

Also this changes adds a new app icon, which is squircle shaped, for the Sparkle test when running on Tahoe.
2025-08-17 17:36:14 -07:00
Zorg b4a1b46fe1 Document and better enforce main thread only requirement for using Sparkle methods (#2754) 2025-08-17 16:17:13 -07:00
Zorg 8702e2dd11 Add tests for file types changing when framework version changes (#2753) 2025-08-17 13:06:11 -07:00
Vincent BénonyandVincent Bénony d491aafeb7 Fix an issue while searching a cloneable file (#2748)
Also bump minor version numbers for major versions 3 and 4

---------

Co-authored-by: Vincent Bénony <bsr43@hopperapp.com>
2025-08-17 08:24:40 -07:00
Zorg 2cfb1e6fe2 Workaround a corner case in which the bundle path of a running application contains Contents/MacOS/Executable (#2747) 2025-07-26 15:46:47 -07:00
Zorg 0c0317c09a Improve retrieval of main app icon for authorization dialog (#2743)
When authorization is needed, create a bitmap representation of the main app icon to save to disk.

Also remove legacy code related to icons.
2025-07-17 20:57:16 -07:00
Zorg 43b3b03886 Update retrieving app icon to work better in Tahoe (#2742)
The old logic had some inconsistencies with picking the right icon on Tahoe. Using NSImageNameApplicationIcon should also work when the color style of the icon changes in System Settings.
2025-07-12 11:17:51 -07:00
jj 21e34394d0 Add support for relative urls for delta updates (#2741) 2025-07-12 11:13:46 -07:00
Zorg e67dcb0fd2 Bump CI runners to Xcode 16.4 & Xcode 26.0 beta (#2733) 2025-06-19 10:13:00 -07:00
Zorg 5f9ee13796 Synchronize updater settings with user defaults (#2728) 2025-06-16 20:45:31 -07:00
Sparkle-Bot eadcc179d0 Update Package management files for version 2.7.1 2025-06-15 21:30:54 -07:00
Zorg f3dc1a4b9c Update changelog for 2.7.1 2025-06-15 21:30:45 -07:00
Zorg 4274e096fe Fix release notes constraints when compiled with macOS 26 SDK (#2730)
Remove trailing constraint from automatically download & install updates checkbox. This caused an issue that prevented the window from being resized smaller (so the window could only grow bigger).

Remove redundant >= width constraint on Remind Me Later button since Install Update button already had such a constraint.
2025-06-12 21:24:27 -07:00
Zorg 341c8b2c17 Fix reserved identifier warnings for static functions in Xcode 26 (#2729) 2025-06-12 21:09:00 -07:00
Zorg 8e30a08291 Avoid using set-output in GitHub Actions (#2399) 2025-05-01 09:42:57 -04:00
Zorg fea50c33c8 Add private module map (#2722)
Require importing explicit submodules for private functionality.
2025-04-30 21:30:59 -04:00
Daniel Jalkut afc4179c0d Rework the logic for avoiding re-sending the system profile more frequently than once a week (#2720)
So that it will not use a potentially problematic binary compare operation.

Fixes #278.
2025-04-28 20:40:08 -04:00
Zorg f3cd2b9ff9 Make -[SPUUserDriver showUpdateInFocus] optional (#2717)
When this method is not implemented, the updater assumes already presented updates cannot be brought in utmost focus.
2025-04-12 13:25:23 -07:00
Zorg 3b39b400e1 Set STRINGS_FILE_OUTPUT_ENCODING = binary in xcconfig (#2716) 2025-04-01 21:05:43 -07:00
Nicolas Kick 1dec7ddce9 Set STRINGS_FILE_OUTPUT_ENCODING build setting to "binary" (#2712) 2025-04-01 20:24:38 -07:00
Zorg 3e3d573d08 Fix compiler warnings for Xcode 16.3 (#2709)
Also silence project upgrade warnings.
2025-03-23 07:26:30 -07:00
Zorg 057702e757 Fix Sparkle not building when SPARKLE_COPY_LOCALIZATIONS=0 (#2707) 2025-03-22 13:41:57 -07:00
Will Fairclough 997778dd2d Improves bsdiff performance by preventing excessive iterations when processing similar data blocks (#2693)
* Port bsdiff optimizations for diffing large blocks that only differ by less than 8 bytes

* Retrigger CI

* Bump the minor version for major 2, 3, and 4

* Comments for ChromiumOS ported commits
2025-03-10 21:22:26 -07:00
Sjur N Moshagen 16819179a0 Typo in NN localisation (#2694) 2025-03-10 21:10:13 -07:00
134 changed files with 1767 additions and 1597 deletions

No files matched your search

+17 -13
View File
@@ -10,18 +10,18 @@ jobs:
build:
strategy:
matrix:
xcode: ['xcode16.1', 'xcode15.4']
xcode: ['xcode26', 'xcode16.4']
include:
- xcode: 'xcode15.4'
xcode-path: '/Applications/Xcode_15.4.app/Contents/Developer'
upload-dist: false
run-analyzer: false
macos: 'macos-14'
- xcode: 'xcode16.1'
xcode-path: '/Applications/Xcode_16.1.app'
- xcode: 'xcode16.4'
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
upload-dist: true
run-analyzer: true
macos: 'macos-15'
macos: 'macos-15-arm64'
- xcode: 'xcode26'
xcode-path: '/Applications/Xcode_26.0.app'
upload-dist: false
run-analyzer: false
macos: 'macos-15-arm64'
name: Build and Test Sparkle
runs-on: ${{ matrix.macos }}
@@ -69,17 +69,21 @@ jobs:
env:
DEVELOPER_DIR: ${{ matrix.xcode-path }}
run: |
if grep -q "warning:" analyze_output.txt; then
echo '::set-output name=analyzestatus::0'
if grep "warning:" analyze_output.txt | grep -q -v "dependency scan of"; then
echo "analyzestatus=0" >> $GITHUB_OUTPUT
else
echo '::set-output name=analyzestatus::1'
echo "analyzestatus=1" >> $GITHUB_OUTPUT
fi
- name: Extract Analyzed Warnings
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
id: warnings
run: |
echo ::set-output name=content::$(cat analyze_output.txt)
{
echo 'content<<EOF'
cat analyze_output.txt
echo 'EOF'
} >> $GITHUB_OUTPUT
- name: Post Analyzed Warnings
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
+2 -2
View File
@@ -2,7 +2,7 @@ name: "Create Draft Release"
env:
BUILDDIR: "build"
DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_16.4.app/Contents/Developer"
on:
workflow_dispatch:
@@ -29,7 +29,7 @@ concurrency:
jobs:
release:
name: "Publish binaries for release"
runs-on: macos-15
runs-on: macos-15-arm64
steps:
- name: "Checkout sources"
+4 -26
View File
@@ -10,8 +10,6 @@
#import "SPUMessageTypes.h"
#import "SPUInstallerAgentProtocol.h"
#import "SUInstallerAgentInitiationProtocol.h"
#import "SUCodeSigningVerifier.h"
#import "SULog.h"
#include "AppKitPrevention.h"
@@ -54,7 +52,7 @@
_delegate = nil;
[_activeConnection invalidate];
// Don't need to set _activeConnection to nil, we don't expect new connections
_activeConnection = nil;
[_xpcListener invalidate];
_xpcListener = nil;
@@ -63,29 +61,10 @@
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
{
if (_activeConnection != nil) {
SULog(SULogLevelError, @"Error: Rejecting new connection for agent due already having an active connection");
[newConnection invalidate];
return NO;
}
// Hardening but not critical for security
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
case SUValidateConnectionStatusSetNoRequirementSuccess:
break;
case SUValidateConnectionStatusAPIFailure:
case SUValidateConnectionStatusCodeSigningRequirementFailure:
case SUValidateConectionNoSupportedValidationMethodFailure:
SULog(SULogLevelError, @"Error: Rejecting new connection for agent due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
[newConnection invalidate];
return NO;
}
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerAgentInitiationProtocol)];
newConnection.exportedObject = self;
@@ -112,9 +91,10 @@
});
};
_agent = newConnection.remoteObjectProxy;
[newConnection resume];
_agent = newConnection.remoteObjectProxy;
return YES;
}
@@ -126,9 +106,7 @@
[self->_delegate agentConnectionDidInitiate];
});
if (acknowledgement != NULL) {
acknowledgement();
}
acknowledgement();
}
- (void)connectionWillInvalidateWithError:(NSError *)error
+16 -104
View File
@@ -29,8 +29,6 @@
#import "SPULocalCacheDirectory.h"
#import "SPUVerifierInformation.h"
#import "SUConstants.h"
#import "SUCodeSigningVerifier.h"
#import <os/lock.h>
#include "AppKitPrevention.h"
@@ -51,10 +49,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
@implementation AppInstaller
{
NSXPCListener* _xpcListener;
// Must be synchronized with _newConnectionLock
// Set from new connection handler, and also set/read from main thread
NSXPCConnection *_activeConnection;
id<SUInstallerCommunicationProtocol> _communicator;
AgentConnection *_agentConnection;
@@ -77,14 +72,6 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
dispatch_queue_t _installerQueue;
os_unfair_lock _newConnectionLock;
#if SPARKLE_BUILD_PACKAGE_SUPPORT
// Must be synchronized with _newConnectionLock
// Set from new connection handler, read from main thread
BOOL _connectionCodeSigningValidationSkipped;
#endif
BOOL _shouldRelaunch;
BOOL _shouldShowUI;
@@ -95,9 +82,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
BOOL _finishedValidation;
BOOL _agentInitiatedConnection;
// Setting _performedStage1Installation on main thread must be synchronzied with reading it from new connection handler
BOOL _performedStage1Installation;
BOOL _performedStage2Installation;
BOOL _performedStage3Installation;
@@ -110,8 +95,6 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
return nil;
}
_newConnectionLock = OS_UNFAIR_LOCK_INIT;
_hostBundleIdentifier = [hostBundleIdentifier copy];
_homeDirectory = [homeDirectory copy];
@@ -127,59 +110,13 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
{
os_unfair_lock_lock(&_newConnectionLock);
{
if (_activeConnection != nil) {
os_unfair_lock_unlock(&_newConnectionLock);
SULog(SULogLevelError, @"Error: Rejecting multiple XPC connections for installer...");
[newConnection invalidate];
return NO;
}
#if SPARKLE_BUILD_PACKAGE_SUPPORT
BOOL connectionCodeSigningValidationSkipped = NO;
#endif
// It's safe to allow any connections once stage 1 installation is complete
// This is to allow general updaters to resume the installation.
if (!_performedStage1Installation) {
BOOL passesValidation;
NSError *validationError = nil;
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
switch (status) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
passesValidation = YES;
break;
case SUValidateConnectionStatusSetNoRequirementSuccess:
passesValidation = YES;
#if SPARKLE_BUILD_PACKAGE_SUPPORT
connectionCodeSigningValidationSkipped = YES;
#endif
break;
case SUValidateConnectionStatusAPIFailure:
case SUValidateConnectionStatusCodeSigningRequirementFailure:
case SUValidateConectionNoSupportedValidationMethodFailure:
passesValidation = NO;
break;
}
if (!passesValidation) {
os_unfair_lock_unlock(&_newConnectionLock);
SULog(SULogLevelError, @"Error: Rejecting new connection for installer due to failing validation of XPC connection with status %lu and error: %@", status, validationError.localizedDescription);
[newConnection invalidate];
return NO;
}
}
#if SPARKLE_BUILD_PACKAGE_SUPPORT
_connectionCodeSigningValidationSkipped = connectionCodeSigningValidationSkipped;
#endif
_activeConnection = newConnection;
if (_activeConnection != nil) {
SULog(SULogLevelDefault, @"Rejecting multiple connections...");
[newConnection invalidate];
return NO;
}
os_unfair_lock_unlock(&_newConnectionLock);
_activeConnection = newConnection;
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol)];
newConnection.exportedObject = self;
@@ -191,11 +128,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
os_unfair_lock_lock(&strongSelf->_newConnectionLock);
NSXPCConnection *activeConnection = strongSelf->_activeConnection;
os_unfair_lock_unlock(&strongSelf->_newConnectionLock);
[activeConnection invalidate];
[strongSelf->_activeConnection invalidate];
}
});
};
@@ -208,19 +141,14 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
[strongSelf cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Invalidation on remote port being called, and installation is not close enough to completion!" }]];
}
strongSelf->_communicator = nil;
os_unfair_lock_lock(&strongSelf->_newConnectionLock);
strongSelf->_activeConnection = nil;
os_unfair_lock_unlock(&strongSelf->_newConnectionLock);
}
});
};
// _communicator is used only on main thread
dispatch_async(dispatch_get_main_queue(), ^{
self->_communicator = newConnection.remoteObjectProxy;
[newConnection resume];
});
[newConnection resume];
_communicator = newConnection.remoteObjectProxy;
return YES;
}
@@ -432,7 +360,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
// Do not rely on eg: self->_updateDirectoryPath != nil because we may set it to nil again if an early stage fails (i.e, archive extraction)
self->_receivedInstallationData = YES;
SPUInstallationInputData *installationData = (data != nil) ? (SPUInstallationInputData *)SPUUnarchiveRootObjectSecurely(data, [SPUInstallationInputData class]) : nil;
SPUInstallationInputData *installationData = (SPUInstallationInputData *)SPUUnarchiveRootObjectSecurely(data, [SPUInstallationInputData class]);
if (installationData == nil) {
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to unarchive input installation data" }]];
return;
@@ -597,7 +525,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
[self extractAndInstallUpdate];
});
} else if (identifier == SPUSentUpdateAppcastItemData) {
SUAppcastItem *updateItem = (data != nil) ? (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]) : nil;
SUAppcastItem *updateItem = (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]);
if (updateItem != nil) {
SPUInstallationInfo *installationInfo = [[SPUInstallationInfo alloc] initWithAppcastItem:updateItem canSilentlyInstall:[_installer canInstallSilently]];
@@ -650,17 +578,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
_installerQueue = dispatch_queue_create("org.sparkle-project.sparkle.installer", queuePriority);
#if SPARKLE_BUILD_PACKAGE_SUPPORT
os_unfair_lock_lock(&_newConnectionLock);
BOOL connectionCodeSigningValidationSkipped = self->_connectionCodeSigningValidationSkipped;
os_unfair_lock_unlock(&_newConnectionLock);
#else
BOOL connectionCodeSigningValidationSkipped = NO;
#endif
dispatch_async(_installerQueue, ^{
NSError *installerError = nil;
id <SUInstallerProtocol> installer = [SUInstaller installerForHost:self->_host expectedInstallationType:self->_installationType updateDirectory:self->_extractionDirectory connectionCodeSigningValidationSkipped:connectionCodeSigningValidationSkipped homeDirectory:self->_homeDirectory userName:self->_userName error:&installerError];
id <SUInstallerProtocol> installer = [SUInstaller installerForHost:self->_host expectedInstallationType:self->_installationType updateDirectory:self->_extractionDirectory homeDirectory:self->_homeDirectory userName:self->_userName error:&installerError];
if (installer == nil) {
dispatch_async(dispatch_get_main_queue(), ^{
@@ -684,16 +604,14 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
dispatch_async(dispatch_get_main_queue(), ^{
self->_installer = installer;
os_unfair_lock_lock(&self->_newConnectionLock);
self->_performedStage1Installation = YES;
os_unfair_lock_unlock(&self->_newConnectionLock);
uint8_t sendInformation[] = {canPerformSilentInstall, (uint8_t)self->_targetTerminated};
NSData *sendData = [NSData dataWithBytes:sendInformation length:sizeof(sendInformation)];
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage1 data:sendData];
self->_performedStage1Installation = YES;
if (self->_targetTerminated) {
// Stage 2 can still be run before we finish installation
// if the updater requests for it before the app is terminated
@@ -810,15 +728,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
// It's nice to tell the other end we're invalidating
os_unfair_lock_lock(&_newConnectionLock);
NSXPCConnection *activeConnection = _activeConnection;
[_activeConnection invalidate];
_activeConnection = nil;
os_unfair_lock_unlock(&_newConnectionLock);
[activeConnection invalidate];
[_xpcListener invalidate];
_xpcListener = nil;
+3 -3
View File
@@ -113,11 +113,11 @@ uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersio
case SUBinaryDeltaMajorVersion1:
return 2;
case SUBinaryDeltaMajorVersion2:
return 4;
return 5;
case SUBinaryDeltaMajorVersion3:
return 1;
return 3;
case SUBinaryDeltaMajorVersion4:
return 0;
return 2;
}
return 0;
}
+6 -1
View File
@@ -345,7 +345,12 @@ static NSString *cloneableRelativePath(NSDictionary<NSString *, NSData *> *after
if (oldCloneInfo == nil) {
continue;
}
// The old file must have the same type as the new one
if ([(NSNumber *)oldCloneInfo[INFO_TYPE_KEY] unsignedShortValue] != FTS_F) {
continue;
}
NSNumber *newPermissions = newInfo[INFO_PERMISSIONS_KEY];
if (outNewPermissions != NULL) {
*outNewPermissions = newPermissions;
-19
View File
@@ -19,22 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
#define SUCodeSigningVerifierDefinitionAttribute __attribute__((objc_runtime_name("SUTestCodeSigningVerifier")))
#endif
typedef NS_ENUM(NSUInteger, SUValidateConnectionStatus) {
SUValidateConnectionStatusSetCodeSigningRequirementSuccess = 0,
SUValidateConnectionStatusSetNoRequirementSuccess,
SUValidateConnectionStatusAPIFailure,
SUValidateConnectionStatusCodeSigningRequirementFailure,
SUValidateConectionNoSupportedValidationMethodFailure,
};
typedef NS_OPTIONS(NSUInteger, SUValidateConnectionOptions) {
// Default validation behavior (matches against Team ID from main executable if available)
SUValidateConnectionOptionDefault = 0,
// Require that the connecting client has the app sandbox entitlement
SUValidateConnectionOptionRequireSandboxEntitlement = 1 << 0,
};
SUCodeSigningVerifierDefinitionAttribute
@interface SUCodeSigningVerifier : NSObject
@@ -50,9 +34,6 @@ SUCodeSigningVerifierDefinitionAttribute
+ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundleURL;
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url;
+ (NSString * _Nullable)teamIdentifierFromMainExecutable;
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error;
@end
+5 -123
View File
@@ -15,12 +15,6 @@
#include "AppKitPrevention.h"
@interface NSXPCConnection (Private)
@property (nonatomic, readonly) audit_token_t auditToken;
@end
@implementation SUCodeSigningVerifier
+ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)newBundleURL andMatchesSignatureAtBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error
@@ -269,7 +263,7 @@ static id valueOrNSNull(id value) {
return (result == 0);
}
static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode)
static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef staticCode)
{
CFDictionaryRef cfSigningInformation = NULL;
OSStatus copySigningInfoCode = SecCodeCopySigningInformation(staticCode, kSecCSSigningInformation,
@@ -290,12 +284,12 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
{
SecStaticCodeRef staticCode = NULL;
OSStatus staticCodeResult = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &staticCode);
if (staticCodeResult != errSecSuccess) {
if (staticCodeResult != noErr) {
SULog(SULogLevelError, @"Failed to get static code for retrieving team identifier: %d", staticCodeResult);
return nil;
}
NSString *teamIdentifier = SUTeamIdentifierFromCode(staticCode);
NSString *teamIdentifier = SUTeamIdentifierFromStaticCode(staticCode);
if (staticCode != NULL) {
CFRelease(staticCode);
@@ -304,22 +298,6 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
return teamIdentifier;
}
+ (NSString * _Nullable)teamIdentifierFromMainExecutable
{
SecCodeRef code = NULL;
OSStatus result = SecCodeCopySelf(kSecCSDefaultFlags, &code);
if (result != errSecSuccess) {
SULog(SULogLevelError, @"Failed to get code for retrieving team identifier of main executable: %d", result);
return nil;
}
NSString *teamIdentifier = SUTeamIdentifierFromCode(code);
CFRelease(code);
return teamIdentifier;
}
+ (BOOL)codeSignatureIsValidAtDownloadURL:(NSURL *)downloadURL andMatchesDeveloperIDTeamFromOldBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error
{
NSString *teamIdentifier = nil;
@@ -345,7 +323,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
goto finally;
}
teamIdentifier = SUTeamIdentifierFromCode(oldStaticCode);
teamIdentifier = SUTeamIdentifierFromStaticCode(oldStaticCode);
if (teamIdentifier == nil) {
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"%@. The team identifier could not be retrieved from the original app: %@", commonErrorMessage, oldBundleURL.path] }];
@@ -359,7 +337,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
// LeafIsDeveloperIDApp = certificate leaf[field.1.2.840.113635.100.6.1.13]
// DeveloperIDTeamID = certificate leaf[subject.OU]
// https://developer.apple.com/documentation/technotes/tn3127-inside-code-signing-requirements#Xcode-designated-requirement-for-Developer-ID-code
requirementString = [NSString stringWithFormat:@"anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13] and certificate leaf[subject.OU] = \"%@\"", teamIdentifier];
requirementString = [NSString stringWithFormat:@"anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13] and certificate leaf[subject.OU] = %@", teamIdentifier];
result = SecRequirementCreateWithString((__bridge CFStringRef)requirementString, kSecCSDefaultFlags, &requirement);
if (result != errSecSuccess) {
@@ -443,100 +421,4 @@ finally:
return (resultError == nil);
}
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error
{
NSMutableArray<NSString *> *codeSigningRequirementComponents = [NSMutableArray array];
// Build the default team ID signing requirement
NSString *hostTeamIdentifier = [self teamIdentifierFromMainExecutable];
if (hostTeamIdentifier != nil) {
NSString *teamIdentifierRequirement = [NSString stringWithFormat:@"(anchor apple generic and certificate leaf[subject.OU] = \"%@\")", hostTeamIdentifier];
[codeSigningRequirementComponents addObject:teamIdentifierRequirement];
}
// Build the sandboxing requirement
if ((options & SUValidateConnectionOptionRequireSandboxEntitlement) != 0) {
// This ensures the entitlement is set to true too
NSString *sandboxingRequirement = @"(entitlement [\"com.apple.security.app-sandbox\"] exists)";
[codeSigningRequirementComponents addObject:sandboxingRequirement];
}
// Check if no requirement is required
if (codeSigningRequirementComponents.count == 0) {
return SUValidateConnectionStatusSetNoRequirementSuccess;
}
NSString *codeSigningRequirement = [codeSigningRequirementComponents componentsJoinedByString:@" and "];
if (@available(macOS 13.0, *)) {
[connection setCodeSigningRequirement:codeSigningRequirement];
return SUValidateConnectionStatusSetCodeSigningRequirementSuccess;
}
// Fall back to audit token on older OS's
if ([connection respondsToSelector:@selector(auditToken)]) {
audit_token_t auditToken = [connection auditToken];
NSData *auditTokenData = [NSData dataWithBytes:&auditToken length:sizeof(auditToken)];
NSDictionary *attributes = @{
(NSString *)kSecGuestAttributeAudit: auditTokenData
};
SecCodeRef code = NULL;
OSStatus result = SecCodeCopyGuestWithAttributes(NULL, (__bridge CFDictionaryRef _Nullable)(attributes), kSecCSDefaultFlags, &code);
if (result != errSecSuccess) {
CFRelease(code);
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because SecCodeCopyGuestWithAttributes() failed with error %d", result] }];
}
return SUValidateConnectionStatusAPIFailure;
}
// Check if the client is code signed with our signing requirement
SecRequirementRef requirement = NULL;
result = SecRequirementCreateWithString((__bridge CFStringRef)codeSigningRequirement, kSecCSDefaultFlags, &requirement);
if (result != errSecSuccess) {
CFRelease(code);
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because SecRequirementCreateWithString() failed with error %d", result] }];
}
return SUValidateConnectionStatusAPIFailure;
}
CFErrorRef cfError = NULL;
// This is not a static code, so we don't pass kSecCSCheckAllArchitectures
result = SecCodeCheckValidityWithErrors(code, kSecCSDefaultFlags, requirement, &cfError);
CFRelease(requirement);
requirement = NULL;
if (result != errSecSuccess) {
NSError *cfBridgedError = (NSError *)CFBridgingRelease(cfError);
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because validating the code signature failed with error %d (%@). Does the app meet the designated requirement: %@", result, cfBridgedError.localizedDescription, codeSigningRequirement] }];
}
[self logSigningInfoForCode:code label:@"Client"];
CFRelease(code);
return SUValidateConnectionStatusCodeSigningRequirementFailure;
}
CFRelease(code);
return SUValidateConnectionStatusSetCodeSigningRequirementSuccess;
}
// Not much we can do if auditToken is not supported. This code should not be reached though.
return SUValidateConectionNoSupportedValidationMethodFailure;
}
@end
+1 -1
View File
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUInstaller : NSObject
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory connectionCodeSigningValidationSkipped:(BOOL)connectionCodeSigningValidationSkipped homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError **)error;
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError **)error;
+ (nullable NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host
#if SPARKLE_BUILD_PACKAGE_SUPPORT
+1 -78
View File
@@ -150,7 +150,7 @@
return newAppDownloadPath;
}
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory connectionCodeSigningValidationSkipped:(BOOL)connectionCodeSigningValidationSkipped homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError * __autoreleasing *)error
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError * __autoreleasing *)error
{
#if SPARKLE_BUILD_PACKAGE_SUPPORT
BOOL isPackage = NO;
@@ -170,83 +170,6 @@
return nil;
}
#if SPARKLE_BUILD_PACKAGE_SUPPORT
if (isPackage && connectionCodeSigningValidationSkipped) {
// Package updates cannot update arbitrary bundles if code signing validation on the connection was skipped
// (This means our helper is not code signed with an Apple issued certificate).
// In this case, the main executable must be owned by root and the host must contain our installer tool
NSString *installerExecutablePath = NSBundle.mainBundle.executableURL.URLByResolvingSymlinksInPath.path;
if (installerExecutablePath == nil) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"The "@SPARKLE_RELAUNCH_TOOL_NAME" executable path failed to be retrieved, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
}
return nil;
}
NSString *hostBundlePath = host.bundle.bundleURL.URLByResolvingSymlinksInPath.path;
if (hostBundlePath == nil) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"The host bundle path to update to be retrieved, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
}
return nil;
}
NSError *attributesError = nil;
NSDictionary<NSFileAttributeKey, id> *fileAttributes = [NSFileManager.defaultManager attributesOfItemAtPath:installerExecutablePath error:&attributesError];
if (fileAttributes == nil) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"File attributes failed to be retrieved from the "@SPARKLE_RELAUNCH_TOOL_NAME" executable, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
}
return nil;
}
NSNumber *installerOwnerID = fileAttributes[NSFileOwnerAccountID];
if (installerOwnerID == nil) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"File owner ID failed to be retrieved from the "@SPARKLE_RELAUNCH_TOOL_NAME" executable, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
}
return nil;
}
// Check our helper is owned by root
if (![installerOwnerID isEqual:@(0)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root (this specific case) or not residing in '%@'. Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
}
return nil;
}
NSArray<NSString *> *installerExecutablePathComponents = installerExecutablePath.pathComponents;
NSArray<NSString *> *hostBundlePathComponents = hostBundlePath.pathComponents;
if (installerExecutablePathComponents.count <= hostBundlePathComponents.count) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root or not residing in '%@' (this specific case). Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
}
return nil;
}
// Check out helper resides inside the host app to be updated
if (![[installerExecutablePathComponents subarrayWithRange:NSMakeRange(0, hostBundlePathComponents.count)] isEqualToArray:hostBundlePathComponents]) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root or not residing in '%@' (this specific case). Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
}
return nil;
}
}
#else
(void)connectionCodeSigningValidationSkipped;
#endif
// Make sure we find the type of installer that we were expecting to find
// We shouldn't implicitly trust the installation type fed into here from the appcast because the installation type helps us determine
// ahead of time whether or not this installer tool should be ran as root or not
+14 -8
View File
@@ -353,16 +353,22 @@
// If the update has a custom update security policy, the same team ID policy may not apply,
// so in that case we will also skip performing an atomic swap
updateHasCustomUpdateSecurityPolicy = updateHost.hasUpdateSecurityPolicy;
if (updateHasCustomUpdateSecurityPolicy) {
// We don't handle working around a custom update security policy
NSURL *mainExecutableURL = NSBundle.mainBundle.executableURL;
if (mainExecutableURL == nil) {
// This shouldn't happen
_canPerformSafeAtomicSwap = NO;
} else {
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierFromMainExecutable];
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
// If bundleTeamIdentifier is nil, then the update isn't code signed so atomic swap is okay
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
updateHasCustomUpdateSecurityPolicy = updateHost.hasUpdateSecurityPolicy;
if (updateHasCustomUpdateSecurityPolicy) {
// We don't handle working around a custom update security policy
_canPerformSafeAtomicSwap = NO;
} else {
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:mainExecutableURL];
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
// If bundleTeamIdentifier is nil, then the update isn't code signed so atomic swap is okay
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
}
}
} else {
_canPerformSafeAtomicSwap = YES;
-8
View File
@@ -1,11 +1,3 @@
# 2.7.3
* Double quote team identifiers in requirement strings to fix crash if Team ID starts with number (#2766) (Zorg)
# 2.7.2
* Harden policy on what operations clients are allowed to take (#2763) (Zorg)
# 2.7.1
* Fix typo in NN localisation (#2694) (Sjur N Moshagen)
+1 -1
View File
@@ -1 +1 @@
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz"}
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz"}
+2 -2
View File
@@ -94,12 +94,12 @@ SPARKLE_ICON_NAME = AppIcon
// These variables must have a space after the '=' too
SPARKLE_VERSION_MAJOR = 2
SPARKLE_VERSION_MINOR = 7
SPARKLE_VERSION_PATCH = 3
SPARKLE_VERSION_PATCH = 1
// This should be in SemVer format or empty, ie. "-beta.1"
// These variables must have a space after the '=' too
SPARKLE_VERSION_SUFFIX =
CURRENT_PROJECT_VERSION = 2045.2
CURRENT_PROJECT_VERSION = 2045
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
+4
View File
@@ -18,8 +18,12 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BUILDING_SPARKLE=1
SKIP_INSTALL = YES
DEFINES_MODULE = YES
PRODUCT_BUNDLE_IDENTIFIER = ${SPARKLE_BUNDLE_IDENTIFIER}
STRINGS_FILE_OUTPUT_ENCODING = binary
// As long as we don't ourselves depend upon any Frameworks that are incompatible
// with Application Extensions, then we should allow frameworks that require
// compatibility to be able to link with us.
APPLICATION_EXTENSION_API_ONLY = YES
ENABLE_MODULE_VERIFIER = YES
MODULEMAP_PRIVATE_FILE = Sparkle/Sparkle.private.modulemap
+7 -37
View File
@@ -55,32 +55,6 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
- (void)startDownloadWithRequest:(NSURLRequest *)request SPU_OBJC_DIRECT
{
if (request == nil) {
NSString *message = @"The download request must not be nil";
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
[_delegate downloaderDidFailWithError:error];
return;
}
// Prevent any unwanted URL schemes (e.g. file://)
NSString *scheme = request.URL.scheme;
if (scheme == nil) {
NSString *message = @"The download request scheme must not be nil";
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
[_delegate downloaderDidFailWithError:error];
return;
}
if ([scheme caseInsensitiveCompare:@"http"] != NSOrderedSame && [scheme caseInsensitiveCompare:@"https"] != NSOrderedSame) {
NSString *message = [NSString stringWithFormat:@"The download request URL must use http or https (%@)", request.URL];
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
[_delegate downloaderDidFailWithError:error];
return;
}
_downloadSession = [NSURLSession
sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
delegate:self
@@ -143,14 +117,12 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
// The downloader instance that creates this temp directory isn't necessarily the same as the one
// that clears it (eg upon skipping an already downloaded update), so we can't just preserve it here too
dispatch_async(dispatch_get_main_queue(), ^{
if (bundleIdentifier != nil && downloadToken != nil) {
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:bundleIdentifier];
if (rootPersistentDownloadCachePath != nil) {
NSString *sanitizedDownloadToken = downloadToken.lastPathComponent;
NSString *tempDir = [rootPersistentDownloadCachePath stringByAppendingPathComponent:sanitizedDownloadToken];
[[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL];
}
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:bundleIdentifier];
if (rootPersistentDownloadCachePath != nil) {
NSString *sanitizedDownloadToken = downloadToken.lastPathComponent;
NSString *tempDir = [rootPersistentDownloadCachePath stringByAppendingPathComponent:sanitizedDownloadToken];
[[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL];
}
});
}
@@ -176,9 +148,7 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
dispatch_async(dispatch_get_main_queue(), ^{
[self _cleanup];
if (completionHandler != NULL) {
completionHandler();
}
completionHandler();
});
}
-25
View File
@@ -9,8 +9,6 @@
#import <Foundation/Foundation.h>
#import "SPUDownloader.h"
#import "SPUDownloaderDelegate.h"
#import "SULog.h"
#import "SUCodeSigningVerifier.h"
@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
@end
@@ -20,29 +18,6 @@
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
// This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
// Validate connection of clients to avoid any client from using the service.
// Ideally we would also prevent clients connecting that have an outgoing network connection enabled,
// but this is not easy to enforce.
// This is a policy, not a security critical enforcement.
{
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
case SUValidateConnectionStatusSetNoRequirementSuccess:
break;
case SUValidateConnectionStatusAPIFailure:
case SUValidateConnectionStatusCodeSigningRequirementFailure:
case SUValidateConectionNoSupportedValidationMethodFailure:
SULog(SULogLevelError, @"Error: Downloader XPC Service is rejecting new connection due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
[newConnection invalidate];
return NO;
}
}
// Configure the connection.
// First, set the interface that the exported object implements.
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderProtocol)];
+68 -114
View File
@@ -11,17 +11,24 @@
#import "SUFileManager.h"
#import "SULog.h"
#import "SPUMessageTypes.h"
#import "SUBundleIcon.h"
#import "SPULocalCacheDirectory.h"
#import "SPUInstallationType.h"
#import "SUHost.h"
#import <ImageIO/ImageIO.h>
#import <ServiceManagement/ServiceManagement.h>
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
#import <SystemConfiguration/SystemConfiguration.h>
// We only fetch bundle icon for Installer Launcher XPC Service
#if defined(BUILDING_SPARKLE_SOURCES_EXTERNALLY) && BUILDING_SPARKLE_SOURCES_EXTERNALLY
#define FETCH_BUNDLE_ICON_FOR_AUTH 1
#else
#define FETCH_BUNDLE_ICON_FOR_AUTH 0
#endif
#if FETCH_BUNDLE_ICON_FOR_AUTH
#import <AppKit/AppKit.h>
#else
#include "AppKitPrevention.h"
#endif
@implementation SUInstallerLauncher
@@ -106,10 +113,8 @@
return (submittedJob == true);
}
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory mainBundleName:(NSString *)mainBundleName inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory authorizationPrompt:(NSString *)authorizationPrompt inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
{
SUFileManager *fileManager = [[SUFileManager alloc] init];
// No need to release the quarantine for this utility
// In fact, we shouldn't because the tool may be located at a path we should not be writing too.
@@ -140,25 +145,14 @@
// Using this right rather than using something like kSMRightModifySystemDaemons allows us to present a better worded prompt
// Note the right name is cached, so if we want to change the authorization
// prompt, we may need to change the right name. I have found no good way around this :|
SUHost *host = [[SUHost alloc] initWithBundle:hostBundle];
NSString *hostName = host.name;
// Figure out the authorization prompt and right name
// We create the authorization prompt here so that a bad client cannot pass in a completely arbitrary prompt message
// We also forgo localization for this prompt at the moment because with the right name being cached, updating localizations will be undesirable.
// Furthermore, we can avoid adding localization files to the Installer XPC Service (if that one is being used).
NSString *sparkleAuthTag = @"sparkle2-auth"; // this needs to change if auth wording changes
NSString *rightNameString;
NSString *authorizationPrompt;
if ([hostBundleIdentifier isEqualToString:updaterIdentifier]) {
// Application bundle is likely updating itself
rightNameString = [NSString stringWithFormat:@"%@.%@", hostBundleIdentifier, sparkleAuthTag];
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update.", hostName];
} else {
// Updater is likely updating a bundle that is not itself
rightNameString = [NSString stringWithFormat:@"%@.%@.%@", updaterIdentifier, hostBundleIdentifier, sparkleAuthTag];
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update %2$@.", mainBundleName, hostName];
}
const char *rightName = rightNameString.UTF8String;
@@ -175,81 +169,68 @@
AuthorizationRights rights = { .count = 1, .items = &right };
AuthorizationFlags flags = (AuthorizationFlags)(kAuthorizationFlagExtendRights | kAuthorizationFlagInteractionAllowed);
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
AuthorizationEnvironment authorizationEnvironment = {.count = 0, .items = NULL};
// Find a 32x32 image representation of the icon, and write out a PNG version of it to a temporary location
// Then use the icon (if one is available) for the authorization prompt
// NSImage is not used because it relies on AppKit
NSURL *tempIconDestinationURL = nil;
NSURL *iconURL = [SUBundleIcon iconURLForHost:[[SUHost alloc] initWithBundle:hostBundle]];
if (iconURL != nil) {
CGImageSourceRef imageSource = CGImageSourceCreateWithURL((CFURLRef)iconURL, (CFDictionaryRef)@{});
if (imageSource != NULL) {
size_t imageCount = CGImageSourceGetCount(imageSource);
for (size_t imageIndex = 0; imageIndex < imageCount; imageIndex++) {
CFDictionaryRef cfProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, imageIndex, (CFDictionaryRef)@{});
NSDictionary *properties = CFBridgingRelease(cfProperties);
#if FETCH_BUNDLE_ICON_FOR_AUTH
NSString *tempIconDestinationPath = nil;
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
char iconPathBuffer[] = "/tmp/XXXXXX.png";
// If an icon bundle path is specified, write out a representation of the icon's data to a temporary file.
// Then use that image data for the authorization prompt
if (iconBundlePath != nil) {
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:iconBundlePath];
// Creating a bitmap representation at a specific size is much cheaper than asking for icon's TIFFRepresentation
// On older OS's we must create a 32x32 image otherwise it won't be scaled correctly in the dialog
// On newer OS's we can use a slightly higher resolution image
NSInteger imageDimensions;
if (@available(macOS 10.15, *)) {
imageDimensions = 64;
} else {
imageDimensions = 32;
}
NSBitmapImageRep *iconBitmapRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:imageDimensions pixelsHigh:imageDimensions bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
[NSGraphicsContext saveGraphicsState];
NSGraphicsContext.currentContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:iconBitmapRep];
[icon drawInRect:NSMakeRect(0, 0, imageDimensions, imageDimensions)];
[NSGraphicsContext restoreGraphicsState];
NSData *pngData = [iconBitmapRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
if (pngData != nil) {
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
// a) no spaces in the path (SU/NSFileManager fails here)
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here) only apply to older systems (eg: macOS 10.8)
// The file also needs to be placed in a system readable place such as /tmp
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
int tempIconFile = mkstemps(iconPathBuffer, strlen(".png"));
if (tempIconFile == -1) {
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
} else {
close(tempIconFile);
NSNumber *pixelWidth = properties[(const NSString *)kCGImagePropertyPixelWidth];
NSNumber *pixelHeight = properties[(const NSString *)kCGImagePropertyPixelHeight];
tempIconDestinationPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:iconPathBuffer length:strlen(iconPathBuffer)];
// If we don't find a 32x32 image representation, then we don't provide an icon
// Don't try to make up with it by eg: converting an image representation to this size
// The app developer should be providing the icon representation.
// The authorization API may not take other size dimensions.
NSNumber *targetDimension = @32;
if ([pixelWidth isKindOfClass:[NSNumber class]] && [pixelHeight isKindOfClass:[NSNumber class]] && [pixelWidth isEqualToNumber:targetDimension] && [pixelHeight isEqualToNumber:targetDimension]) {
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
// a) no spaces in the path (SU/NSFileManager fails here)
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here)
// These limitations only apply to older systems (eg: macOS 10.8)
// The file also needs to be placed in a system readable place such as /tmp
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
char pathBuffer[] = "/tmp/XXXXXX.png";
int tempIconFile = mkstemps(pathBuffer, strlen(".png"));
if (tempIconFile == -1) {
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
if (tempIconDestinationPath != nil) {
if (![pngData writeToFile:tempIconDestinationPath atomically:NO]) {
SULog(SULogLevelError, @"Failed to write icon image data to %@", tempIconDestinationPath);
} else {
close(tempIconFile);
iconAuthorizationItem.valueLength = strlen(iconPathBuffer);
iconAuthorizationItem.value = iconPathBuffer;
NSString *path = [[NSString alloc] initWithUTF8String:pathBuffer];
tempIconDestinationURL = [NSURL fileURLWithPath:path];
CGImageDestinationRef imageDestination = NULL;
if (@available(macOS 11, *)) {
CFStringRef uti = (__bridge CFStringRef)[UTTypePNG identifier];
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, uti, 1, NULL);
}
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
else
{
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, kUTTypePNG, 1, NULL);
}
#endif
if (imageDestination != NULL) {
CGImageDestinationAddImageFromSource(imageDestination, imageSource, imageIndex, (CFDictionaryRef)@{});
if (CGImageDestinationFinalize(imageDestination)) {
iconAuthorizationItem.valueLength = strlen(pathBuffer);
iconAuthorizationItem.value = pathBuffer;
authorizationEnvironment.count = 1;
authorizationEnvironment.items = &iconAuthorizationItem;
}
CFRelease(imageDestination);
}
authorizationEnvironment.count = 1;
authorizationEnvironment.items = &iconAuthorizationItem;
}
break;
}
}
CFRelease(imageSource);
}
}
#endif
// This should prompt up the authorization dialog if necessary
OSStatus copyStatus = AuthorizationCopyRights(auth, &rights, &authorizationEnvironment, flags, NULL);
@@ -263,9 +244,11 @@
}
}
if (tempIconDestinationURL != nil) {
[fileManager removeItemAtURL:tempIconDestinationURL error:NULL];
#if FETCH_BUNDLE_ICON_FOR_AUTH
if (tempIconDestinationPath != nil) {
[[NSFileManager defaultManager] removeItemAtPath:tempIconDestinationPath error:NULL];
}
#endif
}
Boolean submittedJob = false;
@@ -414,38 +397,9 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
}
// Note: do not pass untrusted information such as paths to the installer and progress agent tools, when we can find them ourselves here
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterIdentifier mainBundleName:(NSString *)mainBundleName installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
{
dispatch_async(dispatch_get_main_queue(), ^{
if (completionHandler == NULL) {
SULog(SULogLevelError, @"Error: Failed to retrieve completionHandler (nil)");
return;
}
if (hostBundlePath == nil) {
SULog(SULogLevelError, @"Error: Failed to retrieve hostBundlePath (nil)");
completionHandler(SUInstallerLauncherFailure, NO);
return;
}
if (updaterIdentifier == nil) {
SULog(SULogLevelError, @"Error: Failed to retrieve updaterIdentifier (nil)");
completionHandler(SUInstallerLauncherFailure, NO);
return;
}
if (mainBundleName == nil) {
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundleName (nil)");
completionHandler(SUInstallerLauncherFailure, NO);
return;
}
if (installationType == nil) {
SULog(SULogLevelError, @"Error: Failed to retrieve installationType (nil)");
completionHandler(SUInstallerLauncherFailure, NO);
return;
}
// We could do a sort of preflight Authorization test instead of testing if we are running as root,
// but I think this is not necessarily a better approach. We have to chown() the launcher cache directory later on,
// and that is not necessarily related to a preflight test. It's more related to being ran under a root / different user from the active GUI session
@@ -575,7 +529,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
return;
}
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:iconBundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory authorizationPrompt:authorizationPrompt inSystemDomain:inSystemDomain rootUser:rootUser];
BOOL submittedProgressTool = NO;
if (installerStatus == SUInstallerLauncherSuccess) {
@@ -11,6 +11,6 @@
@protocol SUInstallerLauncherProtocol
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier mainBundleName:(NSString *)mainBundleName installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
@end
-23
View File
@@ -8,8 +8,6 @@
#import <Foundation/Foundation.h>
#import "SUInstallerLauncher.h"
#import "SULog.h"
#import "SUCodeSigningVerifier.h"
@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
@end
@@ -19,27 +17,6 @@
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
// This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
// Validate connection of clients to avoid any client from using the service.
// This is a policy, not a security critical enforcement.
{
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options: SUValidateConnectionOptionDefault error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
case SUValidateConnectionStatusSetNoRequirementSuccess:
break;
case SUValidateConnectionStatusAPIFailure:
case SUValidateConnectionStatusCodeSigningRequirementFailure:
case SUValidateConectionNoSupportedValidationMethodFailure:
SULog(SULogLevelError, @"Error: Installer XPC Service is rejecting new connection due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
[newConnection invalidate];
return NO;
}
}
// Configure the connection.
// First, set the interface that the exported object implements.
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerLauncherProtocol)];
+3 -3
View File
@@ -2,10 +2,10 @@
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.7.3"
let version = "2.7.1"
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
let tag = "2.7.3"
let checksum = "2e0bf15ae74c13e7b16b76e34ba56fe3a44683e35473298225f4a2a2c274329a"
let tag = "2.7.1"
let checksum = "3b9d424d79b1f3453cc44d23c3b0105bdff1298f5321aad8722f98b9149d5e95"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

+64
View File
@@ -0,0 +1,64 @@
{
"fill" : {
"automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
},
"groups" : [
{
"layers" : [
{
"fill-specializations" : [
{
"value" : {
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
}
},
{
"appearance" : "dark",
"value" : {
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
}
}
],
"glass" : true,
"hidden" : false,
"image-name" : "sparkles.png",
"name" : "sparkles",
"position" : {
"scale" : 1.15,
"translation-in-points" : [
0,
0
]
}
},
{
"glass" : true,
"hidden" : false,
"image-name" : "circular_arrow.png",
"name" : "circular_arrow",
"position" : {
"scale" : 1.25,
"translation-in-points" : [
0,
0
]
}
}
],
"shadow" : {
"kind" : "neutral",
"opacity" : 0.5
},
"translucency" : {
"enabled" : true,
"value" : 0.5
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "2.7.3"
s.version = "2.7.1"
s.summary = "A software update framework for macOS"
s.description = "Sparkle is an easy-to-use software update framework for macOS."
s.homepage = "https://sparkle-project.org"
+8 -28
View File
@@ -37,7 +37,6 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; };
142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */; };
@@ -106,10 +105,8 @@
61EF67560E25B58D00F754E0 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
61EF67590E25C5B400F754E0 /* SUHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 61EF67580E25C5B400F754E0 /* SUHost.h */; };
654F352529B1548700B10EEB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 654F352629B154AE00B10EEB /* ImageIO.framework */; };
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55C14F31136EFC2400649790 /* SystemConfiguration.framework */; };
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 724BB3B51D35AAC3005D534A /* ServiceManagement.framework */; };
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */; };
72045CE026FEE535004F96E5 /* Downloader.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 726E07EF1CAF37BD001A286B /* Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -146,10 +143,6 @@
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */; };
720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */; };
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */; };
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B87F1D456A8500CB5CED /* SUBundleIcon.h */; };
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 72162B071C82C9600013C1C5 /* SULocalizations.h */; };
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */; };
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
@@ -184,6 +177,7 @@
722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
722FB7E5260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7230BCDD2E22E2BC00B71297 /* Images.xcassets */; };
72316BD31E0DA8430039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */; };
@@ -315,6 +309,7 @@
7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E4992648F7C00088C213 /* SPUUserUpdateState.m */; };
726B20612CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */; };
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */ = {isa = PBXBuildFile; fileRef = 726DF88D1C84277500188804 /* SPUUserUpdateState.h */; settings = {ATTRIBUTES = (Public, ); }; };
726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */; };
726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
@@ -354,9 +349,6 @@
728ED34C277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
729051E41DC82AC0003DEA7F /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
7290BF2F2E5A5AFA00D75022 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
7290BF302E5A5B0F00D75022 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
7290BF312E5A5B2F00D75022 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
729924941DF4A45000DBCDF5 /* SUUpdateValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */; };
729F7EAC27366353004592DC /* test-links.xml in Resources */ = {isa = PBXBuildFile; fileRef = 729F7EAB27366353004592DC /* test-links.xml */; };
@@ -490,7 +482,6 @@
EA1E287022B66621004AA304 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
EA1E287922B666EB004AA304 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E287822B666EB004AA304 /* main.swift */; };
EA1E287E22B66705004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */; };
F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */; };
FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */; };
@@ -925,7 +916,6 @@
0580A0572C0D3B9200FE836A /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
1420DF4F196247F900203BB0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = "<group>"; };
14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = "<group>"; };
14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = "<group>"; };
@@ -1057,8 +1047,6 @@
720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterCycle.h; sourceTree = "<group>"; };
720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterCycle.m; sourceTree = "<group>"; };
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; sourceTree = "<group>"; };
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBundleIcon.h; sourceTree = "<group>"; };
7214B8801D456A8500CB5CED /* SUBundleIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBundleIcon.m; sourceTree = "<group>"; };
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallationType.h; sourceTree = "<group>"; };
72162B071C82C9600013C1C5 /* SULocalizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULocalizations.h; sourceTree = "<group>"; };
721652671D3C8FED00FD13D8 /* SUInstallerLauncherStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerLauncherStatus.h; path = InstallerLauncher/SUInstallerLauncherStatus.h; sourceTree = SOURCE_ROOT; };
@@ -1093,9 +1081,11 @@
722FB7CA1DD69897001D40CE /* ConfigSwift.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwift.xcconfig; sourceTree = "<group>"; };
722FB7E3260EE53F00EB571C /* SUNormalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUNormalization.h; sourceTree = "<group>"; };
722FB7E4260EE53F00EB571C /* SUNormalization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUNormalization.m; sourceTree = "<group>"; };
7230BCDD2E22E2BC00B71297 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
72316BD11E0DA8430039EFD9 /* SUUnarchiverNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUnarchiverNotifier.h; path = Autoupdate/SUUnarchiverNotifier.h; sourceTree = SOURCE_ROOT; };
72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUnarchiverNotifier.m; path = Autoupdate/SUUnarchiverNotifier.m; sourceTree = SOURCE_ROOT; };
7235B75E29DFC0120081FE4E /* make-xcframework.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "make-xcframework.sh"; sourceTree = "<group>"; };
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Sparkle.private.modulemap; sourceTree = "<group>"; };
723ABCD7259A9A9D00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Sparkle.strings; sourceTree = "<group>"; };
723ABD37259A9BA500BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdateAlert.xib; sourceTree = "<group>"; };
723ABD4C259A9BB900BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
@@ -1583,7 +1573,6 @@
files = (
721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */,
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */,
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1612,11 +1601,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */,
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */,
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */,
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */,
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */,
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */,
654F352529B1548700B10EEB /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1625,7 +1613,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7290BF312E5A5B2F00D75022 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1828,10 +1815,10 @@
61C268090E2DB5D000175E6C /* LICENSE */,
14732BC11960F3B200593899 /* Makefile */,
147D6D9E1B66DC3C006607AB /* CheckLocalizations.swift */,
1420DF4F196247F900203BB0 /* Images.xcassets */,
14732BBC1960EFB500593899 /* README.markdown */,
14732BB91960EEEE00593899 /* SampleAppcast.xml */,
1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */,
7230BCDD2E22E2BC00B71297 /* Images.xcassets */,
);
path = Resources;
sourceTree = "<group>";
@@ -1849,6 +1836,7 @@
isa = PBXGroup;
children = (
720767D11E2EB86200F9A850 /* AppKitPrevention.h */,
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */,
61299B3909CB055000B7442F /* Appcast Support */,
55C14BD5136EEFD000649790 /* Autoupdate */,
72F9EBE41D519425004AC8B6 /* Deprecated */,
@@ -2065,8 +2053,6 @@
721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */,
729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */,
729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */,
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */,
7214B8801D456A8500CB5CED /* SUBundleIcon.m */,
61299A5B09CA6D4500B7442F /* SUConstants.h */,
61299A5F09CA6EB100B7442F /* SUConstants.m */,
55E6F33219EC9F6C00005E76 /* SUErrors.h */,
@@ -2603,7 +2589,6 @@
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */,
725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */,
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */,
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */,
14652F8419A978C200959E44 /* SUExport.h in Headers */,
7267E5E51D3D90AA00D1BF90 /* SUFileManager.h in Headers */,
@@ -3225,8 +3210,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1420DF50196247F900203BB0 /* Images.xcassets in Resources */,
723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */,
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */,
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
@@ -3504,7 +3489,6 @@
5AA89BA623FE276A0094DAB8 /* SUSignatures.m in Sources */,
7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */,
720595EF1D700568000572E8 /* SUApplicationInfo.m in Sources */,
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */,
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */,
721C245E1CB757DE005440CB /* SUConstants.m in Sources */,
7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */,
@@ -3545,13 +3529,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
7290BF302E5A5B0F00D75022 /* SUCodeSigningVerifier.m in Sources */,
72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */,
726E07B41CAF08D6001A286B /* main.m in Sources */,
721D8A7B1D4963190032E472 /* SPULocalCacheDirectory.m in Sources */,
7267E5E11D3D901600D1BF90 /* SPUMessageTypes.m in Sources */,
5AA89BA523FE27660094DAB8 /* SUSignatures.m in Sources */,
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */,
726E07BF1CAF0C6C001A286B /* SUConstants.m in Sources */,
7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
726E07B21CAF08D6001A286B /* SUInstallerLauncher.m in Sources */,
@@ -3563,7 +3545,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
7290BF2F2E5A5AFA00D75022 /* SUCodeSigningVerifier.m in Sources */,
723B5DA71CF7AB0100365F95 /* main.m in Sources */,
72E539121D68C3FA0092CE5E /* SPUDownloadData.m in Sources */,
723B5DA91CF7AB0100365F95 /* SPUDownloader.m in Sources */,
@@ -3683,7 +3664,6 @@
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */,
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */,
725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */,
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */,
72DBA37F1D62C23E002594A8 /* SUCodeSigningVerifier.m in Sources */,
61299A6009CA6EB100B7442F /* SUConstants.m in Sources */,
7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
+188 -171
View File
@@ -1,213 +1,230 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.9" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.9"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SUUpdateAlert">
<connections>
<outlet property="_automaticallyInstallUpdatesButton" destination="117" id="IBi-aO-qkM"/>
<outlet property="_descriptionField" destination="101" id="JkK-Xy-kns"/>
<outlet property="_installButton" destination="76" id="GVS-sG-rgG"/>
<outlet property="_laterButton" destination="22" id="dk6-u6-yYI"/>
<outlet property="_releaseNotesBoxView" destination="89" id="kwH-2g-hlh"/>
<outlet property="_releaseNotesContainerView" destination="fKC-QA-GZa" id="j3k-Pl-zNb"/>
<outlet property="_skipButton" destination="23" id="PPe-jC-Pvc"/>
<outlet property="_automaticallyInstallUpdatesButton" destination="xYY-q8-ZyN" id="yjl-z6-hNj"/>
<outlet property="_installButton" destination="sUq-y0-gA3" id="hQ1-WX-CFo"/>
<outlet property="_laterButton" destination="uGk-Ks-HQR" id="QLX-rC-OVd"/>
<outlet property="_releaseNotesBoxView" destination="ikY-gb-bgB" id="8ep-uz-XVh"/>
<outlet property="_releaseNotesContentView" destination="YbC-Ky-Aam" id="nng-CZ-Hwe"/>
<outlet property="_skipButton" destination="nRH-TL-zdL" id="1wh-qo-iMh"/>
<outlet property="_stackView" destination="61v-5k-OXp" id="1rj-X0-yNf"/>
<outlet property="_titleView" destination="cGD-9V-Gym" id="4EE-yh-bV0"/>
<outlet property="window" destination="5" id="69"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window identifier="SUUpdateAlert" title="Software Update" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
<window identifier="SUUpdateAlert" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" id="5" userLabel="Update Alert (release notes)">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="746" y="229" width="620" height="370"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1409"/>
<value key="minSize" type="size" width="550" height="150"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="620" height="370"/>
<rect key="contentRect" x="746" y="229" width="532" height="370"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
<value key="minSize" type="size" width="462" height="150"/>
<view key="contentView" misplaced="YES" id="6">
<rect key="frame" x="0.0" y="0.0" width="532" height="370"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="Program icon">
<rect key="frame" x="22" y="286" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" secondItem="7" secondAttribute="height" multiplier="1:1" id="7pS-Kw-VGo"/>
<constraint firstAttribute="width" priority="800" constant="64" id="QhW-E9-8Br"/>
<constraint firstAttribute="height" priority="800" constant="64" id="aXh-vN-k5u"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="168"/>
<connections>
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
</connections>
</imageView>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Version text field">
<rect key="frame" x="106" y="338" width="494" height="17"/>
<constraints>
<constraint firstAttribute="height" priority="777" constant="17" id="n8w-DR-XEM"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="169">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="titleText" id="11"/>
</connections>
</textField>
<textField focusRingType="none" horizontalHuggingPriority="350" verticalHuggingPriority="999" horizontalCompressionResistancePriority="100" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="101" userLabel="Question text field">
<rect key="frame" x="106" y="316" width="494" height="14"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="300" constant="28" id="H6E-te-Fog"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="KUO-Dw-g6s"/>
</constraints>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="174">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="descriptionText" id="103"/>
</connections>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="fKC-QA-GZa" userLabel="Container to hide release notes">
<rect key="frame" x="108" y="77" width="492" height="231"/>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61v-5k-OXp">
<rect key="frame" x="0.0" y="0.0" width="680" height="377"/>
<subviews>
<box boxType="oldStyle" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="89">
<rect key="frame" x="0.0" y="0.0" width="492" height="211"/>
<view key="contentView" id="hbB-V1-Bf6">
<rect key="frame" x="1" y="1" width="490" height="209"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="cGD-9V-Gym" userLabel="Title View">
<rect key="frame" x="0.0" y="313" width="680" height="64"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="F1L-zh-U8Z" userLabel="Program icon">
<rect key="frame" x="20" y="0.0" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="66j-dF-FGm"/>
<constraint firstAttribute="width" secondItem="F1L-zh-U8Z" secondAttribute="height" multiplier="1:1" id="OlN-VE-Lim"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="k4f-D1-7oF"/>
<connections>
<binding destination="-2" name="value" keyPath="applicationIcon" id="DAK-U8-9cN"/>
</connections>
</imageView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="UU2-7C-LCJ" userLabel="Version &amp; Question view">
<rect key="frame" x="92" y="13" width="568" height="38"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Nvn-Dp-hAH" userLabel="Version text field">
<rect key="frame" x="-2" y="22" width="572" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Version title" usesSingleLineMode="YES" id="f6r-wP-EYG">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="titleText" id="j4H-SG-IuG"/>
</connections>
</textField>
<textField focusRingType="none" verticalHuggingPriority="999" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="WdU-eY-Ta9" userLabel="Question text field">
<rect key="frame" x="-2" y="0.0" width="572" height="14"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Question" id="Jsa-P1-mWz">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="descriptionText" id="83R-0d-Obq"/>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstItem="Nvn-Dp-hAH" firstAttribute="leading" secondItem="UU2-7C-LCJ" secondAttribute="leading" id="25L-Ag-aFU"/>
<constraint firstItem="WdU-eY-Ta9" firstAttribute="top" secondItem="Nvn-Dp-hAH" secondAttribute="bottom" constant="8" id="9M6-6n-Bro"/>
<constraint firstAttribute="bottom" secondItem="WdU-eY-Ta9" secondAttribute="bottom" id="CZX-9a-gJl"/>
<constraint firstAttribute="trailing" secondItem="WdU-eY-Ta9" secondAttribute="trailing" id="WZm-Si-7IJ"/>
<constraint firstAttribute="trailing" secondItem="Nvn-Dp-hAH" secondAttribute="trailing" id="aGK-sK-0uf"/>
<constraint firstItem="Nvn-Dp-hAH" firstAttribute="top" secondItem="UU2-7C-LCJ" secondAttribute="top" id="kgy-Vi-Ea3"/>
<constraint firstItem="WdU-eY-Ta9" firstAttribute="leading" secondItem="Nvn-Dp-hAH" secondAttribute="leading" id="vtl-AO-H0b"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="F1L-zh-U8Z" firstAttribute="top" secondItem="cGD-9V-Gym" secondAttribute="top" id="29T-yc-60G"/>
<constraint firstAttribute="bottom" secondItem="F1L-zh-U8Z" secondAttribute="bottom" id="72d-EQ-SSU"/>
<constraint firstItem="F1L-zh-U8Z" firstAttribute="leading" secondItem="cGD-9V-Gym" secondAttribute="leading" constant="20" symbolic="YES" id="Mg4-Zl-nWT"/>
<constraint firstItem="UU2-7C-LCJ" firstAttribute="centerY" secondItem="F1L-zh-U8Z" secondAttribute="centerY" id="WwT-ww-Twu"/>
<constraint firstAttribute="trailing" secondItem="UU2-7C-LCJ" secondAttribute="trailing" constant="20" symbolic="YES" id="eyz-xg-wVZ"/>
<constraint firstItem="UU2-7C-LCJ" firstAttribute="leading" secondItem="F1L-zh-U8Z" secondAttribute="trailing" constant="8" symbolic="YES" id="pUk-FW-06K"/>
</constraints>
</customView>
<box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ikY-gb-bgB" userLabel="Release Notes Box">
<rect key="frame" x="20" y="70" width="640" height="235"/>
<view key="contentView" id="YbC-Ky-Aam" userLabel="Release Notes Content View">
<rect key="frame" x="1" y="1" width="638" height="233"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="pvn-8k-9Ev"/>
<constraint firstAttribute="height" constant="235" placeholder="YES" id="MvR-0E-bDS"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="999" constant="200" id="g5s-9E-8SF"/>
</constraints>
<font key="titleFont" size="11" name="LucidaGrande"/>
<connections>
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="164">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</box>
<textField focusRingType="none" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="17">
<rect key="frame" x="-2" y="217" width="88" height="14"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Dg5-0U-d14" userLabel="Options view">
<rect key="frame" x="0.0" y="48" width="680" height="14"/>
<subviews>
<button verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="xYY-q8-ZyN">
<rect key="frame" x="19" y="-1" width="316" height="16"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="fPh-Q9-vLr">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="self.updaterSettings.automaticallyDownloadsUpdates" id="ckv-Jc-M6i"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="100" constant="100" id="gkn-FW-9aC"/>
<constraint firstItem="xYY-q8-ZyN" firstAttribute="top" secondItem="Dg5-0U-d14" secondAttribute="top" id="9SN-p3-BTb"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xYY-q8-ZyN" secondAttribute="trailing" constant="20" symbolic="YES" id="CQ6-qx-HSc"/>
<constraint firstAttribute="bottom" secondItem="xYY-q8-ZyN" secondAttribute="bottom" id="PoC-Dx-8Jc"/>
<constraint firstItem="xYY-q8-ZyN" firstAttribute="leading" secondItem="Dg5-0U-d14" secondAttribute="leading" constant="20" symbolic="YES" id="wWK-qz-vla"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Release Notes:" usesSingleLineMode="YES" id="170">
<font key="font" metaFont="smallSystemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="72">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstItem="89" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="6" id="1H8-33-yNF"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="17" secondAttribute="trailing" constant="408" id="5ym-81-wbN"/>
<constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" id="Bv8-Jz-SXd"/>
<constraint firstAttribute="bottom" secondItem="89" secondAttribute="bottom" id="E4h-VA-0Xt"/>
<constraint firstItem="17" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="top" id="P9G-6a-y7j"/>
<constraint firstItem="89" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="e5T-q1-kq1"/>
<constraint firstItem="17" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="tFH-k0-O7I"/>
</constraints>
</customView>
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="22">
<rect key="frame" x="342" y="19" width="126" height="24"/>
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="iUh-Md-dRX" userLabel="Choices view">
<rect key="frame" x="0.0" y="0.0" width="680" height="40"/>
<subviews>
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="uGk-Ks-HQR">
<rect key="frame" x="395" y="13" width="137" height="32"/>
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="G8s-oM-9gf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<connections>
<action selector="remindMeLater:" target="-2" id="34"/>
</connections>
</button>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="23">
<rect key="frame" x="109" y="19" width="129" height="24"/>
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="172">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="skipThisVersion:" target="-2" id="33"/>
</connections>
</button>
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="76">
<rect key="frame" x="480" y="19" width="120" height="24"/>
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="173">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="90" id="8FZ-lB-M5G"/>
</constraints>
<accessibility identifier="SPUUserUpdateChoiceDismiss"/>
<connections>
<action selector="remindMeLater:" target="-2" id="108-L6-c2e"/>
</connections>
</button>
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="sUq-y0-gA3">
<rect key="frame" x="530" y="13" width="137" height="32"/>
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="IIY-s3-hkz">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="Gsu-Ko-2TJ"/>
</constraints>
<accessibility identifier="SPUUserUpdateChoiceInstall"/>
<connections>
<action selector="installUpdate:" target="-2" id="8TR-Ao-zjt"/>
</connections>
</button>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="nRH-TL-zdL">
<rect key="frame" x="13" y="13" width="139" height="32"/>
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="kVE-pO-gl0">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<accessibility identifier="SPUUserUpdateChoiceSkip"/>
<connections>
<action selector="skipThisVersion:" target="-2" id="cXW-0s-yIT"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="uGk-Ks-HQR" firstAttribute="baseline" secondItem="sUq-y0-gA3" secondAttribute="baseline" id="7hK-NU-1pL"/>
<constraint firstItem="nRH-TL-zdL" firstAttribute="top" secondItem="iUh-Md-dRX" secondAttribute="top" id="Cwv-ha-SRC"/>
<constraint firstItem="uGk-Ks-HQR" firstAttribute="width" secondItem="sUq-y0-gA3" secondAttribute="width" id="EWD-pD-s8E"/>
<constraint firstItem="sUq-y0-gA3" firstAttribute="leading" secondItem="uGk-Ks-HQR" secondAttribute="trailing" constant="12" symbolic="YES" id="GNV-C1-iwM"/>
<constraint firstItem="uGk-Ks-HQR" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="nRH-TL-zdL" secondAttribute="trailing" constant="12" symbolic="YES" id="JIK-Ix-vKz"/>
<constraint firstItem="nRH-TL-zdL" firstAttribute="width" relation="greaterThanOrEqual" secondItem="sUq-y0-gA3" secondAttribute="width" id="ZG6-hO-ueO"/>
<constraint firstAttribute="bottom" secondItem="nRH-TL-zdL" secondAttribute="bottom" constant="20" symbolic="YES" id="hi9-TB-2I7"/>
<constraint firstAttribute="trailing" secondItem="sUq-y0-gA3" secondAttribute="trailing" constant="20" symbolic="YES" id="qFp-Lz-Zct"/>
<constraint firstItem="nRH-TL-zdL" firstAttribute="baseline" secondItem="uGk-Ks-HQR" secondAttribute="baseline" id="u6y-Qc-AKF"/>
<constraint firstItem="nRH-TL-zdL" firstAttribute="leading" secondItem="iUh-Md-dRX" secondAttribute="leading" constant="20" symbolic="YES" id="z77-Ds-Apc"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="N94-uf-6oP"/>
<constraint firstItem="iUh-Md-dRX" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="9Qm-jR-l2n"/>
<constraint firstAttribute="trailing" secondItem="cGD-9V-Gym" secondAttribute="trailing" id="Hzm-0Q-nAs"/>
<constraint firstAttribute="trailing" secondItem="Dg5-0U-d14" secondAttribute="trailing" id="QtQ-Z7-Sy3"/>
<constraint firstItem="cGD-9V-Gym" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="fKq-7a-nM1"/>
<constraint firstAttribute="trailing" secondItem="iUh-Md-dRX" secondAttribute="trailing" id="fly-DF-xg8"/>
<constraint firstAttribute="trailing" secondItem="ikY-gb-bgB" secondAttribute="trailing" constant="20" symbolic="YES" id="gyA-Og-04f"/>
<constraint firstItem="ikY-gb-bgB" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" constant="20" symbolic="YES" id="zdI-MC-GvM"/>
<constraint firstItem="Dg5-0U-d14" firstAttribute="leading" secondItem="61v-5k-OXp" secondAttribute="leading" id="zjt-Mp-9hy"/>
</constraints>
<connections>
<action selector="installUpdate:" target="-2" id="77"/>
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="117">
<rect key="frame" x="109" y="55" width="313" height="14"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
</constraints>
<connections>
<binding destination="93" name="value" keyPath="values.SUAutomaticallyUpdate" id="135"/>
</connections>
</button>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
<constraints>
<constraint firstItem="10" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="22" id="2ef-4I-Il3"/>
<constraint firstAttribute="trailing" secondItem="fKC-QA-GZa" secondAttribute="trailing" constant="20" id="406-Cn-C5d"/>
<constraint firstItem="101" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="7XS-9C-U6N"/>
<constraint firstItem="23" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="12" id="CBk-cX-pk2"/>
<constraint firstItem="22" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="23" secondAttribute="trailing" constant="12" id="EeC-NR-NYg"/>
<constraint firstAttribute="trailing" secondItem="76" secondAttribute="trailing" constant="20" id="GdV-QF-Cdi"/>
<constraint firstItem="76" firstAttribute="width" secondItem="22" secondAttribute="width" multiplier="0.8" priority="110" id="I8t-73-gX0"/>
<constraint firstItem="117" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="bottom" priority="900" constant="8" id="M7E-UY-nWx"/>
<constraint firstItem="fKC-QA-GZa" firstAttribute="top" secondItem="101" secondAttribute="bottom" constant="8" id="Mbz-C0-6Cx"/>
<constraint firstItem="117" firstAttribute="leading" secondItem="23" secondAttribute="leading" id="Nm4-V1-7X0"/>
<constraint firstItem="23" firstAttribute="leading" secondItem="117" secondAttribute="leading" id="OXY-8u-ljs"/>
<constraint firstItem="23" firstAttribute="leading" secondItem="10" secondAttribute="leading" constant="1" id="RRB-n5-xid"/>
<constraint firstItem="76" firstAttribute="leading" secondItem="22" secondAttribute="trailing" constant="12" id="VQk-Ut-ggj"/>
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" id="alH-AL-5RD"/>
<constraint firstItem="22" firstAttribute="baseline" secondItem="23" secondAttribute="baseline" id="ayY-6b-JGg"/>
<constraint firstItem="76" firstAttribute="baseline" secondItem="22" secondAttribute="baseline" id="dIR-3Q-wQx"/>
<constraint firstAttribute="bottom" secondItem="76" secondAttribute="bottom" constant="19" id="gcR-Kl-Wlq"/>
<constraint firstAttribute="trailing" secondItem="101" secondAttribute="trailing" constant="22" id="k7p-HC-x7i"/>
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="23" secondAttribute="leading" constant="-1" id="nVW-Qt-8JE"/>
<constraint firstAttribute="trailing" secondItem="10" secondAttribute="trailing" constant="22" id="oQx-Oc-awc"/>
<constraint firstItem="76" firstAttribute="width" secondItem="23" secondAttribute="width" priority="109" id="pLI-z3-P0b"/>
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="qQ9-OJ-06z"/>
<constraint firstItem="101" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" id="r7Q-z5-jkx"/>
<constraint firstItem="10" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="rXd-o0-WQQ"/>
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="22" id="zSE-lw-Ggj"/>
<constraint firstAttribute="bottom" secondItem="61v-5k-OXp" secondAttribute="bottom" id="5XV-te-jdS"/>
<constraint firstItem="61v-5k-OXp" firstAttribute="leading" secondItem="6" secondAttribute="leading" id="ISL-gI-Nqo"/>
<constraint firstItem="61v-5k-OXp" firstAttribute="top" secondItem="6" secondAttribute="top" id="Xwp-R6-5u2"/>
<constraint firstAttribute="trailing" secondItem="61v-5k-OXp" secondAttribute="trailing" id="pAA-qg-9qi"/>
</constraints>
</view>
<connections>
<outlet property="delegate" destination="-2" id="50"/>
</connections>
<point key="canvasLocation" x="466" y="290"/>
<point key="canvasLocation" x="602" y="352"/>
</window>
<userDefaultsController representsSharedInstance="YES" id="93" userLabel="Shared Defaults"/>
</objects>
+3
View File
@@ -198,3 +198,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "You’re up to date!";
/* Software Update title/label */
"Software Update" = "Software Update";
+31 -6
View File
@@ -230,11 +230,40 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
// We will want to terminate those apps and observe their pids, but we will only do this if we don't find any regular matches
NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = [[NSMutableArray alloc] init];
BOOL needsToHandleImproperBundles;
if (@available(macOS 16, *)) {
needsToHandleImproperBundles = NO;
} else {
needsToHandleImproperBundles = YES;
}
for (NSRunningApplication *runningApplication in runningApplications) {
// Comparing the URLs hasn't worked well for me in practice, so I'm comparing the file paths instead
NSString *candidatePath = runningApplication.bundleURL.URLByResolvingSymlinksInPath.path;
if (candidatePath != nil) {
NSArray<NSString *> *candidatePathComponents = candidatePath.pathComponents;
if (needsToHandleImproperBundles) {
// Workaround cases where macOS appends Contents/MacOS/<executable> to the bundle path which can happen in corner cases (eg: mishandled bundles or helper executables).
// This may happen with app bundles which have wrapper/tramopline executables that spawn the main executable
// https://github.com/sparkle-project/Sparkle/issues/2725
NSUInteger candidatePathComponentsCount = candidatePathComponents.count;
// > 3 is fine instead of >= 3 because there should be another parent path component for the bundle
if (candidatePathComponentsCount > 3 && [candidatePathComponents[candidatePathComponentsCount - 3] isEqualToString:@"Contents"] && [candidatePathComponents[candidatePathComponentsCount - 2] isEqualToString:@"MacOS"]) {
// Lastly verify if the bundle is not actually a directory
// Note the IO check is the last check for this corner case
// This ensures it's not an ordinary helper app that happens to be inside another app bundle.
BOOL candidatePathIsDir = YES;
if ([[NSFileManager defaultManager] fileExistsAtPath:candidatePath isDirectory:&candidatePathIsDir] && !candidatePathIsDir) {
NSMutableArray<NSString *> *trimmedBundlePath = [candidatePathComponents mutableCopy];
[trimmedBundlePath removeObjectsInRange:NSMakeRange(candidatePathComponentsCount - 3, 3)];
candidatePathComponents = trimmedBundlePath;
}
}
}
if ([candidatePathComponents isEqualToArray:bundlePathComponents]) {
[matchedRunningApplications addObject:runningApplication];
} else if (matchedRunningApplications.count == 0 && candidatePathComponents.count > 0 && bundlePathComponents.count > 0) {
@@ -291,9 +320,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
NSRunningApplication *firstRunningApplication = runningApplications.firstObject;
BOOL targetDead = (firstRunningApplication == nil || firstRunningApplication.terminated);
if (reply != NULL) {
reply(targetDead);
}
reply(targetDead);
self->_repliedToRegistration = YES;
self->_applicationBundle = applicationBundle;
@@ -331,9 +358,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
#endif
if (self->_targetRunningApplication != nil && self->_terminationCompletionHandler == nil) {
if (self->_targetRunningApplication.terminated) {
if (completionHandler != NULL) {
completionHandler();
}
completionHandler();
} else {
self->_terminationCompletionHandler = [completionHandler copy];
+1 -1
View File
@@ -96,7 +96,7 @@
{
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO];
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
+1 -3
View File
@@ -81,9 +81,7 @@
if (strongSelf != nil && !strongSelf->_retrievedDownloadResult && !strongSelf->_cleaningUp) {
strongSelf->_downloader = nil;
// We can't enforce com.apple.security.network.client == NO or it being absent for sandboxed clients,
// but we should warn about it anyway
SULog(SULogLevelError, @"Error: Connection to update downloader was invalidated. If your app is not sandboxed or has com.apple.security.network.client set to YES, please remove %@ from your Info.plist. Otherwise please check Console logs for "@DOWNLOADER_NAME" if there are any additional details.", SUEnableDownloaderServiceKey);
SULog(SULogLevelError, @"Connection to update downloader was invalidated");
NSDictionary *userInfo =
@{
+23 -11
View File
@@ -167,16 +167,13 @@
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
BOOL usingInstallerService;
#if INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED
if (SPUXPCServiceIsEnabled(SUEnableInstallerConnectionServiceKey)) {
_installerConnection = [[SUXPCInstallerConnection alloc] initWithDelegate:self];
usingInstallerService = YES;
} else
#endif
{
_installerConnection = [[SUInstallerConnection alloc] initWithDelegate:self remote:NO];
usingInstallerService = NO;
}
__weak __typeof__(self) weakSelf = self;
@@ -184,11 +181,9 @@
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil && strongSelf->_installerConnection != nil && !strongSelf->_aborted) {
NSString *impactedTools = usingInstallerService ? (@SPARKLE_RELAUNCH_TOOL_NAME" and "@INSTALLER_LAUNCHER_NAME) : @SPARKLE_RELAUNCH_TOOL_NAME;
NSDictionary *genericUserInfo = @{
NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while running the updater. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
NSLocalizedFailureReasonErrorKey:[NSString stringWithFormat:@"The remote port connection was invalidated from the updater. If your application is sandboxed, please ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/ . Otherwise if %@ %@ not adhoc signed, your app must be signed with a matching team ID. For additional details, check Console logs for %@", impactedTools, (usingInstallerService ? @"are" : @"is"), impactedTools]
NSLocalizedFailureReasonErrorKey:@"The remote port connection was invalidated from the updater. For additional details, please check Console logs for "@SPARKLE_RELAUNCH_TOOL_NAME". If your application is sandboxed, please also ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/"
};
[strongSelf _reportInstallerError:strongSelf->_installerError genericErrorCode:SUInstallationError genericUserInfo:genericUserInfo];
@@ -413,8 +408,7 @@
if (!retrievedLaunchStatus) {
#pragma clang diagnostic pop
NSError *error =
[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while connecting to the installer. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed, please remove or disable %@ in your app's Info.plist. Otherwise please check Console logs for "@INSTALLER_LAUNCHER_NAME" and "@SPARKLE_RELAUNCH_TOOL_NAME" processes if there are additional details.", SUEnableInstallerLauncherServiceKey]}];
[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while connecting to the installer. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil) }];
completionHandler(error);
@@ -447,10 +441,26 @@
NSString *installationType = _updateItem.installationType;
assert(installationType != nil);
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:[NSBundle mainBundle]];
// We use SUHost.name property, so an application
// The installer launcher could be in a XPC service, so we don't want to do localization in there
// Make sure the authorization prompt reflects whether or not the updater is updating itself, or
// if the updater is updating another application. We use SUHost.name property, so an application
// or Sparkle helper application can override its name with SUBundleName key
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:[NSBundle mainBundle]];
NSString *mainBundleName = mainBundleHost.name;
NSString *hostName = _host.name;
// Changing this authorization prompt is a little complicated because the
// Auth database retains and caches the right we use, and there isn't a good way
// of updating the prompt. See code in SUInstallerLauncher.m
// For this reason, we don't provide localized strings for this prompt yet
// (and I believe, the authorization framework has a different way of specifying localizations..)
NSString *authorizationPrompt;
if ([mainBundleName isEqualToString:hostName]) {
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update.", hostName];
} else {
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update %2$@.", mainBundleName, hostName];
}
NSString *mainBundleIdentifier;
{
@@ -458,7 +468,9 @@
mainBundleIdentifier = (bundleIdentifier == nil) ? mainBundleName : bundleIdentifier;
}
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath updaterIdentifier:mainBundleIdentifier mainBundleName:mainBundleName installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
NSString *iconBundlePath = mainBundleHost.bundlePath;
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath iconBundlePath:iconBundlePath updaterIdentifier:mainBundleIdentifier authorizationPrompt:authorizationPrompt installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
dispatch_async(dispatch_get_main_queue(), ^{
#if INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED
retrievedLaunchStatus = YES;
+2
View File
@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
It also allows hooking up the updater's and user driver's delegates.
If you need more control over what bundle you want to update, or you want to provide a custom user interface (via `SPUUserDriver`), please use `SPUUpdater` directly instead.
This class must be used on the main thread.
*/
SU_EXPORT @interface SPUStandardUpdaterController : NSObject
{
+5 -5
View File
@@ -497,7 +497,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Ready to Install", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:1.0 statusText:nil];
[_statusController setProgressValue:1.0]; // Fill the bar.
[_statusController setButtonEnabled:YES];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES accessibilityIdentifier:@"SUStatusInstallAndRelaunch"];
}
- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
@@ -538,10 +538,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, sparkleBundle, nil), [_host name]] centerPointValue:nil minimizable:NO closable:NO];
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil) centerPointValue:nil minimizable:NO closable:NO];
[[_checkingController window] center]; // Force the checking controller to load its window.
[_checkingController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Checking for updates…", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:0.0 statusText:nil];
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO];
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
// For background applications, obtain focus.
// Useful if the update check is requested from another app like System Preferences.
@@ -781,7 +781,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Downloading update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
[_statusController setProgressValue:0.0];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
_bytesDownloaded = 0;
}
@@ -841,7 +841,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Extracting update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
[_statusController setProgressValue:0.0];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO];
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
[_statusController setButtonEnabled:NO];
}
+30 -5
View File
@@ -42,6 +42,8 @@ NS_ASSUME_NONNULL_BEGIN
- `feedURL`
Please view the documentation on each of these properties for more detail if you are to configure them dynamically.
This class must be used on the main thread.
*/
SU_EXPORT @interface SPUUpdater : NSObject
@@ -96,11 +98,13 @@ SU_EXPORT @interface SPUUpdater : NSObject
If an update hasn't started, the user may be shown that a new check for updates is occurring.
If an update has already been downloaded or begun installing from a previous session, the user may be presented to install that update.
If the user is already being presented with an update, that update will be shown to the user in active focus.
If the user is already being presented with an update or update permission prompt, that notice may be shown to the user in active focus
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
This will find updates that the user has previously opted into skipping.
See `canCheckForUpdates` property which can determine when this method may be invoked.
This must be called on the main thread.
*/
- (void)checkForUpdates;
@@ -126,6 +130,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
This will not find updates that the user has opted into skipping.
This method does not do anything if there is a `sessionInProgress`.
This must be called on the main thread.
*/
- (void)checkForUpdatesInBackground;
@@ -144,13 +150,18 @@ SU_EXPORT @interface SPUUpdater : NSObject
Updates that have been skipped by the user will not be found.
This method does not do anything if there is a `sessionInProgress`.
This must be called on the main thread.
*/
- (void)checkForUpdateInformation;
/**
A property indicating whether or not updates can be checked by the user.
An update check can be made by the user when an update session isn't in progress, or when an update or its progress is being shown to the user.
An update check can be made by the user when an update session isn't in progress.
An update check can also be made when an update or its progress is being shown to the user
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
A user cannot check for updates when data (such as the feed or an update) is still being downloaded automatically in the background.
This property is suitable to use for menu item validation for seeing if `-checkForUpdates` can be invoked.
@@ -194,7 +205,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
to your app's command line arguments instead of setting this property.
The update schedule cycle will be reset in a short delay after the property's new value is set.
This is to allow reverting this property without kicking off a schedule change immediately
This is to allow reverting this property without kicking off a schedule change immediately.
This property is KVO compliant. This property must be called on the main thread.
*/
@property (nonatomic) BOOL automaticallyChecksForUpdates;
@@ -209,7 +222,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
Do not always set it on launch unless you want to ignore the user's preference.
The update schedule cycle will be reset in a short delay after the property's new value is set.
This is to allow reverting this property without kicking off a schedule change immediately
This is to allow reverting this property without kicking off a schedule change immediately.
This property is KVO compliant. This property must be called on the main thread.
*/
@property (nonatomic) NSTimeInterval updateCheckInterval;
@@ -231,6 +246,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
Hence developers shouldn't maintain an additional user default for this property.
Only set this property if the user wants to change the default via a user settings option.
Do not always set it on launch unless you want to ignore the user's preference.
This property is KVO compliant. This property must be called on the main thread.
*/
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
@@ -322,6 +339,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
A property indicating whether or not the user's system profile information is sent when checking for updates.
Setting this property will persist in the host bundle's user defaults.
This property is KVO compliant. This property must be called on the main thread.
*/
@property (nonatomic) BOOL sendsSystemProfile;
@@ -331,6 +350,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
For testing purposes, the last update check is stored in the `SULastCheckTime` key in the host bundle's user defaults.
For example, `defaults delete my-bundle-id SULastCheckTime` can be invoked to clear the last update check time and test
if update checks are automatically scheduled.
This property must be called on the main thread.
*/
@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate;
@@ -342,6 +363,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked after a short delay using `-resetUpdateCycleAfterShortDelay`. In these cases, manually resetting the update cycle is not necessary.
See also `-resetUpdateCycleAfterShortDelay` which gives the user a short delay before triggering a cycle reset.
This must be called on the main thread.
*/
- (void)resetUpdateCycle;
@@ -355,6 +378,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
no cycle reset will be done.
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked. In these cases, manually resetting the update cycle is not necessary.
This must be called on the main thread.
*/
- (void)resetUpdateCycleAfterShortDelay;
+186 -27
View File
@@ -156,6 +156,13 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (BOOL)startUpdater:(NSError * __autoreleasing *)error
{
if (![NSThread isMainThread]) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: @"-[SPUUpdater startUpdater:] must be called on the main thread]"}];
}
return NO;
}
if (_startedUpdater) {
return YES;
}
@@ -171,6 +178,8 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_startedUpdater = YES;
[self setCanCheckForUpdates:YES];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(updateAutomaticCheckSettingChanged:) name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
// Start updater on next update cycle so we make sure the application invoking the updater is ready
// This also gives the developer a cycle to check for updates before Sparkle's update cycle scheduler kicks in
dispatch_async(dispatch_get_main_queue(), ^{
@@ -421,7 +430,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_showingPermissionRequest = YES;
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:YES];
BOOL canShowUserDriverInFocusDuringPermissionPrompt = [_userDriver respondsToSelector:@selector(showUpdateInFocus)];
[self setCanCheckForUpdates:canShowUserDriverInFocusDuringPermissionPrompt];
__weak __typeof__(self) weakSelf = self;
[_userDriver showUpdatePermissionRequest:updatePermissionRequest reply:^(SUUpdatePermissionResponse *response) {
@@ -432,6 +443,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
strongSelf->_showingPermissionRequest = NO;
[strongSelf updatePermissionRequestFinishedWithResponse:response];
if (!canShowUserDriverInFocusDuringPermissionPrompt) {
[strongSelf setCanCheckForUpdates:YES];
}
// Schedule checks, but make sure we ignore the delayed call from KVO
[strongSelf resetUpdateCycle];
}
@@ -458,6 +474,10 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (NSDate *)lastUpdateCheckDate
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater lastUpdateCheckDate] must be called on the main thread.");
}
if (_updateLastCheckedDate == nil)
{
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey];
@@ -617,6 +637,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
// Sparkle internally uses _checkForUpdatesInBackground
- (void)checkForUpdatesInBackground
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdatesInBackground] can only be called on the main thread");
// Try to be nice and dispatch on main thread anyway
dispatch_async(dispatch_get_main_queue(), ^{
[self checkForUpdatesInBackground];
});
return;
}
if (!_startedUpdater) {
SULog(SULogLevelError, @"Error: checkForUpdatesInBackground - updater hasn't been started yet. Please call -startUpdater: first");
return;
@@ -644,9 +674,24 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (void)checkForUpdates
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdates] can only be called on the main thread");
// Try to be nice and dispatch on main thread anyway
dispatch_async(dispatch_get_main_queue(), ^{
[self checkForUpdates];
});
return;
}
if (_showingPermissionRequest || _driver.showingUpdate) {
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
[_userDriver showUpdateInFocus];
} else {
NSString *noticeType = _showingPermissionRequest ? @"permission request" : @"update";
SULog(SULogLevelError, @"Error: checkForUpdates called but %@ is being shown and %@ does not implement -[SPUUserDriver showUpdateInFocus]", noticeType, _userDriver);
}
return;
}
@@ -686,6 +731,17 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (void)checkForUpdateInformation
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdateInformation] can only be called on the main thread");
// Try to be nice and dispatch on main thread anyway
dispatch_async(dispatch_get_main_queue(), ^{
[self checkForUpdateInformation];
});
return;
}
__weak __typeof__(self) weakSelf = self;
if (!_startedUpdater) {
SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
@@ -812,6 +868,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
[strongSelf setSessionInProgress:NO];
[strongSelf setCanCheckForUpdates:YES];
if (!strongSelf->_updatingMainBundle && error == nil && !shouldShowUpdateImmediately && resumableUpdate == nil) {
// If we're not updating the main bundle, a potentially new installed bundle may have different info
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateSettingsNeedsSynchronizationNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: strongSelf->_host.bundlePath}];
}
notifyDelegateOfDriverCompletion(error, shouldShowUpdateImmediately);
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
@@ -821,9 +882,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
}
}];
[_driver setUpdateShownHandler:^{
weakSelf.canCheckForUpdates = YES;
}];
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
[_driver setUpdateShownHandler:^{
weakSelf.canCheckForUpdates = YES;
}];
}
[_driver setUpdateWillInstallHandler:^{
[weakSelf updateLastUpdateCheckDate];
@@ -868,6 +931,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (void)resetUpdateCycle
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycle] must be called on the main thread.");
// Try to be nice and dispatch on main thread anyway
dispatch_async(dispatch_get_main_queue(), ^{
[self resetUpdateCycle];
});
return;
}
if (!_startedUpdater) {
SULog(SULogLevelError, @"Error: resetUpdateCycle - updater hasn't been started yet. Please call -startUpdater: first");
return; // not even ready yet
@@ -906,38 +979,87 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (void)resetUpdateCycleAfterShortDelay
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycleAfterShortDelay] must be called on the main thread.");
// Try to be nice and dispatch on main thread anyway
dispatch_async(dispatch_get_main_queue(), ^{
[self resetUpdateCycleAfterShortDelay];
});
return;
}
[self cancelNextUpdateCycle];
[_updaterCycle resetUpdateCycleAfterDelay];
}
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
{
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
// Hack to support backwards compatibility with older Sparkle versions, which supported
// disabling updates by setting the check interval to 0.
if (automaticallyCheckForUpdates && (NSInteger)[self updateCheckInterval] == 0) {
[self setUpdateCheckInterval:SUDefaultUpdateCheckInterval];
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyChecksForUpdates:] must be called on the main thread.");
}
if (_startedUpdater) {
_updaterSettings.automaticallyChecksForUpdates = automaticallyCheckForUpdates;
}
- (BOOL)automaticallyChecksForUpdates
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyChecksForUpdates] must be called on the main thread.");
}
return [_updaterSettings automaticallyChecksForUpdates];
}
- (void)updateAutomaticCheckSettingChanged:(NSNotification *)notification
{
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
if (![bundlePath isEqualToString:_host.bundlePath]) {
return;
}
if (_startedUpdater && !_sessionInProgress) {
// Provide a small delay in case multiple preferences are being updated simultaneously.
[self resetUpdateCycleAfterShortDelay];
}
}
- (BOOL)automaticallyChecksForUpdates
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyChecksForUpdates
{
return [_updaterSettings automaticallyChecksForUpdates];
return [NSSet setWithObject:@"updaterSettings.automaticallyChecksForUpdates"];
}
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
{
return NO;
}
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyUpdates
{
[_host setBool:automaticallyUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyDownloadsUpdates:] must be called on the main thread.");
}
_updaterSettings.automaticallyDownloadsUpdates = automaticallyUpdates;
}
- (BOOL)automaticallyDownloadsUpdates
{
return [_updaterSettings allowsAutomaticUpdates] && [_updaterSettings automaticallyDownloadsUpdates];
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyDownloadsUpdates] must be called on the main thread.");
}
return [_updaterSettings automaticallyDownloadsUpdates];
}
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyDownloadsUpdates
{
return [NSSet setWithObject:@"updaterSettings.automaticallyDownloadsUpdates"];
}
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
{
return NO;
}
- (void)setFeedURL:(NSURL * _Nullable)feedURL
@@ -1054,14 +1176,32 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
{
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater setSendsSystemProfile:] must be called on the main thread.");
}
_updaterSettings.sendsSystemProfile = sendsSystemProfile;
}
- (BOOL)sendsSystemProfile
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater sendsSystemProfile] must be called on the main thread.");
}
return [_updaterSettings sendsSystemProfile];
}
+ (NSSet<NSString *> *)keyPathsForValuesAffectingSendsSystemProfile
{
return [NSSet setWithObject:@"updaterSettings.sendsSystemProfile"];
}
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
{
return NO;
}
static NSString *escapeURLComponent(NSString *str) {
NSString *escapedString = [str stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
@@ -1081,12 +1221,17 @@ static NSString *escapeURLComponent(NSString *str) {
BOOL sendingSystemProfile = [self sendsSystemProfile];
// Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such.
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
if (!lastSubmitDate) {
lastSubmitDate = [NSDate distantPast];
if (sendingSystemProfile) {
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
if (!lastSubmitDate) {
lastSubmitDate = [NSDate distantPast];
}
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
NSTimeInterval timeSinceLastSubmission = [lastSubmitDate timeIntervalSinceNow] * -1;
if (timeSinceLastSubmission < oneWeek) {
sendingSystemProfile = NO;
}
}
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
sendingSystemProfile &= (-[lastSubmitDate timeIntervalSinceNow] >= oneWeek);
id<SPUUpdaterDelegate> delegate = _delegate;
NSArray<NSDictionary<NSString *, NSString *> *> *parameters = @[];
@@ -1144,24 +1289,38 @@ static NSString *escapeURLComponent(NSString *str) {
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
{
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
[self setAutomaticallyChecksForUpdates:NO];
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater setUpdateCheckInterval:] must be called on the main thread.");
}
if (_startedUpdater) {
// Provide a small delay in case multiple preferences are being updated simultaneously.
[self resetUpdateCycleAfterShortDelay];
}
_updaterSettings.updateCheckInterval = updateCheckInterval;
}
- (NSTimeInterval)updateCheckInterval
{
if (![NSThread isMainThread]) {
SULog(SULogLevelError, @"Error: -[SPUUpdater updateCheckInterval] must be called on the main thread.");
}
return [_updaterSettings updateCheckInterval];
}
+ (NSSet<NSString *> *)keyPathsForValuesAffectingUpdateCheckInterval
{
return [NSSet setWithObject:@"updaterSettings.updateCheckInterval"];
}
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
{
return NO;
}
- (void)dealloc
{
if (_startedUpdater) {
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
}
// Stop checking for updates
[self cancelNextUpdateCycle];
[_updaterTimer invalidate];
+15 -5
View File
@@ -21,10 +21,12 @@
NS_ASSUME_NONNULL_BEGIN
/**
This class can be used for reading certain updater settings.
This class can be used for reading and updating updater settings.
It retrieves the settings by first looking into the host's user defaults.
If the setting is not found in there, then the host's Info.plist file is looked at.
For updating updater settings, changes are made in the host's user defaults.
*/
SU_EXPORT @interface SPUUpdaterSettings : NSObject
@@ -32,13 +34,17 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
/**
* Indicates whether or not automatic update checks are enabled.
*
* This property is KVO compliant. This property must be called on the main thread.
*/
@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates;
@property (nonatomic) BOOL automaticallyChecksForUpdates;
/**
* The regular update check interval.
*
* This property is KVO compliant. This property must be called on the main thread.
*/
@property (readonly, nonatomic) NSTimeInterval updateCheckInterval;
@property (nonatomic) NSTimeInterval updateCheckInterval;
/**
* Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
@@ -56,13 +62,17 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
*
* Note this does not indicate whether or not automatic downloading of updates is allowable.
* See `-allowsAutomaticUpdates` property for that.
*
* This property is KVO compliant. This property must be called on the main thread.
*/
@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates;
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
/**
* Indicates whether or not anonymous system profile information is sent when checking for updates.
*
* This property is KVO compliant. This property must be called on the main thread.
*/
@property (readonly, nonatomic) BOOL sendsSystemProfile;
@property (nonatomic) BOOL sendsSystemProfile;
@end
+202 -10
View File
@@ -13,37 +13,195 @@
#include "AppKitPrevention.h"
static NSString *SUAutomaticallyChecksForUpdatesKeyPath = @"automaticallyChecksForUpdates";
static NSString *SUUpdateCheckIntervalKeyPath = @"updateCheckInterval";
static NSString *SUAutomaticallyDownloadsUpdatesKeyPath = @"automaticallyDownloadsUpdates";
static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
@implementation SPUUpdaterSettings
{
SUHost *_host;
}
@synthesize automaticallyChecksForUpdates = _automaticallyChecksForUpdates;
@synthesize updateCheckInterval = _updateCheckInterval;
@synthesize automaticallyDownloadsUpdates = _automaticallyDownloadsUpdates;
@synthesize sendsSystemProfile = _sendsSystemProfile;
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle
{
self = [super init];
if (self != nil) {
_host = [[SUHost alloc] initWithBundle:hostBundle];
_automaticallyChecksForUpdates = [self currentAutomaticallyChecksForUpdates];
_updateCheckInterval = [self currentUpdateCheckInterval];
_automaticallyDownloadsUpdates = [self currentAutomaticallyDownloadsUpdates];
_sendsSystemProfile = [self currentSendsSystemProfile];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(synchronize:) name:SUUpdateSettingsNeedsSynchronizationNotification object:nil];
__weak __typeof__(self) weakSelf = self;
[_host observeChangesFromUserDefaultKeys:[NSSet setWithArray:@[SUEnableAutomaticChecksKey, SUScheduledCheckIntervalKey, SUAutomaticallyUpdateKey, SUSendProfileInfoKey]] changeHandler:^(NSString *keyPath) {
__typeof(self) strongSelf = weakSelf;
if (strongSelf == nil) {
return;
}
if ([keyPath isEqualToString:SUEnableAutomaticChecksKey]) {
[strongSelf processCurrentAutomaticallyChecksForUpdates];
} else if ([keyPath isEqualToString:SUScheduledCheckIntervalKey]) {
[strongSelf processUpdateCheckInterval];
} else if ([keyPath isEqualToString:SUAutomaticallyUpdateKey]) {
[strongSelf processAutomaticallyDownloadsUpdates];
} else if ([keyPath isEqualToString:SUSendProfileInfoKey]) {
[strongSelf processSendsSystemProfile];
}
}];
}
return self;
}
- (BOOL)automaticallyChecksForUpdates
- (void)dealloc
{
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateSettingsNeedsSynchronizationNotification object:_host.bundlePath];
}
- (void)processCurrentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
{
BOOL currentValue = [self currentAutomaticallyChecksForUpdates];
if (currentValue != _automaticallyChecksForUpdates) {
NSString *updatedKeyPath = SUAutomaticallyChecksForUpdatesKeyPath;
[self willChangeValueForKey:updatedKeyPath];
_automaticallyChecksForUpdates = currentValue;
[self didChangeValueForKey:updatedKeyPath];
}
}
- (void)processUpdateCheckInterval SPU_OBJC_DIRECT
{
NSTimeInterval currentValue = [self currentUpdateCheckInterval];
if (fabs(currentValue - _updateCheckInterval) >= 0.001) {
NSString *updatedKeyPath = SUUpdateCheckIntervalKeyPath;
[self willChangeValueForKey:updatedKeyPath];
_updateCheckInterval = currentValue;
[self didChangeValueForKey:updatedKeyPath];
}
}
- (void)processAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
{
BOOL currentValue = [self currentAutomaticallyDownloadsUpdates];
if (currentValue != _automaticallyDownloadsUpdates) {
NSString *updatedKeyPath = SUAutomaticallyDownloadsUpdatesKeyPath;
[self willChangeValueForKey:updatedKeyPath];
_automaticallyDownloadsUpdates = currentValue;
[self didChangeValueForKey:updatedKeyPath];
}
}
- (void)processSendsSystemProfile SPU_OBJC_DIRECT
{
BOOL currentValue = [self currentSendsSystemProfile];
if (currentValue != _sendsSystemProfile) {
NSString *updatedKeyPath = SUSendsSystemProfileKeyPath;
[self willChangeValueForKey:updatedKeyPath];
_sendsSystemProfile = currentValue;
[self didChangeValueForKey:updatedKeyPath];
}
}
- (void)synchronize:(NSNotification *)notification
{
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
if (![bundlePath isEqualToString:_host.bundlePath]) {
return;
}
[self processCurrentAutomaticallyChecksForUpdates];
[self processUpdateCheckInterval];
[self processAutomaticallyDownloadsUpdates];
[self processSendsSystemProfile];
}
- (BOOL)currentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
{
// Don't automatically update when the check interval is 0, to be compatible with 1.1 settings.
if ((NSInteger)[self updateCheckInterval] == 0) {
if ((NSInteger)[self currentUpdateCheckInterval] == 0) {
return NO;
}
return [_host boolForKey:SUEnableAutomaticChecksKey];
}
- (NSTimeInterval)updateCheckInterval
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
{
[self willChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
_automaticallyChecksForUpdates = automaticallyCheckForUpdates;
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
[self didChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
// Hack to support backwards compatibility with older Sparkle versions, which supported
// disabling updates by setting the check interval to 0.
if (automaticallyCheckForUpdates && (NSInteger)[self currentUpdateCheckInterval] == 0) {
[self setUpdateCheckInterval:SUDefaultUpdateCheckInterval];
} else {
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
}
}
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
{
return NO;
}
- (NSTimeInterval)currentUpdateCheckInterval SPU_OBJC_DIRECT
{
// Find the stored check interval. User defaults override Info.plist.
NSNumber *intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
if (intervalValue)
return [intervalValue doubleValue];
else
id intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
if (intervalValue == nil || ![(NSObject *)intervalValue isKindOfClass:[NSNumber class]]) {
return SUDefaultUpdateCheckInterval;
}
return [(NSNumber *)intervalValue doubleValue];
}
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
{
[self willChangeValueForKey:SUUpdateCheckIntervalKeyPath];
_updateCheckInterval = updateCheckInterval;
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
[self didChangeValueForKey:SUUpdateCheckIntervalKeyPath];
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
[self setAutomaticallyChecksForUpdates:NO];
} else {
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
}
}
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
{
return NO;
}
// For allowing automatic downloaded updates to be turned on or off
@@ -59,14 +217,48 @@
return (developerAllowsAutomaticUpdates == nil || developerAllowsAutomaticUpdates.boolValue);
}
- (BOOL)automaticallyDownloadsUpdates
- (BOOL)currentAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
{
return [_host boolForKey:SUAutomaticallyUpdateKey];
return [self allowsAutomaticUpdates] && [_host boolForKey:SUAutomaticallyUpdateKey];
}
- (BOOL)sendsSystemProfile
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates
{
if (![self allowsAutomaticUpdates]) {
return;
}
[self willChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
_automaticallyDownloadsUpdates = automaticallyDownloadsUpdates;
[_host setBool:automaticallyDownloadsUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
[self didChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
}
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
{
return NO;
}
- (BOOL)currentSendsSystemProfile SPU_OBJC_DIRECT
{
return [_host boolForKey:SUSendProfileInfoKey];
}
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
{
[self willChangeValueForKey:SUSendsSystemProfileKeyPath];
_sendsSystemProfile = sendsSystemProfile;
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
[self didChangeValueForKey:SUSendsSystemProfileKeyPath];
}
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
{
return NO;
}
@end
+11 -9
View File
@@ -256,14 +256,6 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
*/
- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement;
/**
* Show the user the current presented update or its progress in utmost focus
*
* The user wishes to check for updates while the user is being shown update progress.
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
*/
- (void)showUpdateInFocus;
/**
* Dismiss the current update installation
*
@@ -273,12 +265,22 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
*/
- (void)dismissUpdateInstallation;
@optional
/**
* Show the user the current presented update or its progress in utmost focus
*
* The user wishes to check for updates while the user is being shown update progress.
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
* Implementing this method is optional.
*/
- (void)showUpdateInFocus;
/*
* Below are deprecated methods that have been replaced by better alternatives.
* The deprecated methods will be used if the alternatives have not been implemented yet.
* In the future support for using these deprecated methods may be removed however.
*/
@optional
// Clients should move to non-deprecated methods
// Deprecated methods are only (temporarily) kept around for compatibility reasons
+1 -1
View File
@@ -335,7 +335,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
// Initializer used for making delta items
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL state:(SPUAppcastItemState * _Nullable)state SPU_OBJC_DIRECT
{
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:state failureReason:nil];
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:state failureReason:nil];
}
// Exported public initializer
+7 -26
View File
@@ -9,10 +9,8 @@
#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
#import "SUApplicationInfo.h"
#import "SUBundleIcon.h"
#import "SUHost.h"
#import <AppKit/AppKit.h>
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
@implementation SUApplicationInfo
@@ -23,33 +21,16 @@
+ (NSImage *)bestIconForHost:(SUHost *)host
{
NSURL *iconURL = [SUBundleIcon iconURLForHost:host];
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
// First try NSImageNameApplicationIcon. This image can be dynamically updated if the user's system icon settings change.
NSImage *icon = isMainBundle ? [NSImage imageNamed:NSImageNameApplicationIcon] : nil;
NSImage *icon = (iconURL == nil) ? nil : [[NSImage alloc] initWithContentsOfURL:iconURL];
// Get icon from asset catalog if no explicit filename is provided.
if (!icon) {
icon = [host.bundle imageForResource:@SPARKLE_ICON_NAME];
// Next try asking NSWorkspace for icon of the bundle
if (icon == nil) {
icon = [[NSWorkspace sharedWorkspace] iconForFile:host.bundlePath];
}
// Use a default icon if none is defined.
if (!icon) {
// this assumption may not be correct (eg. even though we're not the main bundle, it could be still be a regular app)
// but still better than nothing if no icon was included
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
if (@available(macOS 11, *)) {
UTType *contentType = isMainBundle ? UTTypeApplication : UTTypeBundle;
icon = [[NSWorkspace sharedWorkspace] iconForContentType:contentType];
}
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
else
{
NSString *fileType = isMainBundle ? (__bridge NSString *)kUTTypeApplication : (__bridge NSString *)kUTTypeBundle;
icon = [[NSWorkspace sharedWorkspace] iconForFileType:fileType];
}
#endif
}
return icon;
}
-21
View File
@@ -1,21 +0,0 @@
//
// SUBundleIcon.h
// Sparkle
//
// Created by Mayur Pawashe on 7/24/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
SPU_OBJC_DIRECT_MEMBERS @interface SUBundleIcon : NSObject
+ (NSURL * _Nullable)iconURLForHost:(SUHost *)host;
@end
NS_ASSUME_NONNULL_END
-34
View File
@@ -1,34 +0,0 @@
//
// SUBundleIcon.m
// Sparkle
//
// Created by Mayur Pawashe on 7/24/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SUBundleIcon.h"
#import "SUHost.h"
#include "AppKitPrevention.h"
@implementation SUBundleIcon
// Note: To obtain the most current bundle icon file from the Info dictionary, this should take a SUHost, not a NSBundle
+ (NSURL *)iconURLForHost:(SUHost *)host
{
NSString *resource = [host objectForInfoDictionaryKey:@"CFBundleIconFile"];
if (resource == nil || ![resource isKindOfClass:[NSString class]]) {
return nil;
}
NSURL *iconURL = [host.bundle URLForResource:resource withExtension:@"icns"];
// The resource could already be containing the path extension, so try again without the extra extension
if (iconURL == nil) {
iconURL = [host.bundle URLForResource:resource withExtension:nil];
}
return iconURL;
}
@end
+3
View File
@@ -31,6 +31,9 @@ extern NSString *const SUAppcastAttributeValueMacOS;
// -----------------------------------------------------------------------------
extern NSString *const SUTechnicalErrorInformationKey;
extern NSString *const SUUpdateAutomaticCheckSettingChangedNotification;
extern NSString *const SUUpdateSettingsNeedsSynchronizationNotification;
extern NSString *const SUUpdateBundlePathUserInfoKey;
// -----------------------------------------------------------------------------
// PList keys::
+3
View File
@@ -31,6 +31,9 @@ NSString *const SUBundleIdentifier = @SPARKLE_BUNDLE_IDENTIFIER;
NSString *const SUAppcastAttributeValueMacOS = @"macos";
NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
NSString *const SUUpdateAutomaticCheckSettingChangedNotification = @"SUUpdateAutomaticCheckSettingChanged";
NSString *const SUUpdateSettingsNeedsSynchronizationNotification = @"SUUpdateSettingsNeedsSynchronization";
NSString *const SUUpdateBundlePathUserInfoKey = @"SUBundlePath";
NSString *const SUFeedURLKey = @"SUFeedURL";
NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore";
+3
View File
@@ -47,6 +47,9 @@ SUHostDefinitionAttribute
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName;
- (nullable id)objectForKey:(NSString *)key;
- (BOOL)boolForKey:(NSString *)key;
- (void)observeChangesFromUserDefaultKeys:(NSSet<NSString *> *)keyPaths changeHandler:(void (^)(NSString *))changeHandler;
@end
NS_ASSUME_NONNULL_END
+81 -53
View File
@@ -23,11 +23,16 @@ NS_ASSUME_NONNULL_BEGIN
// if the process is sandboxed or not; eg: finding the user's caches directory. Or code that depends
// on compilation flags and if other files exist relative to the host bundle.
static void *SUHostObservableContext = &SUHostObservableContext;
@implementation SUHost
{
NSString *_defaultsDomain;
NSUserDefaults *_userDefaults;
NSSet<NSString *> *_observedUserDefaultKeyPaths;
NSMutableSet<NSString *> *_modifyingKeyPaths;
void (^_changeObservationHandler)(NSString *);
BOOL _usesStandardUserDefaults;
BOOL _isMainBundle;
}
@@ -45,18 +50,67 @@ NS_ASSUME_NONNULL_BEGIN
_isMainBundle = [aBundle isEqualTo:[NSBundle mainBundle]];
_defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey];
if (_defaultsDomain == nil) {
_defaultsDomain = [_bundle bundleIdentifier];
NSString *domainIdentifier;
{
NSString *defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey];
if (defaultsDomain != nil) {
domainIdentifier = defaultsDomain;
} else if (!_isMainBundle) {
domainIdentifier = aBundle.bundleIdentifier;
} else {
domainIdentifier = nil;
}
}
if (domainIdentifier == nil) {
_userDefaults = [NSUserDefaults standardUserDefaults];
} else {
_userDefaults = [[NSUserDefaults alloc] initWithSuiteName:domainIdentifier];
}
// If we're using the main bundle's defaults we'll use the standard user defaults mechanism, otherwise we have to get CF-y.
NSString *mainBundleIdentifier = NSBundle.mainBundle.bundleIdentifier;
_usesStandardUserDefaults = _defaultsDomain == nil || [_defaultsDomain isEqualToString:mainBundleIdentifier];
}
return self;
}
- (void)dealloc
{
if (_observedUserDefaultKeyPaths != nil) {
for (NSString *keyPath in _observedUserDefaultKeyPaths) {
[_userDefaults removeObserver:self forKeyPath:keyPath];
}
}
}
- (void)observeChangesFromUserDefaultKeys:(NSSet<NSString *> *)keyPaths changeHandler:(void (^)(NSString *))changeHandler
{
_modifyingKeyPaths = [NSMutableSet set];
for (NSString *keyPath in keyPaths) {
[_userDefaults addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:SUHostObservableContext];
}
_observedUserDefaultKeyPaths = keyPaths;
_changeObservationHandler = [changeHandler copy];
}
- (void)observeValueForKeyPath:(nullable NSString *)keyPath ofObject:(nullable id)object change:(nullable NSDictionary<NSKeyValueChangeKey,id> *)change context:(nullable void *)context
{
if (context != SUHostObservableContext)
{
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
return;
}
if (keyPath == nil || [_modifyingKeyPaths containsObject:(NSString * _Nonnull)keyPath]) {
return;
}
if (_changeObservationHandler == nil) {
return;
}
_changeObservationHandler((NSString * _Nonnull)keyPath);
}
- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], [self bundlePath]]; }
- (NSString *)bundlePath
@@ -120,7 +174,11 @@ NS_ASSUME_NONNULL_BEGIN
- (BOOL)isRunningOnReadOnlyVolume
{
struct statfs statfs_info;
statfs(_bundle.bundlePath.fileSystemRepresentation, &statfs_info);
if (statfs(_bundle.bundlePath.fileSystemRepresentation, &statfs_info) != 0)
{
return NO;
}
return (statfs_info.f_flags & MNT_RDONLY) != 0;
}
@@ -205,65 +263,35 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName
{
if (!defaultName || _defaultsDomain == nil) {
if (defaultName == nil || _userDefaults == nil) {
return nil;
}
// Under Tiger, CFPreferencesCopyAppValue doesn't get values from NSRegistrationDomain, so anything
// passed into -[NSUserDefaults registerDefaults:] is ignored. The following line falls
// back to using NSUserDefaults, but only if the host bundle is the main bundle.
if (_usesStandardUserDefaults) {
return [[NSUserDefaults standardUserDefaults] objectForKey:defaultName];
}
CFPropertyListRef obj = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)_defaultsDomain);
return CFBridgingRelease(obj);
return [_userDefaults objectForKey:defaultName];
}
// Note this handles nil being passed for defaultName, in which case the user default will be removed
- (void)setObject:(nullable id)value forUserDefaultsKey:(NSString *)defaultName
{
if (_usesStandardUserDefaults)
{
[[NSUserDefaults standardUserDefaults] setObject:value forKey:defaultName];
}
else
{
CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFPropertyListRef)(value), (__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
CFPreferencesSynchronize((__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
}
[_modifyingKeyPaths addObject:defaultName];
[_userDefaults setObject:value forKey:defaultName];
[_modifyingKeyPaths removeObject:defaultName];
}
- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName
{
if (_usesStandardUserDefaults) {
return [[NSUserDefaults standardUserDefaults] boolForKey:defaultName];
}
BOOL value;
CFPropertyListRef plr = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)_defaultsDomain);
if (plr == NULL) {
value = NO;
}
else
{
value = CFBooleanGetValue((CFBooleanRef)plr) ? YES : NO;
CFRelease(plr);
}
return value;
return [_userDefaults boolForKey:defaultName];
}
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
{
if (_usesStandardUserDefaults)
{
[[NSUserDefaults standardUserDefaults] setBool:value forKey:defaultName];
}
else
{
CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFBooleanRef) @(value), (__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
CFPreferencesSynchronize((__bridge CFStringRef)_defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
}
[_modifyingKeyPaths addObject:defaultName];
[_userDefaults setBool:value forKey:defaultName];
[_modifyingKeyPaths removeObject:defaultName];
}
- (nullable id)objectForKey:(NSString *)key {
+49 -39
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.8" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.8"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -23,12 +23,12 @@
<rect key="contentRect" x="200" y="222" width="400" height="107"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="400" height="106"/>
<view key="contentView" misplaced="YES" id="6">
<rect key="frame" x="0.0" y="0.0" width="400" height="105"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="24" y="27" width="64" height="64"/>
<rect key="frame" x="20" y="37" width="64" height="64"/>
<constraints>
<constraint firstAttribute="height" constant="64" id="BT1-iv-l2H"/>
<constraint firstAttribute="width" constant="64" id="eYK-yn-PVe"/>
@@ -38,26 +38,40 @@
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
</connections>
</imageView>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="106" y="75" width="277" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="title" id="26"/>
</connections>
</textField>
<progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
<rect key="frame" x="107" y="47" width="273" height="20"/>
<connections>
<binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
<binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
</connections>
</progressIndicator>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="E7u-iB-1VW" userLabel="Status text and progress">
<rect key="frame" x="92" y="48" width="288" height="42"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="-2" y="26" width="292" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="title" id="26"/>
</connections>
</textField>
<progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
<rect key="frame" x="0.0" y="-1" width="288" height="20"/>
<connections>
<binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
<binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
</connections>
</progressIndicator>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" id="9Rq-vq-cJo"/>
<constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" id="PDQ-9x-h82"/>
<constraint firstItem="8" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="top" id="Rtg-8u-ed1"/>
<constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" id="YFJ-Gi-yRc"/>
<constraint firstItem="8" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="f16-mO-wfq"/>
<constraint firstItem="11" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="jvG-0L-tcl"/>
<constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="8" symbolic="YES" id="mKu-OU-ujj"/>
</constraints>
</customView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
<rect key="frame" x="273" y="12" width="114" height="32"/>
<rect key="frame" x="273" y="13" width="114" height="32"/>
<buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="55">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -65,12 +79,13 @@
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="3tI-Ef-LLb"/>
</constraints>
<accessibility identifier="SUStatusButton"/>
<connections>
<binding destination="-2" name="title" keyPath="buttonTitle" id="21"/>
</connections>
</button>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="16">
<rect key="frame" x="106" y="22" width="146" height="16"/>
<rect key="frame" x="90" y="23" width="146" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Small System Font Text" id="56">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -87,22 +102,17 @@
</textField>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" constant="20" id="1eu-lX-1HN"/>
<constraint firstItem="12" firstAttribute="top" relation="greaterThanOrEqual" secondItem="11" secondAttribute="bottom" constant="9" id="3RZ-xs-4zc"/>
<constraint firstItem="8" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="5bq-w6-BOU"/>
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="9Mg-Ac-X6m"/>
<constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="9" id="B9k-9V-CdX"/>
<constraint firstItem="11" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="19" id="EQn-l8-5gk"/>
<constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="LTo-e9-myp"/>
<constraint firstItem="16" firstAttribute="top" relation="greaterThanOrEqual" secondItem="11" secondAttribute="bottom" constant="9" id="ViF-iJ-I4A"/>
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="24" id="ZLG-dr-gmv"/>
<constraint firstAttribute="trailing" secondItem="E7u-iB-1VW" secondAttribute="trailing" constant="20" symbolic="YES" id="3uo-mB-Q9M"/>
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="4" id="9Mg-Ac-X6m"/>
<constraint firstItem="E7u-iB-1VW" firstAttribute="centerY" secondItem="7" secondAttribute="centerY" id="Jcg-BS-tJ1"/>
<constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="LTo-e9-myp"/>
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="ZLG-dr-gmv"/>
<constraint firstItem="12" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="bottom" constant="8" id="dHH-r0-at5"/>
<constraint firstItem="16" firstAttribute="firstBaseline" secondItem="12" secondAttribute="firstBaseline" id="dHQ-hW-3QN"/>
<constraint firstItem="12" firstAttribute="top" secondItem="11" secondAttribute="bottom" priority="750" constant="9" id="e4R-KE-ofU"/>
<constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="19" id="iY3-LJ-ivz"/>
<constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="20" symbolic="YES" id="iY3-LJ-ivz"/>
<constraint firstItem="12" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="16" secondAttribute="trailing" constant="25" id="k07-gJ-v9t"/>
<constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" id="onJ-J5-mra"/>
<constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="19" id="pHi-Hm-GAw"/>
<constraint firstItem="8" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="tAo-wJ-XR0"/>
<constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" symbolic="YES" id="onJ-J5-mra"/>
<constraint firstItem="E7u-iB-1VW" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="wiO-j2-ud9"/>
</constraints>
</view>
<point key="canvasLocation" x="-158" y="132"/>
+1 -1
View File
@@ -30,7 +30,7 @@
- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText SPU_OBJC_DIRECT;
// If isDefault is YES, the button's key equivalent will be \r.
- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault SPU_OBJC_DIRECT;
- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault accessibilityIdentifier:(NSString *)accessibilityIdentifier SPU_OBJC_DIRECT;
@end
+6 -1
View File
@@ -88,6 +88,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
[_progressBar setUsesThreadedAnimation:YES];
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
if (@available(macOS 16, *)) {
_actionButton.controlSize = NSControlSizeLarge;
}
window.title = _windowTitle;
}
@@ -104,9 +108,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
self.statusText = aStatusText;
}
- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault
- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault accessibilityIdentifier:(NSString *)accessibilityIdentifier
{
self.buttonTitle = aButtonTitle;
_actionButton.accessibilityIdentifier = [accessibilityIdentifier copy];
[self window];
[_actionButton sizeToFit];
+65 -52
View File
@@ -33,26 +33,29 @@
static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdateAlert";
static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
@interface SUUpdateAlert () <NSTouchBarDelegate>
@end
@implementation SUUpdateAlert
{
SPUUpdaterSettings *_updaterSettings;
SUAppcastItem *_updateItem;
SUHost *_host;
SPUUserUpdateState *_state;
NSProgressIndicator *_releaseNotesSpinner;
NSBox *_backgroundView;
id<SUReleaseNotesView> _releaseNotesView;
id<SUVersionDisplay> _versionDisplayer;
IBOutlet NSStackView *_stackView;
IBOutlet NSButton *_installButton;
IBOutlet NSButton *_laterButton;
IBOutlet NSButton *_skipButton;
IBOutlet NSBox *_releaseNotesBoxView;
IBOutlet NSTextField *_descriptionField;
IBOutlet NSView *_releaseNotesContainerView;
IBOutlet NSView *_releaseNotesContentView;
IBOutlet NSButton *_automaticallyInstallUpdatesButton;
IBOutlet NSView *_titleView;
void (^_didBecomeKeyBlock)(void);
void(^_completionBlock)(SPUUserUpdateChoice, NSRect, BOOL);
@@ -73,14 +76,14 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
_completionBlock = [completionBlock copy];
_didBecomeKeyBlock = [didBecomeKeyBlock copy];
SPUUpdaterSettings *updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:aHost.bundle];
_updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:aHost.bundle];
BOOL allowsAutomaticUpdates;
NSNumber *allowsAutomaticUpdatesOption = updaterSettings.allowsAutomaticUpdatesOption;
NSNumber *allowsAutomaticUpdatesOption = _updaterSettings.allowsAutomaticUpdatesOption;
if (item.informationOnlyUpdate) {
allowsAutomaticUpdates = NO;
} else if (allowsAutomaticUpdatesOption == nil) {
allowsAutomaticUpdates = updaterSettings.automaticallyChecksForUpdates;
allowsAutomaticUpdates = _updaterSettings.automaticallyChecksForUpdates;
} else {
allowsAutomaticUpdates = allowsAutomaticUpdatesOption.boolValue;
}
@@ -152,12 +155,20 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
- (void)displayReleaseNotesSpinner SPU_OBJC_DIRECT
{
// Stick a nice big spinner in the middle of the web view until the page is loaded.
NSView *boxContentView = _releaseNotesBoxView.contentView;
NSRect frame = boxContentView.frame;
_releaseNotesSpinner = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(NSMidX(frame) - 16, NSMidY(frame) - 16, 32, 32)];
_releaseNotesSpinner = [[NSProgressIndicator alloc] init];
_releaseNotesSpinner.controlSize = NSControlSizeRegular;
[_releaseNotesSpinner setStyle:NSProgressIndicatorStyleSpinning];
[_releaseNotesContentView addSubview:_releaseNotesSpinner];
_releaseNotesSpinner.translatesAutoresizingMaskIntoConstraints = NO;
[NSLayoutConstraint activateConstraints:@[
[_releaseNotesSpinner.centerXAnchor constraintEqualToAnchor:_releaseNotesContentView.centerXAnchor],
[_releaseNotesSpinner.centerYAnchor constraintEqualToAnchor:_releaseNotesContentView.centerYAnchor]
]];
_releaseNotesSpinner.displayedWhenStopped = NO;
[_releaseNotesSpinner startAnimation:self];
[boxContentView addSubview:_releaseNotesSpinner];
// If there's no release notes URL, just stick the contents of the description into the web view
// Otherwise we'll wait until the client wants us to show release notes
@@ -233,7 +244,6 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
- (void)stopReleaseNotesSpinner SPU_OBJC_DIRECT
{
[_releaseNotesSpinner stopAnimation:self];
[_releaseNotesSpinner setHidden:YES];
}
- (BOOL)showsReleaseNotes
@@ -314,11 +324,10 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
}
}
NSView *boxContentView = _releaseNotesBoxView.contentView;
assert(_releaseNotesSpinner != nil);
[boxContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
[_releaseNotesContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
_releaseNotesView.view.frame = boxContentView.bounds;
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
_releaseNotesView.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
if (@available(macOS 10.14, *)) {
@@ -326,16 +335,6 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
// This avoids a "white flash" that may be present when the webview initially loads in dark mode
// This also is necessary for macOS 10.14, otherwise the background may stay white on 10.14 (but not in later OS's)
[_releaseNotesView setDrawsBackground:NO];
// Use NSBox to get the proper dynamically colored background behind the release notes view when
// the release notes view background is transparent
_backgroundView = [[NSBox alloc] initWithFrame:_releaseNotesView.view.frame];
_backgroundView.boxType = NSBoxCustom;
_backgroundView.fillColor = [NSColor textBackgroundColor];
_backgroundView.borderColor = [NSColor clearColor];
// Using auto-resizing mask instead of constraints works well enough
_backgroundView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
[_releaseNotesView.view.superview addSubview:_backgroundView positioned:NSWindowBelow relativeTo:_releaseNotesView.view];
}
}
@@ -343,9 +342,44 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
{
NSWindow *window = self.window;
window.movableByWindowBackground = YES;
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
[_stackView setCustomSpacing:SUUpdateAlertGroupElementSpacing afterView:_titleView];
// Customize custom NSBox
{
CGFloat boxCornerRadius = 6.0;
CGFloat boxBorderWidth = 1.0;
_releaseNotesBoxView.boxType = NSBoxCustom;
_releaseNotesBoxView.cornerRadius = boxCornerRadius;
if (@available(macOS 10.14, *)) {
_releaseNotesBoxView.borderColor = NSColor.separatorColor;
} else {
_releaseNotesBoxView.borderColor = [NSColor colorWithCalibratedWhite:0.84 alpha:1.0];
}
_releaseNotesBoxView.borderWidth = boxBorderWidth;
_releaseNotesBoxView.fillColor = NSColor.textBackgroundColor;
// Needed so we don't clip the corners if the CSS uses a custom background
_releaseNotesBoxView.contentView.wantsLayer = YES;
_releaseNotesBoxView.contentView.layer.masksToBounds = YES;
_releaseNotesBoxView.contentView.layer.cornerRadius = boxCornerRadius - boxBorderWidth;
}
if (@available(macOS 16, *)) {
_skipButton.controlSize = NSControlSizeLarge;
_laterButton.controlSize = NSControlSizeLarge;
_installButton.controlSize = NSControlSizeLarge;
}
BOOL showReleaseNotes = [self showsReleaseNotes];
if (showReleaseNotes) {
window.frameAutosaveName = @"SUUpdateAlert";
window.frameAutosaveName = @"SUUpdateAlert2";
} else {
// Update alert should not be resizable when no release notes are available
window.styleMask &= ~NSWindowStyleMaskResizable;
@@ -353,7 +387,7 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
_windowLoadedAndShowsReleaseNotes = showReleaseNotes;
if (_updateItem.informationOnlyUpdate) {
[_installButton setTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, SUSparkleBundle(), @"Alternate title for 'Install Update' button when there's no download in RSS feed.")];
[_installButton setTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, sparkleBundle, @"Alternate title for 'Install Update' button when there's no download in RSS feed.")];
[_installButton setAction:@selector(openInfoURL:)];
}
@@ -361,41 +395,20 @@ static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDEN
if (showReleaseNotes) {
[self displayReleaseNotesSpinner];
} else {
// When automatic updates aren't allowed we won't show the automatic install updates button
// This button is removed later below
if (allowsAutomaticUpdates) {
NSLayoutConstraint *automaticallyInstallUpdatesButtonToDescriptionFieldConstraint = [NSLayoutConstraint constraintWithItem:_automaticallyInstallUpdatesButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:8.0];
[window.contentView addConstraint:automaticallyInstallUpdatesButtonToDescriptionFieldConstraint];
}
[_releaseNotesContainerView removeFromSuperview];
// Add more spacing to give choices and automatic installs checkbox better grouping
[_stackView setCustomSpacing:SUUpdateAlertGroupElementSpacing afterView:_releaseNotesBoxView];
} else {
_releaseNotesBoxView.hidden = YES;
}
// NOTE: The code below for deciding what buttons to hide is complex! Due to array of feature configurations :)
// When we show release notes, it looks ugly if the install buttons are not closer to the release notes view
// However when we don't show release notes, it looks ugly if the install buttons are too close to the description field. Shrugs.
if (!allowsAutomaticUpdates) {
if (showReleaseNotes) {
// Fix constraints so that buttons aren't far away from web view when we hide the automatic updates check box
NSLayoutConstraint *skipButtonToReleaseNotesContainerConstraint = [NSLayoutConstraint constraintWithItem:_skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_releaseNotesContainerView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:12.0];
[window.contentView addConstraint:skipButtonToReleaseNotesContainerConstraint];
} else {
NSLayoutConstraint *skipButtonToDescriptionConstraint = [NSLayoutConstraint constraintWithItem:_skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:_descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:20.0];
[window.contentView addConstraint:skipButtonToDescriptionConstraint];
}
[_automaticallyInstallUpdatesButton removeFromSuperview];
_automaticallyInstallUpdatesButton.superview.hidden = YES;
}
if (_state.stage == SPUUserUpdateStageInstalling) {
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
// We're going to be relaunching pretty instantaneously
_installButton.title = SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil);
+38
View File
@@ -0,0 +1,38 @@
//
// Sparkle.private.modulemap
// Sparkle
//
// Created on 4/30/25.
// Copyright © 2025 Sparkle Project. All rights reserved.
//
framework module Sparkle_Private {
// Nothing exported here
}
explicit module Sparkle_Private.SPUStandardUserDriver {
header "SPUStandardUserDriver+Private.h"
export *
}
explicit module Sparkle_Private.SPUGentleUserDriverReminders {
header "SPUGentleUserDriverReminders.h"
export *
}
explicit module Sparkle_Private.SPUUserAgent {
header "SPUUserAgent+Private.h"
export *
}
explicit module Sparkle_Private.SUAppcastItem {
header "SUAppcastItem+Private.h"
header "SPUAppcastItemStateResolver.h"
export *
}
explicit module Sparkle_Private.SUInstallerLauncher {
header "SUInstallerLauncher+Private.h"
header "SPUInstallationType.h"
export *
}
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "محدث البرنامج";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "تذكيري لاحقًا";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "معلومات عن الإصدار:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "تخطي هذا الإصدار";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "تذكيري لاحقًا";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "تثبيت التحديث";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "تخطي هذا الإصدار";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "تثبيت التحديث";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "تنزيل التحديثات وتثبيتها تلقائيًا في المستقبل";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "تنزيل التحديثات وتثبيتها تلقائيًا في المستقبل";
+3
View File
@@ -54,3 +54,6 @@
/* No comment provided by engineer. */
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "انقل %1$@ إلى مجلد التطبيقات وأعد تشغيله من هناك ثم حاول مجددًا.";
/* Software Update title/label */
"Software Update" = "محدث البرنامج";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Actualització del programari";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Recorda-m'ho més tard";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Notes d'aquesta versió:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Omet aquesta versió";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Recorda-m'ho més tard";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instal·la l'actualització";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Omet aquesta versió";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instal·la l'actualització";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Descarrega i instal·la les actualitzacions automàticament en el futur";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Descarrega i instal·la les actualitzacions automàticament en el futur";
+3
View File
@@ -60,3 +60,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Ja esteu al dia!";
/* Software Update title/label */
"Software Update" = "Actualització del programari";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Aktualizace aplikace";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Připomenout později";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Poznámky k vydání:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Přeskočit tuto verzi";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Připomenout později";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instalovat aktualizaci";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Přeskočit tuto verzi";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instalovat aktualizaci";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "V budoucnu stahovat a instalovat aktualizace automaticky";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "V budoucnu stahovat a instalovat aktualizace automaticky";
+2
View File
@@ -151,3 +151,5 @@
/* No comment provided by engineer. */
"Your macOS version is too old" = "Vaše verze macOS je příliš stará";
/* Software Update title/label */
"Software Update" = "Aktualizace aplikace";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Software Update";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Påmind mig senere";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Om denne udgivelse:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Spring over";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Påmind mig senere";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installer";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Spring over";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installer";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Hent og installer opdateringer automatisk i fremtiden";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Hent og installer opdateringer automatisk i fremtiden";
+3
View File
@@ -84,3 +84,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Der er ingen opdateringer";
/* Software Update title/label */
"Software Update" = "Software Update";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Softwareupdate";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Später erinnern";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Versionshinweise:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Diese Version überspringen";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Später erinnern";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installieren";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Diese Version überspringen";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installieren";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Updates in Zukunft automatisch laden und installieren";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Updates in Zukunft automatisch laden und installieren";
+3
View File
@@ -198,3 +198,6 @@
/* No comment provided by engineer. */
"Your macOS version is too old" = "Deine Version von macOS ist zu alt";
/* Software Update title/label */
"Software Update" = "Softwareupdate";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Ενημέρωση προγράμματος";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Υπενθύμιση Αργότερα";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Σημειώσεις Έκδοσης:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Παράλειψη Έκδοσης";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Υπενθύμιση Αργότερα";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Εγκατάσταση Ενημέρωσης";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Παράλειψη Έκδοσης";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Εγκατάσταση Ενημέρωσης";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Αυτόματη λήψη και εγκατάσταση ενημερώσεων στο μέλλον";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Αυτόματη λήψη και εγκατάσταση ενημερώσεων στο μέλλον";
+3
View File
@@ -78,3 +78,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Είστε ενημερωμένοι!";
/* Software Update title/label */
"Software Update" = "Ενημέρωση προγράμματος";
+8 -15
View File
@@ -1,18 +1,11 @@
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Remind Me Later";
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Software Update";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Skip This Version";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Release Notes:";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Install Update";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Remind Me Later";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Skip This Version";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Install Update";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Automatically download and install updates in the future";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Automatically download and install updates in the future";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Actualización de software";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Recordármelo";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Notas de la versión:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "No instalar esta versión";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Recordármelo";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instalar actualización";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "No instalar esta versión";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instalar actualización";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Descargar e instalar actualizaciones automáticamente";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Descargar e instalar actualizaciones automáticamente";
+3
View File
@@ -93,3 +93,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "¡Está actualizado!";
/* Software Update title/label */
"Software Update" = "Actualización de software";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Ohjelmiston pävitys";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Muistuta myöhemmin";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Tietoa päivityksestä:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Ohita tämä versio";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Muistuta myöhemmin";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Asenna päivitys";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Ohita tämä versio";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Asenna päivitys";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Hae ja asenna päivitykset jatkossa automaattisesti";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Hae ja asenna päivitykset jatkossa automaattisesti";
+3
View File
@@ -54,3 +54,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Sinulla on viimeisin versio!";
/* Software Update title/label */
"Software Update" = "Ohjelmiston pävitys";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Mise à jour logiciel";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Pas maintenant";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Notes de version :";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Ignorer cette version";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Pas maintenant";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installer";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Ignorer cette version";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installer";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Télécharger et installer automatiquement les mises à jour";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Télécharger et installer automatiquement les mises à jour";
+3
View File
@@ -99,3 +99,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Votre logiciel est à jour !";
/* Software Update title/label */
"Software Update" = "Mise à jour logiciel";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "עדכון תוכנה";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gfg"; */
"G8s-oM-9gf.title" = "הזכר לי מאוחר יותר";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "הערות שחרור:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "דלג על גרסה זו";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "הזכר לי מאוחר יותר";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "התקן את העדכון";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "דלג על גרסה זו";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "התקן את העדכון";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "הורד והתקן עדכונים בעתיד באופן אוטומטי";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "הורד והתקן עדכונים בעתיד באופן אוטומטי";
+3
View File
@@ -189,3 +189,6 @@
/* System profile key for Memory (MB) */
"Memory (MB)" = "זיכרון (MB)";
/* Software Update title/label */
"Software Update" = "עדכון תוכנה";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Aktualiziranje softvera";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Podsjeti me kasnije";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Napomene uz izdanje:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Zanemari ovu verziju";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Podsjeti me kasnije";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instaliraj nadogradnju";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Zanemari ovu verziju";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instaliraj nadogradnju";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Ubuduće preuzmi i instaliraj nadogradnje automatski";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Ubuduće preuzmi i instaliraj nadogradnje automatski";
+3
View File
@@ -90,3 +90,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Koristiš najnoviju verziju!";
/* Software Update title/label */
"Software Update" = "Aktualiziranje softvera";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Szoftverfrissítés";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Emlékeztessen később";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Változások az előző verzióhoz képest:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Verzió kihagyása";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Emlékeztessen később";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Telepítés";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Verzió kihagyása";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Telepítés";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "A jövőben automatikusan töltse le és telepítse a frissítéseket";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "A jövőben automatikusan töltse le és telepítse a frissítéseket";
+3
View File
@@ -60,3 +60,6 @@
/* No comment provided by engineer. */
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Mozgassa a %1$@ alkalmazást az Alkalmazások mappába, indítsa újra onnan, majd próbálja újra a frissítést.";
/* Software Update title/label */
"Software Update" = "Szoftverfrissítés";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Hugbúnaðaruppfærsla";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Áminntu mig síðar";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Útgáfupunktar:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Sleppa þessari útgáfu";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Áminntu mig síðar";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Innsetja";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Sleppa þessari útgáfu";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Innsetja";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Sækja og innsetja uppfærslur sjálfkrafa framvegis";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Sækja og innsetja uppfærslur sjálfkrafa framvegis";
+3
View File
@@ -51,3 +51,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Það er allt uppfært hjá þér!";
/* Software Update title/label */
"Software Update" = "Hugbúnaðaruppfærsla";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Aggiornamento Software";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Ricordamelo più tardi";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Note di rilascio:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Ignora questa versione";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Ricordamelo più tardi";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installa";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Ignora questa versione";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installa";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "In futuro scarica e installa automaticamente gli aggiornamenti";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "In futuro scarica e installa automaticamente gli aggiornamenti";
+3
View File
@@ -150,3 +150,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "La tua applicazione è aggiornata!";
/* Software Update title/label */
"Software Update" = "Aggiornamento Software";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "ソフトウェア・アップデート";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "あとで通知";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "リリースノート:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "このバージョンはスキップ";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "あとで通知";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "アップデートをインストール";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "このバージョンはスキップ";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "アップデートをインストール";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "今後はアップデートのダウンロードとインストールを自動で行う";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "今後はアップデートのダウンロードとインストールを自動で行う";
+3
View File
@@ -198,3 +198,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "最新版を使用しています!";
/* Software Update title/label */
"Software Update" = "ソフトウェア・アップデート";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "소프트웨어 업데이트";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "나중에";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "릴리즈 노트:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "이 버전 건너뛰기";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "나중에";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "업데이트 설치";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "이 버전 건너뛰기";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "업데이트 설치";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "향후 업데이트 자동 다운로드 및 설치";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "향후 업데이트 자동 다운로드 및 설치";
+3
View File
@@ -150,3 +150,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "최신 버전입니다.";
/* Software Update title/label */
"Software Update" = "소프트웨어 업데이트";
+8 -14
View File
@@ -1,18 +1,12 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Programoppdatering";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Utsett";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Om oppdateringen:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Hopp over";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Utsett";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installer";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Hopp over";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installer";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Last ned og installer automatisk i fremtiden";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Last ned og installer automatisk i fremtiden";
+2
View File
@@ -88,3 +88,5 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Ingen nye oppdateringer";
/* Software Update title/label */
"Software Update" = "Programoppdatering";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Software-update";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Herinner mij later";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Versiegegevens:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Sla deze versie over";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Herinner mij later";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installeer update";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Sla deze versie over";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installeer update";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Download en installeer updates voortaan automatisch";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Download en installeer updates voortaan automatisch";
+3
View File
@@ -198,3 +198,6 @@
/* No comment provided by engineer. */
"Your macOS version is too old" = "Je versie van macOS is te oud";
/* Software Update title/label */
"Software Update" = "Software-update";
+8 -14
View File
@@ -1,18 +1,12 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Programoppdatering";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Utsett";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Om oppdateringa:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Hopp over";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Utsett";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Installer";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Hopp over";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Installer";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Last ned og installer automatisk i framtida";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Last ned og installer automatisk i framtida";
+2
View File
@@ -88,3 +88,5 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Ingen nye oppdateringar";
/* Software Update title/label; */
"Software Update" = "Programoppdatering";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Uaktualnienie oprogramowania";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Przypomnij później";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Szczegóły wydania:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Pomiń tę wersję";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Przypomnij później";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Zainstaluj teraz";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Pomiń tę wersję";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Zainstaluj teraz";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Automatycznie pobierz i zainstaluj przyszłe uaktualnienia";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Automatycznie pobierz i zainstaluj przyszłe uaktualnienia";
+3
View File
@@ -81,3 +81,6 @@
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "Jesteś na bieżąco!";
/* Software Update title/label */
"Software Update" = "Uaktualnienie oprogramowania";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Atualização de Software";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Mais Tarde";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Notas do Lançamento:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Ignorar Esta Versão";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Mais Tarde";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instalar Atualização";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Ignorar Esta Versão";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instalar Atualização";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "Baixar e instalar atualizações futuras automaticamente";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "Baixar e instalar atualizações futuras automaticamente";
+3
View File
@@ -147,3 +147,6 @@
/* No comment provided by engineer. */
"Your macOS version is too old" = "A versão do macOS é antiga demais";
/* Software Update title/label */
"Software Update" = "Atualização de Software";
+8 -14
View File
@@ -1,17 +1,11 @@
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
"5.title" = "Actualização de Software";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "G8s-oM-9gf"; */
"G8s-oM-9gf.title" = "Lembrar mais tarde";
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
"170.title" = "Notas de lançamento:";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "kVE-pO-gl0"; */
"kVE-pO-gl0.title" = "Saltar esta versão";
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
"171.title" = "Lembrar mais tarde";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "IIY-s3-hkz"; */
"IIY-s3-hkz.title" = "Instalar actualização";
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
"172.title" = "Saltar esta versão";
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
"173.title" = "Instalar actualização";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
"175.title" = "No futuro, transferir e instalar actualizações automaticamente";
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "fPh-Q9-vLr"; */
"fPh-Q9-vLr.title" = "No futuro, transferir e instalar actualizações automaticamente";
Loaded 100 of 134 files, more files were not shown because too many files have changed in this diff. Show more