Compare commits

..
11 Commits
Author SHA1 Message Date
Sparkle-Bot ac2def288c Update Package management files for version 2.9.6 2026-08-16 23:18:38 +00:00
Zorg de8eb17d17 Update CHANGELOG for 2.9.6 2026-08-16 15:52:51 -07:00
Zorg f6bc73a38c Harden safety of installer moving the download archive 2026-08-16 15:29:48 -07:00
Zorg 51245ef5b9 Reject package based installs when signing validation failed (#2895)
Package updates require EdDSA signing, therefore there is no code signing mechanism to fallback on.
2026-08-16 15:29:48 -07:00
Zorg c34faaed4c Don't copy progress tool for root user (#2897)
This way we don't have to create cache directories under a different user to launch the progress tool. Longer term I want to never copy the tool.
2026-08-15 09:37:58 -07:00
Sparkle-Bot 79bc9e8729 Update Package management files for version 2.9.5 2026-07-29 15:13:39 +00:00
Zorg be4882f1ff Update CHANGELOG for 2.9.5 2026-07-29 08:06:17 -07:00
Zorg 77669eabe8 Harden patching delta file against symbolic link at destination path (#2891) 2026-07-29 08:03:59 -07:00
Sparkle-Bot b6496a74a0 Update Package management files for version 2.9.4 2026-07-02 03:38:14 +00:00
Zorg 4ba9745eca Update CHANGELOG for version 2.9.4 2026-07-01 20:33:39 -07:00
Zorg 1ec540d537 Use activateIgnoringOtherApps: again for backgrounded apps (#2890) 2026-07-01 20:33:09 -07:00
179 changed files with 4061 additions and 4203 deletions

No files matched your search

+1 -3
View File
@@ -1,4 +1,4 @@
(Insert summary of your pull request here. Major changes in functionality without prior discussion may be rejected.)
(Insert summary of your pull request here)
Fixes # (issue)
@@ -6,8 +6,6 @@ Fixes # (issue)
- [ ] My change requires a documentation update on [Sparkle's website repository](https://github.com/sparkle-project/sparkle-project.github.io)
- [ ] My change requires changes to generate_appcast, generate_keys, or sign_update
- [ ] My change updates localizations and I ran Configurations/generate_progress_tool_localizations.py if a string I updated has a comment to run it.
- [ ] My change was generated/assisted using AI and if so was reviewed by me in whole (explain in detail in the summary)
## Testing
+12 -21
View File
@@ -10,21 +10,21 @@ jobs:
build:
strategy:
matrix:
xcode: ['xcode27.2', 'xcode26.6']
xcode: ['xcode26.2', 'xcode16.4']
include:
- xcode: 'xcode27.2'
xcode-path: '/Applications/Xcode_27.2.app/Contents/Developer'
upload-dist: true
run-analyzer: true
image: 'xcode-27'
- xcode: 'xcode26.6'
xcode-path: '/Applications/Xcode_26.6.app/Contents/Developer'
- xcode: 'xcode16.4'
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
upload-dist: false
run-analyzer: false
image: 'macos-26'
macos: 'macos-15'
- xcode: 'xcode26.2'
xcode-path: '/Applications/Xcode_26.2.app/Contents/Developer'
upload-dist: true
run-analyzer: true
macos: 'macos-26'
name: Build and Test Sparkle
runs-on: ${{ matrix.image }}
runs-on: ${{ matrix.macos }}
permissions:
pull-requests: write
@@ -35,15 +35,6 @@ jobs:
with:
submodules: true
fetch-depth: 0
- name: Check Installer Progress localizations are up to date
if: ${{ matrix.upload-dist }}
run: |
python3 Configurations/generate_progress_tool_localizations.py
if [ -n "$(git status --porcelain -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist)" ]; then
echo "::error::Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h or InstallerProgress-Info.plist is out of date. Run Configurations/generate_progress_tool_localizations.py and commit the result."
git diff -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist
exit 1
fi
- name: Build Unit Tests
env:
DEVELOPER_DIR: ${{ matrix.xcode-path }}
@@ -108,7 +99,7 @@ jobs:
xcodebuild build -project Sparkle.xcodeproj -scheme Distribution -configuration Release -derivedDataPath build
- name: Archive Test Results
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v4
with:
name: build-logs
path: |
@@ -116,7 +107,7 @@ jobs:
~/Library/Logs/DiagnosticReports
- name: Upload Distribution
if: ${{ success() && matrix.upload-dist }}
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v4
with:
name: Sparkle-distribution-${{ matrix.xcode }}.tar.xz
path: build/Build/Products/Release/sparkle_dist.tar.xz
+2 -2
View File
@@ -2,7 +2,7 @@ name: "Create Draft Release"
env:
BUILDDIR: "build"
DEVELOPER_DIR: "/Applications/Xcode_27.2.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer"
on:
workflow_dispatch:
@@ -29,7 +29,7 @@ concurrency:
jobs:
release:
name: "Publish binaries for release"
runs-on: xcode-27
runs-on: macos-26
steps:
- name: "Checkout sources"
-2
View File
@@ -17,8 +17,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface AppInstaller : NSObject
- (void)start;
- (void)handleTerminationRequest;
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn));
@end
+14 -42
View File
@@ -45,10 +45,6 @@
*/
static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
// This is slightly longer than SUTerminationRequestTargetWaitDelay in the installer progress app
// to give extra time to allow receiving the termination message and finishing installation
static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
@interface AppInstaller () <NSXPCListenerDelegate, SUInstallerCommunicationProtocol, AgentConnectionDelegate>
@end
@@ -107,7 +103,6 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
BOOL _performedStage3Installation;
BOOL _targetTerminated;
BOOL _receivedTerminationRequest;
}
- (instancetype)initWithHostBundleIdentifier:(NSString *)hostBundleIdentifier homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName
@@ -252,15 +247,8 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
[_communicator handleMessageWithIdentifier:SPUExtractionStarted data:[NSData data]];
NSString *archivePath = [_updateDirectoryPath stringByAppendingPathComponent:_downloadName];
NSString *extractionMountDirectory;
if ([SUUnarchiver canUseExtractionMountDirectory:archivePath]) {
extractionMountDirectory = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:_updateDirectoryPath];
} else {
extractionMountDirectory = nil;
}
id<SUUnarchiverProtocol> unarchiver = [SUUnarchiver unarchiverForPath:archivePath extractionDirectory:_extractionDirectory extractionMountDirectory:extractionMountDirectory updatingHostBundlePath:_host.bundlePath decryptionPassword:_decryptionPassword expectingInstallationType:_installationType];
id<SUUnarchiverProtocol> unarchiver = [SUUnarchiver unarchiverForPath:archivePath extractionDirectory:_extractionDirectory updatingHostBundlePath:_host.bundlePath decryptionPassword:_decryptionPassword expectingInstallationType:_installationType];
NSError *prevalidationError = nil;
BOOL success = NO;
@@ -387,26 +375,6 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
}
}
- (void)handleTerminationRequest
{
// When we receive a termination quit request do not clean up the update directory
// to reduce risk of removing something in the directory while the installer thread tries to install/swap
// an update bundle from there
if (_performedStage1Installation) {
if (!_receivedTerminationRequest) {
_receivedTerminationRequest = YES;
// Give grace period before doing forceful exit,
// which may give some time to finish an app update installation.
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUTerminationRequestTargetWaitDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
exit(SIGTERM);
});
}
} else {
exit(SIGTERM);
}
}
- (void)agentConnectionDidInvalidate
{
if (!_finishedValidation || !_agentInitiatedConnection || !_targetTerminated) {
@@ -603,15 +571,19 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
NSURL *downloadDestinationURL = [resolvedCacheInstallationURL URLByAppendingPathComponent:downloadName isDirectory:NO];
BOOL fallbackToFileCopy;
NSError *renameError = nil;
if (![fileManager renameItemAtResolvedSymlinkURL:resolvedDownloadURL toResolvedSymlinkURL:downloadDestinationURL error:&renameError]) {
SULog(SULogLevelError, @"Error: failed to rename '%@' to '%@'. Falling back to copy operation.", resolvedDownloadURL.path, downloadDestinationURL.path);
SULogError(renameError);
fallbackToFileCopy = YES;
if (@available(macOS 11, *)) {
NSError *renameError = nil;
if (![fileManager renameItemAtResolvedSymlinkURL:resolvedDownloadURL toResolvedSymlinkURL:downloadDestinationURL error:&renameError]) {
SULog(SULogLevelError, @"Error: failed to rename '%@' to '%@'. Falling back to copy operation.", resolvedDownloadURL.path, downloadDestinationURL.path);
SULogError(renameError);
fallbackToFileCopy = YES;
} else {
fallbackToFileCopy = NO;
}
} else {
fallbackToFileCopy = NO;
fallbackToFileCopy = YES;
}
if (fallbackToFileCopy) {
+2
View File
@@ -73,6 +73,8 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUDeltaArchiveItem : NSObject
// For reading, file items cannot be extracted out of order.
@protocol SPUDeltaArchiveProtocol <NSObject>
@property (nonatomic, readonly, class) BOOL maySupportSafeExtraction;
// If non-nil, there was an error with reading or writing data from the archive
@property (nonatomic, readonly, nullable) NSError *error;
+5
View File
@@ -52,6 +52,11 @@ typedef struct
@synthesize error = _error;
+ (BOOL)maySupportSafeExtraction
{
return YES;
}
- (instancetype)initWithPatchFileForWriting:(NSString *)patchFile
{
self = [super init];
+16
View File
@@ -17,9 +17,17 @@
#include "AppKitPrevention.h"
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
#define HAS_XAR_GET_SAFE_PATH 1
#else
#define HAS_XAR_GET_SAFE_PATH 0
#endif
#if HAS_XAR_GET_SAFE_PATH
// This is preferred over xar_get_path (which is deprecated) when it's available
// Don't use OS availability for this API
extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
#endif
// Xar attribute keys
#define BINARY_DELTA_ATTRIBUTES_KEY "binary-delta-attributes"
@@ -84,6 +92,12 @@ extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
}
}
// This indicates if safe extraction is available at compile time (SDK), but not if it's available at runtime.
+ (BOOL)maySupportSafeExtraction
{
return HAS_XAR_GET_SAFE_PATH;
}
- (nullable SPUDeltaArchiveHeader *)readHeader
{
NSString *patchFile = _patchFile;
@@ -309,6 +323,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
xar_iter_t iter = xar_iter_new();
for (xar_file_t file = xar_file_first(_x, iter); file; file = xar_file_next(iter)) {
char *pathCString;
#if HAS_XAR_GET_SAFE_PATH
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
if (xar_get_safe_path != NULL) {
@@ -316,6 +331,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
}
#pragma clang diagnostic pop
else
#endif
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+5 -42
View File
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
#import <sys/stat.h>
#include <sys/time.h>
#include <unistd.h>
@@ -72,7 +71,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
// Reject patches that did not generate valid hierarchical xar container paths
// These will not succeed to patch using recent versions of BinaryDelta
if (majorDiffVersion == SUBinaryDeltaMajorVersion2 && minorDiffVersion < 3) {
if ([[archive class] maySupportSafeExtraction] && majorDiffVersion == SUBinaryDeltaMajorVersion2 && minorDiffVersion < 3) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"This patch version (%u.%u) is too old and potentially unsafe to apply. Please re-generate the patch using the latest version of BinaryDelta or generate_appcast. New version %u.%u patches will still be compatible with older versions of Sparkle.", majorDiffVersion, minorDiffVersion, majorDiffVersion, latestMinorVersionForMajorVersion(majorDiffVersion)] }];
}
@@ -175,7 +174,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
if (error != NULL) {
*error = nil;
}
[archive enumerateItems:^(SPUDeltaArchiveItem *item, BOOL *stop) {
NSString *relativePath = item.relativeFilePath;
@@ -294,9 +293,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Unable to extract diffed file to %@", tempDiffFile], NSUnderlyingErrorKey: (NSError * _Nonnull)archive.error }];
}
unlink(tempDiffFile.fileSystemRepresentation);
*stop = YES;
return;
}
@@ -309,9 +306,6 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Relative path for clone '%@' contains '..' path component", clonedRelativePath] }];
}
unlink(tempDiffFile.fileSystemRepresentation);
*stop = YES;
return;
}
@@ -456,16 +450,10 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
fprintf(stderr, "\nApplying file system compression...");
}
NSMutableArray<NSString *> *dittoArguments = [@[@"--hfsCompression"] mutableCopy];
if (@available(macOS 27, *)) {
// Compression won't be applied on macOS 27 without passing --noclone
[dittoArguments addObject:@"--noclone"];
}
[dittoArguments addObjectsFromArray:@[destination, finalDestination]];
NSTask *dittoTask = [[NSTask alloc] init];
dittoTask.executableURL = [NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO];
dittoTask.arguments = [dittoArguments copy];
dittoTask.arguments = @[@"--hfsCompression", destination, finalDestination];
// If we fail to apply file system compression, we will try falling back to not doing this
BOOL failedToApplyFileSystemCompression = NO;
@@ -499,31 +487,6 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
}
}
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
// we should make sure mdimporter bundles have an up to date modification time in case they were delta updated.
// We used to invoke mdimport on the bundle but this is not a very good approach.
// Updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle.
NSString *spotlightDirectory = [finalDestination stringByAppendingPathComponent:@"Contents/Library/Spotlight"];
for (NSString *spotlightItem in [fileManager contentsOfDirectoryAtPath:spotlightDirectory error:NULL]) {
if ([spotlightItem.pathExtension isEqualToString:@"mdimporter"]) {
const char *mdimporterPath = [spotlightDirectory stringByAppendingPathComponent:spotlightItem].fileSystemRepresentation;
// Using O_SYMLINK so we touch the item itself rather than what it may point to
int mdimporterFileDescriptor = open(mdimporterPath, O_RDONLY | O_SYMLINK);
if (mdimporterFileDescriptor == -1) {
fprintf(stderr, "\nWarning: failed to open file descriptor to touch %s: %s", mdimporterPath, strerror(errno));
continue;
}
// Using futimes() because utimes() follows symbolic links
if (futimes(mdimporterFileDescriptor, NULL) != 0) {
fprintf(stderr, "\nWarning: failed to touch %s: %s", mdimporterPath, strerror(errno));
}
close(mdimporterFileDescriptor);
}
}
progressCallback(6/7.0);
if (verbose) {
+1
View File
@@ -76,6 +76,7 @@ extern BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *des
extern BOOL modifyPermissions(NSString *path, mode_t desiredPermissions);
extern NSString *pathRelativeToDirectory(NSString *directory, NSString *path);
NSString *temporaryFilename(NSString *base);
NSString *temporaryDirectory(NSString *base);
NSString *stringWithFileSystemRepresentation(const char*);
uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersion);
#endif
+16
View File
@@ -143,6 +143,22 @@ NSString *temporaryFilename(NSString *base)
return stringWithFileSystemRepresentation(buffer);
}
NSString *temporaryDirectory(NSString *base)
{
NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.XXXXXXXXXX", base]];
NSMutableData *data = [NSMutableData data];
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
char *buffer = (char *)data.mutableBytes;
char *templateResult = mkdtemp(buffer);
if (templateResult == NULL) {
perror("mkdtemp");
return nil;
}
return stringWithFileSystemRepresentation(templateResult);
}
static void sha1HashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
{
assert(bufferLength >= 0 && bufferLength <= UINT32_MAX);
-2
View File
@@ -81,8 +81,6 @@ extern int bsdiff(int argc, const char **argv);
int result = bsdiff(4, argv);
if (result == 0) {
_resultPath = temporaryFile;
} else {
unlink(temporaryFile.fileSystemRepresentation);
}
}
+42
View File
@@ -10,6 +10,8 @@
#import "SUUnarchiverNotifier.h"
#import "SUBinaryDeltaCommon.h"
#import "SUBinaryDeltaApply.h"
#import "SULog.h"
#import "SUFileManager.h"
#include "AppKitPrevention.h"
@@ -31,6 +33,45 @@
return YES;
}
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
// We should make sure mdimporter bundles have an up to date time in the event they were delta updated.
// We used to invoke mdimport on the bundle but this is not a very good approach.
// There's no need to do that for non-delta updates and for updates that contain no mdimporters.
// Moreover, updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle
// Note: this is used from unit tests
+ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath
#ifndef BUILDING_SPARKLE_TESTS
SPU_OBJC_DIRECT
#endif
{
NSURL *targetURL = [NSURL fileURLWithPath:targetPath];
// Only recurse if it's actually a directory. Don't recurse into a
// root-level symbolic link.
NSDictionary *rootAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:targetPath error:nil];
NSString *rootType = [rootAttributes objectForKey:NSFileType];
if ([rootType isEqualToString:NSFileTypeDirectory]) {
// The NSDirectoryEnumerator will avoid recursing into any contained
// symbolic links, so no further type checks are needed.
NSDirectoryEnumerator *directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil];
NSMutableArray *filesToUpdate = [[NSMutableArray alloc] init];
for (NSURL *file in directoryEnumerator) {
if ([file.pathExtension isEqualToString:@"mdimporter"]) {
[filesToUpdate addObject:file];
}
}
SUFileManager *fileManager = [[SUFileManager alloc] init];
for (NSURL *file in filesToUpdate) {
NSError *error = nil;
if (![fileManager updateModificationAndAccessTimeOfItemAtURL:file error:&error]) {
SULog(SULogLevelError, @"Error: During delta unarchiving, failed to touch %@", error);
}
}
}
}
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory updateHostBundlePath:(NSString *)updateHostBundlePath
{
self = [super init];
@@ -69,6 +110,7 @@
}, &applyDiffError);
if (success) {
[SUBinaryDeltaUnarchiver updateSpotlightImportersAtBundlePath:targetPath];
[notifier notifySuccess];
}
else {
+1 -1
View File
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUDiskImageUnarchiver : NSObject <SUUnarchiverProtocol>
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory decryptionPassword:(nullable NSString *)decryptionPassword;
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory decryptionPassword:(nullable NSString *)decryptionPassword;
+ (BOOL)canUnarchivePath:(NSString *)path;
+43 -105
View File
@@ -22,10 +22,8 @@
NSString *_archivePath;
NSString *_decryptionPassword;
NSString *_extractionDirectory;
NSString *_extractionMountDirectory;
SUUnarchiverNotifier *_notifier;
double _currentExtractionProgress;
double _fileProgressIncrement;
}
@@ -40,14 +38,13 @@
return NO;
}
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory decryptionPassword:(nullable NSString *)decryptionPassword
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory decryptionPassword:(nullable NSString *)decryptionPassword
{
self = [super init];
if (self != nil) {
_archivePath = [archivePath copy];
_decryptionPassword = [decryptionPassword copy];
_extractionDirectory = [extractionDirectory copy];
_extractionMountDirectory = [extractionMountDirectory copy];
}
return self;
}
@@ -89,30 +86,18 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
{
@autoreleasepool {
BOOL mountedSuccessfully = NO;
// Only use modern diskutil extraction over hdiutil if extraction mount directory has been specified
BOOL useModernDiskUtilImplementation = (_extractionMountDirectory != nil);
// get a unique mount point path
NSString *mountPoint;
NSString *mountPoint = nil;
NSFileManager *manager;
NSError *error = nil;
if (useModernDiskUtilImplementation) {
mountPoint = _extractionMountDirectory;
} else {
do {
NSString *uuidString = [[NSUUID UUID] UUIDString];
mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString];
}
// Note: this check does not follow symbolic links, which is what we want
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
}
if (mountPoint == nil) {
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:@"Extraction failed because mountPoint failed to be created"}];
[notifier notifyFailureWithError:error];
return;
NSArray *contents = nil;
do {
NSString *uuidString = [[NSUUID UUID] UUIDString];
mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString];
}
// Note: this check does not follow symbolic links, which is what we want
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
NSMutableData *inputData = [NSMutableData data];
@@ -125,34 +110,22 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[inputData appendData:decryptionPasswordData];
}
if (useModernDiskUtilImplementation) {
// Unlike hdiutil, diskutil's --stdinpassphrase expects the passphrase to be
// newline-terminated rather than null-terminated
[inputData appendBytes:"\n" length:1];
} else {
// From the hdiutil docs:
// read a null-terminated passphrase from standard input
//
// Add the null terminator
[inputData appendBytes:"\0" length:1];
}
// From the hdiutil docs:
// read a null-terminated passphrase from standard input
//
// Add the null terminator
[inputData appendBytes:"\0" length:1];
// Append prompt data for license agreements
[inputData appendBytes:"yes\n" length:4];
}
// Always pass -stdinpass / --stdinpassphrase so we gracefully handle password protected disk images even if we aren't expecting them
NSArray<NSString *> *arguments;
if (useModernDiskUtilImplementation) {
arguments = @[@"image", @"attach", _archivePath, @"--mountPoint", mountPoint, @"--nobrowse", @"--stdinpassphrase"];
} else {
// Finder doesn't verify disk images anymore beyond the code signing signature (if available)
// Opt out of the old CRC checksum checks
arguments = @[@"attach", _archivePath, @"-mountpoint", mountPoint, @"-noverify", @"-nobrowse", @"-noautoopen", @"-stdinpass"];
}
// Finder doesn't verify disk images anymore beyond the code signing signature (if available)
// Opt out of the old CRC checksum checks
// Also always pass -stdinpass so we gracefully handle password protected disk images even if we aren't expecting them
NSArray *arguments = @[@"attach", _archivePath, @"-mountpoint", mountPoint, @"-noverify", @"-nobrowse", @"-noautoopen", @"-stdinpass"];
NSData *output = nil;
NSData *errorOutput = nil;
NSInteger taskResult = -1;
NSURL *mountPointURL = [NSURL fileURLWithPath:mountPoint isDirectory:YES];
@@ -160,61 +133,30 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
NSMutableArray<NSString *> *itemsToExtract = [NSMutableArray array];
NSUInteger totalFileExtractionCount = 0;
NSFileManager *manager = nil;
NSArray *contents = nil;
BOOL success = YES;
{
NSTask *task = [[NSTask alloc] init];
if (useModernDiskUtilImplementation) {
task.executableURL = [NSURL fileURLWithPath:@"/usr/sbin/diskutil" isDirectory:NO];
} else {
task.executableURL = [NSURL fileURLWithPath:@"/usr/bin/hdiutil" isDirectory:NO];
task.currentDirectoryPath = @"/";
}
task.launchPath = @"/usr/bin/hdiutil";
task.currentDirectoryPath = @"/";
task.arguments = arguments;
NSPipe *inputPipe = [NSPipe pipe];
NSPipe *outputPipe = [NSPipe pipe];
NSPipe *errorPipe = [NSPipe pipe];
task.standardInput = inputPipe;
task.standardOutput = outputPipe;
task.standardError = errorPipe;
dispatch_queue_t captureQueue = dispatch_queue_create("org.sparkle-project.sparkle.dmg-output", DISPATCH_QUEUE_SERIAL);
NSFileHandle *fileStdHandle = outputPipe.fileHandleForReading;
NSMutableData *currentOutput = [NSMutableData data];
fileStdHandle.readabilityHandler = ^(NSFileHandle *file) {
NSData *availableData = file.availableData;
dispatch_sync(captureQueue, ^{
[currentOutput appendData:availableData];
});
[currentOutput appendData:file.availableData];
};
NSFileHandle *fileErrHandle = errorPipe.fileHandleForReading;
NSMutableData *currentErrorOutput = [NSMutableData data];
fileErrHandle.readabilityHandler = ^(NSFileHandle *file) {
NSData *availableData = file.availableData;
dispatch_sync(captureQueue, ^{
[currentErrorOutput appendData:availableData];
});
};
__block NSData *capturedOutput = nil;
__block NSData *capturedErrorOutput = nil;
dispatch_semaphore_t terminationSemaphore = dispatch_semaphore_create(0);
task.terminationHandler = ^(NSTask *__unused terminatingTask) {
fileStdHandle.readabilityHandler = nil;
fileErrHandle.readabilityHandler = nil;
dispatch_semaphore_signal(terminationSemaphore);
};
@@ -223,31 +165,35 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
goto reportError;
}
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
goto reportError;
if (@available(macOS 10.15, *)) {
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
goto reportError;
}
}
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
else
{
@try {
[inputPipe.fileHandleForWriting writeData:inputData];
} @catch (NSException *) {
goto reportError;
}
}
#endif
[inputPipe.fileHandleForWriting closeFile];
dispatch_semaphore_wait(terminationSemaphore, DISPATCH_TIME_FOREVER);
dispatch_sync(captureQueue, ^{
capturedOutput = [currentOutput copy];
capturedErrorOutput = [currentErrorOutput copy];
});
output = capturedOutput;
errorOutput = capturedErrorOutput;
output = [currentOutput copy];
taskResult = task.terminationStatus;
}
if (taskResult != 0) {
NSString *resultStr = output ? [[NSString alloc] initWithData:output encoding:NSUTF8StringEncoding] : nil;
NSString *errorStr = errorOutput ? [[NSString alloc] initWithData:errorOutput encoding:NSUTF8StringEncoding] : nil;
SULog(SULogLevelError, @"%@ failed with code: %ld data: <<%@>> error: <<%@>>", (useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil"), (long)taskResult, resultStr, errorStr);
SULog(SULogLevelError, @"hdiutil failed with code: %ld data: <<%@>>", (long)taskResult, resultStr);
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed due to %@ returning %ld status: %@", useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil", (long)taskResult, resultStr]}];
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed due to hdiutil returning %ld status: %@", (long)taskResult, resultStr]}];
goto reportError;
}
@@ -350,24 +296,16 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
finally:
if (mountedSuccessfully) {
NSTask *task = [[NSTask alloc] init];
if (useModernDiskUtilImplementation) {
task.launchPath = @"/usr/sbin/diskutil";
task.arguments = @[@"eject", @"force", mountPoint];
} else {
task.launchPath = @"/usr/bin/hdiutil";
task.arguments = @[@"detach", mountPoint, @"-force"];
}
task.launchPath = @"/usr/bin/hdiutil";
task.arguments = @[@"detach", mountPoint, @"-force"];
task.standardOutput = [NSPipe pipe];
task.standardError = [NSPipe pipe];
NSError *launchCleanupError = nil;
if (![task launchAndReturnError:&launchCleanupError]) {
SULog(SULogLevelError, @"%@ failed to unmount %@", (useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil"), mountPoint);
SULog(SULogLevelError, @"Failed to unmount %@", mountPoint);
SULog(SULogLevelError, @"Error: %@", launchCleanupError);
} else if (waitForCleanup || !success) {
// On the failure path the caller may immediately remove the directory the mount point lives in,
// so don't report failure until the volume is actually gone
} else if (waitForCleanup) {
[task waitUntilExit];
}
} else {
+8 -24
View File
@@ -21,17 +21,6 @@
@implementation SUInstaller
static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *> *names)
{
for (NSString *name in names) {
// This handles unicode normalization but is still a case sensitive comparison
if ([filename compare:name] == NSOrderedSame) {
return YES;
}
}
return NO;
}
+ (nullable NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host
#if SPARKLE_BUILD_PACKAGE_SUPPORT
isPackage:(BOOL *)isPackagePtr isGuided:(BOOL *)isGuidedPtr
@@ -43,15 +32,8 @@ static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *
// Search subdirectories for the application
NSString *currentFile,
*newAppDownloadPath = nil,
*bundleExtension = [[host bundlePath] pathExtension];
NSOrderedSet<NSString *> *hostNames = [host infoDictionaryNames];
NSMutableOrderedSet<NSString *> *bundleFileNames = [NSMutableOrderedSet orderedSet];
for (NSString *hostName in hostNames) {
NSString *bundleFileName = [hostName stringByAppendingPathExtension:bundleExtension];
if (bundleFileName != nil) {
[bundleFileNames addObject:bundleFileName];
}
}
*bundleFileName = [[host bundlePath] lastPathComponent],
*alternateBundleFileName = [[host name] stringByAppendingPathExtension:[[host bundlePath] pathExtension]];
#if SPARKLE_BUILD_PACKAGE_SUPPORT
NSString *fallbackPackagePath = nil;
@@ -59,6 +41,7 @@ static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *
BOOL isGuided = YES;
#endif
NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:inUpdateFolder];
NSString *bundleFileNameNoExtension = [bundleFileName stringByDeletingPathExtension];
while ((currentFile = [dirEnum nextObject])) {
NSString *currentPath = [inUpdateFolder stringByAppendingPathComponent:currentFile];
@@ -95,7 +78,8 @@ static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *
NSString *currentExtension = [currentFile pathExtension];
NSString *currentFilenameNoExtension = [currentFilename stringByDeletingPathExtension];
#endif
if (SUFilenameMatchesAnyName(currentFilename, bundleFileNames)) // We found one!
if ([currentFilename isEqualToString:bundleFileName] ||
[currentFilename isEqualToString:alternateBundleFileName]) // We found one!
{
#if SPARKLE_BUILD_PACKAGE_SUPPORT
isPackage = NO;
@@ -105,7 +89,7 @@ static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *
#if SPARKLE_BUILD_PACKAGE_SUPPORT
} else if ([currentExtension isEqualToString:@"pkg"] ||
[currentExtension isEqualToString:@"mpkg"]) {
if (SUFilenameMatchesAnyName(currentFilenameNoExtension, hostNames)) {
if ([currentFilenameNoExtension isEqualToString:bundleFileNameNoExtension]) {
isPackage = YES;
newAppDownloadPath = currentPath;
break;
@@ -154,13 +138,13 @@ static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *
#endif
if (!newAppDownloadPath) {
SULog(SULogLevelError, @"Searched %@ for {%@}.(app%@) or bundle identifier %@", inUpdateFolder, [hostNames.array componentsJoinedByString:@", "],
SULog(SULogLevelError, @"Searched %@ for %@.(app%@)", inUpdateFolder, bundleFileNameNoExtension,
#if SPARKLE_BUILD_PACKAGE_SUPPORT
@"|pkg"
#else
@""
#endif
, host.bundle.bundleIdentifier);
);
}
return newAppDownloadPath;
}
+103 -24
View File
@@ -41,12 +41,25 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
@".tar.lzma" : extractTXZ,
} mutableCopy];
NSArray <NSString *> *extractAppleArchive = @[@"/usr/bin/aa", @"extract", @"-d"];
[extractCommandDictionary addEntriesFromDictionary:@{
@".aar" : extractAppleArchive,
@".yaa" : extractAppleArchive,
}];
// At least the latest versions of 10.15 understand how to extract aar files
// Versions before 10.15 do not understand extracting newly created aar files
// Note encrypted aea files are supported in macOS 12 onwards, if we ever want to support those one day
if (@available(macOS 10.15.7, *)) {
NSString *appleArchiveCommand;
if (@available(macOS 11, *)) {
appleArchiveCommand = @"/usr/bin/aa";
} else {
// In 10.15 the utility was named yaa, which was later renamed to aar
appleArchiveCommand = @"/usr/bin/yaa";
}
NSArray <NSString *> *extractAppleArchive = @[appleArchiveCommand, @"extract", @"-d"];
[extractCommandDictionary addEntriesFromDictionary:@{
@".aar" : extractAppleArchive,
@".yaa" : extractAppleArchive,
}];
}
NSString *lastPathComponent = [path lastPathComponent];
for (NSString *currentType in extractCommandDictionary)
@@ -221,12 +234,38 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
NSFileHandle *archiveOutput = [pipe fileHandleForWriting];
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
BOOL hasIOErrorMethods;
if (@available(macOS 10.15, *)) {
hasIOErrorMethods = YES;
} else {
hasIOErrorMethods = NO;
}
#endif
do {
NSError *readError = nil;
NSData *data = [archiveInput readDataUpToLength:256*1024 error:&readError];
if (data == nil) {
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
underlyingOutError = readError;
NSData *data;
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
if (!hasIOErrorMethods) {
@try {
data = [archiveInput readDataOfLength:256*1024];
} @catch (NSException *exception) {
SULog(SULogLevelError, @"Failed to read data from archive with exception reason %@", exception.reason);
data = nil;
}
}
else
#endif
{
NSError *readError = nil;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
data = [archiveInput readDataUpToLength:256*1024 error:&readError];
#pragma clang diagnostic pop
if (data == nil) {
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
underlyingOutError = readError;
}
}
NSUInteger len = [data length];
@@ -235,13 +274,37 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
}
NSError *writeError = nil;
if (![archiveOutput writeData:data error:&writeError]) {
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
underlyingOutError = underlyingPOSIXError;
break;
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
if (!hasIOErrorMethods) {
@try {
[archiveOutput writeData:data];
} @catch (NSException *exception) {
SULog(SULogLevelError, @"Failed to write data to pipe with exception reason %@", exception.reason);
if ([exception.name isEqualToString:NSFileHandleOperationException]) {
NSError *underlyingFileHandleError = exception.userInfo[@"NSFileHandleOperationExceptionUnderlyingError"];
NSError *underlyingPOSIXError = underlyingFileHandleError.userInfo[NSUnderlyingErrorKey];
underlyingOutError = underlyingPOSIXError;
}
break;
}
}
else
#endif
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
if (![archiveOutput writeData:data error:&writeError]) {
#pragma clang diagnostic pop
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
underlyingOutError = underlyingPOSIXError;
break;
}
}
bytesWritten += len;
@@ -250,15 +313,31 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
}
while(bytesWritten < expectedLength);
NSError *archiveOutputCloseError = nil;
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
if (@available(macOS 10.15, *)) {
NSError *archiveOutputCloseError = nil;
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
}
}
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
else
{
[archiveOutput closeFile];
}
#endif
NSError *archiveInputCloseError = nil;
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
if (@available(macOS 10.15, *)) {
NSError *archiveInputCloseError = nil;
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
}
}
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
else
{
[archiveInput closeFile];
}
#endif
}
[task waitUntilExit];
+1 -5
View File
@@ -14,11 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUUnarchiver : NSObject
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType;
// Returns YES if unarchiving path can take advantage of an extraction mount directory being provided to -unarchiverForPath:extractionDirectory:extractionMountDirectory:updatingHostBundlePath:decryptionPassword:expectingInstallationType:
// Callers should provide an extraction mount directory when this returns YES
+ (BOOL)canUseExtractionMountDirectory:(NSString *)path;
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType;
@end
+2 -17
View File
@@ -18,28 +18,13 @@
@implementation SUUnarchiver
+ (BOOL)canUseExtractionMountDirectory:(NSString *)path
{
if (![SUDiskImageUnarchiver canUnarchivePath:path]) {
return NO;
}
// By providing a directory for mounting, this lets the disk image unarchiver use diskutil over hdiutil
// diskutil extraction works well across all dmgs only on macOS 27.2+
if (@available(macOS 27.2, *)) {
return YES;
} else {
return NO;
}
}
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType
{
if ([SUPipedUnarchiver canUnarchivePath:path]) {
return [[SUPipedUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory];
}
else if ([SUDiskImageUnarchiver canUnarchivePath:path]) {
return [[SUDiskImageUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory extractionMountDirectory:extractionMountDirectory decryptionPassword:decryptionPassword];
return [[SUDiskImageUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory decryptionPassword:decryptionPassword];
}
else if ([SUBinaryDeltaUnarchiver canUnarchivePath:path]) {
assert(hostPath != nil);
+5 -1
View File
@@ -28,7 +28,11 @@ int main(int __unused argc, const char __unused *argv[])
dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigtermSource, ^{
[appInstaller handleTerminationRequest];
// Don't clear the update directory because the installer may be in middle of installing an update
// We still need to set an event handler for receiving SIGTERM though, otherwise our job may not terminate
// (This is also recommended from the developer documentation).
// Simply exit with SIGTERM if we receive this signal
exit(SIGTERM);
});
dispatch_resume(sigtermSource);
-35
View File
@@ -1,38 +1,3 @@
# 2.11.0
* Add sparkle:bundleIdentifier element on appcast for signed feeds (#2954) (Zorg)
* Avoid using host bundle filename for finding bundle to update (#2953) (Zorg)
* Activate app if update check is initiated from NSStatusItem (#2950) (Niklas Wenzel)
* Update Japanese localization (#2948) (1024jp)
# 2.10.1
* Fix not trimming whitespace/newline characters from <sparkle:releaseNotesLink> (#2944) (Zorg)
* Fix update being installed prematurely if it's located in NFC unicode encoded path (#2943) (Zorg)
* Update Danish translation (#2940) (Sebastian Livoni)
* Add missing "Install on Quit" localizations for uk, ru, fr, es, pt-PT. (#2931) (Andrii Selivanov)
* Add and update translations for Chinese (Hong Kong) (zh-HK) (#2926) (Tiffany Fung)
* Drop stale sparkle:format when generate_appcast embeds HTML release notes (#2927) (Leo Camus)
* Skip en and Base when recording Sparkle locales in generate_appcast (#2925) (Leo Camus)
* Fix appcast child elements being ignored when the Sparkle namespace uses a custom prefix (#2923) (Leo Camus)
# 2.10.0
* Bump minimum deployment target to macOS 12.0 (#2883, #2892) (Zorg, F1248)
* Don't copy updater progress tool app outside of its bundle (#2900) (Zorg)
* Fix updating not working the first time if bundle ID ends with ".service" or other irregular bundle-like extensions (#2909) (Zorg, youngjunning)
* Fix using appcast length fallback if server reports no content size (resulting in indeterminate progress) (#2922) (Zorg)
* Fix reading release notes content length from appcast for signed feed diagnostics (#2921) (Leo Camus)
* Update European Portuguese localization (#2912) (Andrei)
* Fix temporary file leaks when applying binary delta file fails (#2906) (Zorg)
* Optimize and move updating mdimporter bundles to BinaryDelta applying code (#2905) (Zorg)
* Fix re-applying file system compression for delta updates on macOS 27 (#2904) (Zorg)
* Remove CocoaPods support (#2899) (Zorg)
macOS 12.0 or later is now required (due to Xcode 27 dropping support for deploying to older OS versions). CocoaPods support is also now dropped.
If you're not generating appcasts automatically, remember to add `<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>` element to `<item>`s in your appcast.
# 2.9.6
* Harden safety of installer moving the download archive (#2898) (Zorg, Joshua Rogers)
+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", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
{"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", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
+6 -6
View File
@@ -46,7 +46,7 @@ SPARKLE_COPY_LOCALIZATIONS = 1
OTHER_SWIFT_FLAGS_COMMON = -DSPARKLE_BUILD_LEGACY_DSA_SUPPORT -DGENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT -DSPARKLE_BUILD_PACKAGE_SUPPORT
// Minimum supported macOS version
MACOSX_DEPLOYMENT_TARGET = 12.0
MACOSX_DEPLOYMENT_TARGET = 10.13
// Archs to use for Sparkle
// You can change this for example to add arm64e or remove x86_64
@@ -98,13 +98,13 @@ SPARKLE_ICON_NAME = AppIcon
// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
// These variables must have a space after the '=' too
SPARKLE_VERSION_MAJOR = 2
SPARKLE_VERSION_MINOR = 11
SPARKLE_VERSION_PATCH = 0
SPARKLE_VERSION_MINOR = 9
SPARKLE_VERSION_PATCH = 6
// This should be in SemVer format or empty, ie. "-beta.1"
// These variables must have a space after the '=' too
SPARKLE_VERSION_SUFFIX = -beta.1
CURRENT_PROJECT_VERSION = 2066
SPARKLE_VERSION_SUFFIX =
CURRENT_PROJECT_VERSION = 2061
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
@@ -169,7 +169,7 @@ GCC_WARN_UNUSED_PARAMETER = YES
GCC_WARN_UNUSED_VARIABLE = YES
// Turn on all warnings, then disable a few which are almost impossible to avoid
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-pre-c11-compat -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
// Prevents spurious warnings based on dependency scan considering Sparkle itself a dependency
DIAGNOSE_MISSING_TARGET_DEPENDENCIES = NO
@@ -1,153 +0,0 @@
#!/usr/bin/env python3
#
# generate_progress_tool_localizations.py
#
# The Installer Progress helper is a minimal tool that minimizes loading resolve resources.
# This script reads the localizations from Sparkle/*.lproj/Sparkle.strings
# and generates a header with the handful of strings the tool needs.
# It also keeps CFBundleLocalizations in InstallerProgress-Info.plist in sync
# with the set of locales found.
#
# This script must be re-run by hand after changing any of the strings below in
# Sparkle/*.lproj/Sparkle.strings, or after adding/removing a locale.
# Output is deterministic between runs.
import glob
import json
import os
import plistlib
import subprocess
import sys
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
REPO_ROOT = os.path.dirname(SCRIPT_DIR)
SPARKLE_DIR = os.path.join(REPO_ROOT, "Sparkle")
OUTPUT_HEADER = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "SPUInstallerProgressLocalizedStrings.h")
INFO_PLIST = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "InstallerProgress-Info.plist")
# Fixed order so regenerating the header without content changes never reorders keys
REQUIRED_KEYS = (
"Cancel Update",
"Installing update…",
"Updating %@",
)
# Base.lproj holds the canonical/development-language (English) strings, but "Base"
# is not a real locale identifier for +[NSBundle preferredLocalizationsFromArray:]
# to match against, so it's keyed as "en" in the generated table.
LPROJ_LOCALE_OVERRIDES = {
"Base": "en",
}
def load_strings(strings_path):
result = subprocess.run(
["plutil", "-convert", "json", "-o", "-", strings_path],
capture_output=True,
check=True,
text=True,
)
return json.loads(result.stdout)
def objc_string_literal(value):
escaped = value.replace("\\", "\\\\").replace('"', '\\"')
escaped = escaped.replace("\n", "\\n").replace("\t", "\\t")
return '@"' + escaped + '"'
def collect_localizations():
localizations = {}
lproj_dirs = sorted(glob.glob(os.path.join(SPARKLE_DIR, "*.lproj")))
for lproj_dir in lproj_dirs:
lproj_name = os.path.basename(lproj_dir)[: -len(".lproj")]
locale = LPROJ_LOCALE_OVERRIDES.get(lproj_name, lproj_name)
strings_path = os.path.join(lproj_dir, "Sparkle.strings")
if not os.path.isfile(strings_path):
continue
table = load_strings(strings_path)
localized_values = {}
for key in REQUIRED_KEYS:
value = table.get(key)
if value is None:
print("warning: %s.lproj/Sparkle.strings is missing key %r" % (lproj_name, key), file=sys.stderr)
continue
localized_values[key] = value
if localized_values:
localizations[locale] = localized_values
return localizations
def generate_header(localizations):
lines = []
lines.append("//")
lines.append("// SPUInstallerProgressLocalizedStrings.h")
lines.append("// Sparkle")
lines.append("//")
lines.append("// This file is auto-generated by Configurations/generate_progress_tool_localizations.py")
lines.append("// Do not edit by hand. Re-run the script after changing the strings below in")
lines.append("// Sparkle/*.lproj/Sparkle.strings")
lines.append("//")
lines.append("")
lines.append("#import <Foundation/Foundation.h>")
lines.append("")
lines.append("static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{")
for locale in sorted(localizations.keys()):
lines.append(' @"%s": @{' % locale)
for key in REQUIRED_KEYS:
value = localizations[locale].get(key)
if value is None:
continue
lines.append(" %s: %s," % (objc_string_literal(key), objc_string_literal(value)))
lines.append(" },")
lines.append("};")
lines.append("")
return "\n".join(lines)
def update_info_plist_localizations(locales):
with open(INFO_PLIST, "rb") as f:
plist = plistlib.load(f)
sorted_locales = sorted(locales)
if plist.get("CFBundleLocalizations") == sorted_locales:
print("%s is already up to date (%d locales)" % (INFO_PLIST, len(sorted_locales)))
return
plist["CFBundleLocalizations"] = sorted_locales
# sort_keys=False preserves the existing top-level key order, so only
# CFBundleLocalizations's contents change in the diff
with open(INFO_PLIST, "wb") as f:
plistlib.dump(plist, f, fmt=plistlib.FMT_XML, sort_keys=False)
print("Wrote %s (%d locales)" % (INFO_PLIST, len(sorted_locales)))
def update_header(localizations):
header_contents = generate_header(localizations)
if os.path.isfile(OUTPUT_HEADER):
with open(OUTPUT_HEADER, "r", encoding="utf-8") as f:
if f.read() == header_contents:
print("%s is already up to date (%d locales)" % (OUTPUT_HEADER, len(localizations)))
return
with open(OUTPUT_HEADER, "w", encoding="utf-8") as f:
f.write(header_contents)
print("Wrote %s (%d locales)" % (OUTPUT_HEADER, len(localizations)))
def main():
localizations = collect_localizations()
update_header(localizations)
update_info_plist_localizations(localizations.keys())
if __name__ == "__main__":
main()
+6 -2
View File
@@ -122,9 +122,10 @@ if [ "$ACTION" = "" ] ; then
exit 1
fi
# Generate new Package manifest and carthage files
# Generate new Package manifest, podspec, and carthage files
cd "$CONFIGURATION_BUILD_DIR"
cp "$PROJECT_DIR/Package.swift" "$CONFIGURATION_BUILD_DIR"
cp "$PROJECT_DIR/Sparkle.podspec" "$CONFIGURATION_BUILD_DIR"
cp "$PROJECT_DIR/Carthage-dev.json" "$CONFIGURATION_BUILD_DIR"
fi
@@ -140,11 +141,14 @@ if [ "$ACTION" = "" ] ; then
echo "Version: $MARKETING_VERSION"
echo "Tag: $latest_git_tag"
echo "Checksum: $spm_checksum"
sed -E -i '' -e "/s\.version.+=/ s/\".+\"/\"$MARKETING_VERSION\"/" "Sparkle.podspec"
"$PROJECT_DIR/Configurations/update-carthage.py" "Carthage-dev.json" "$MARKETING_VERSION"
cp "Sparkle.podspec" "$PROJECT_DIR"
# Note the Carthage-dev.json file will finally be copied to the website repo in Carthage/Sparkle.json in the end
cp "Carthage-dev.json" "$PROJECT_DIR"
echo "Carthage-dev.json is updated with following values:"
echo "Sparkle.podspec and Carthage-dev.json updated with following values:"
echo "Version: $MARKETING_VERSION"
else
echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually."
+4 -4
View File
@@ -13,10 +13,10 @@ function move_tag() {
long_message=$(git tag -n99 -l $latest_git_tag) # gets corresponding message
long_message=${long_message/$latest_git_tag} # trims tag name
long_message="$(echo -e "${long_message}" | sed -e 's/^[[:space:]]*//')" # trim leading whitespace
git add Package.swift Carthage-dev.json
git add Package.swift Sparkle.podspec Carthage-dev.json
git commit -m "Update Package management files for version ${latest_git_tag}"
git tag -fa $latest_git_tag -m "${long_message}"
echo "Package.swift is committed and tag '$latest_git_tag' moved."
echo "Package.swift and Sparkle.podspec committed and tag '$latest_git_tag' moved."
}
if [ "$commits_since_tag" -gt 0 ]; then
@@ -27,11 +27,11 @@ elif [ "$CI" == true ]; then
move_tag
else
# TODO: add sanity check to see if version is actually being updated or not?
read -p "Do you want to commit changes to Package.swift, Carthage-dev.json, and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
read -p "Do you want to commit changes to Package.swift, Sparkle.podspec, Carthage-dev.json and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
echo # (optional) move to a new line
if [[ $REPLY =~ ^[Yy]$ ]]; then
move_tag
else
echo "Package.swift and Carthage-dev.json have not been committed and tag has not been moved."
echo "Package.swift, Sparkle.podspec, and Carthage-dev.json have not been committed and tag has not been moved."
fi
fi
+2 -2
View File
@@ -312,9 +312,9 @@ static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable resp
return;
}
if (!_receivedExpectedBytes) {
if (totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
_receivedExpectedBytes = YES;
[_delegate downloaderDidReceiveExpectedContentLength:(totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown) ? totalBytesExpectedToWrite : 0];
[_delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite];
}
if (bytesWritten >= 0) {
+53 -4
View File
@@ -32,7 +32,7 @@
@implementation SUInstallerLauncher
- (BOOL)submitProgressToolAtPath:(NSString *)progressToolPath withHostBundle:(NSBundle *)hostBundle inSystemDomainForInstaller:(BOOL)inSystemDomainForInstaller SPU_OBJC_DIRECT
- (BOOL)submitProgressToolAtPath:(NSString *)progressToolPath withHostBundle:(NSBundle *)hostBundle inSystemDomainForInstaller:(BOOL)inSystemDomainForInstaller copiedApplication:(BOOL)copiedApplication SPU_OBJC_DIRECT
{
SUFileManager *fileManager = [[SUFileManager alloc] init];
@@ -53,7 +53,7 @@
NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
NSArray<NSString *> *arguments = @[executablePath, hostBundlePath, @(inSystemDomainForInstaller).stringValue];
NSArray<NSString *> *arguments = @[executablePath, hostBundlePath, @(inSystemDomainForInstaller).stringValue, @(copiedApplication).stringValue];
// The progress tool can only be ran as the logged in user, not as root
CFStringRef domain = kSMDomainUserLaunchd;
@@ -192,7 +192,15 @@
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:iconBundlePath];
// Creating a bitmap representation at a specific size is much cheaper than asking for icon's TIFFRepresentation
const NSInteger imageDimensions = 64;
// 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];
@@ -525,11 +533,52 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
}
}
// It may be tempting here to validate/match the signature of the installer and progress tool, however this is not very reliable
// We can't compare the signature of this framework/XPC service (depending how it's run) to the host bundle because
// they could be different (eg: take a look at sparkle-cli). We also can't easily tell if the signature of the service/framework is the same as the bundle it's inside.
// The service/framework also need not even be signed in the first place. We'll just assume for now the original bundle hasn't been tampered with
// Don't create cache directories or copy the progress tool app outside of the bundle for root user,
// because the app will not start if it's contained inside directories owned by root,
// and un-doing that opens up potential security issues.
// Eventually we will also want to not copy the tool app in the !rootUser case, minimizing risk
// by not making that change yet.
BOOL copyProgressTool = !rootUser;
NSString *progressToolPath;
if (copyProgressTool) {
NSString *cachePath = [SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier];
NSString *rootLauncherCachePath = [cachePath stringByAppendingPathComponent:@"Launcher"];
[SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath];
NSString *launcherCachePath = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath];
if (launcherCachePath == nil) {
SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
}
progressToolPath = [launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app"];
NSError *copyError = nil;
// SUFileManager is more reliable for copying files around
SUFileManager *fileManager = [[SUFileManager alloc] init];
if (![fileManager copyItemAtURL:[NSURL fileURLWithPath:progressToolResourcePath] toURL:[NSURL fileURLWithPath:progressToolPath] error:&copyError]) {
SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
}
} else {
progressToolPath = progressToolResourcePath;
}
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:mainBundle.bundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
BOOL submittedProgressTool = NO;
if (installerStatus == SUInstallerLauncherSuccess) {
submittedProgressTool = [self submitProgressToolAtPath:progressToolResourcePath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
submittedProgressTool = [self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain copiedApplication:copyProgressTool];
if (!submittedProgressTool) {
SULog(SULogLevelError, @"Failed to submit progress tool job");
+2
View File
@@ -16,6 +16,8 @@ release:
xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build
./Configurations/release-move-tag.sh
open "$(BUILDDIR)/Build/Products/Release/"
cat Sparkle.podspec
@echo "Don't forget to update CocoaPods! pod trunk push"
@echo "Don't forget to upload Sparkle-for-Swift-Package-Manager.zip!"
build:
+5 -5
View File
@@ -1,16 +1,16 @@
// swift-tools-version:5.5
// swift-tools-version:5.3
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.11.0-beta.1"
let version = "2.9.6"
// 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.11.0-beta.1"
let checksum = "584825d2ca202cea34bbe6442c2c3c227030e5fd042dc1dff2b51060cf79c141"
let tag = "2.9.6"
let checksum = "8d5fb41d960b43f4a68aa14126bf62b098544ec8d191cdcc73eb14e63a8e7606"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
name: "Sparkle",
platforms: [.macOS(.v12)], // leaving "12.0" as a breadcrumb for searching; aligned with swift-tools-version at top of file (see https://developer.apple.com/documentation/packagedescription/supportedplatform/macosversion)
platforms: [.macOS(.v10_13)], // leaving "10.13" as a breadcrumb for searching
products: [
.library(
name: "Sparkle",
+2 -2
View File
@@ -1,4 +1,4 @@
# Sparkle 2 [![Build Status](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
# Sparkle 2 [![Build Status](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?cacheSeconds=86400)](https://cocoapods.org/pods/Sparkle)
Secure and reliable software update framework for macOS.
@@ -29,7 +29,7 @@ Please visit [Sparkle's website](http://sparkle-project.org) for up to date docu
## Requirements
* Runtime: macOS 12.0 or later on `2.x`, macOS 10.13 or later on `2.9.6`.
* Runtime: macOS 10.13 or later.
* Build: Latest major Xcode (stable or beta, whichever is latest) and one major version less.
* HTTPS server for serving updates (see [App Transport Security](http://sparkle-project.org/documentation/app-transport-security/))
+21 -9
View File
@@ -8,35 +8,47 @@
<title>Version 2.0 (2 bugs fixed; 3 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:version>2.0</sparkle:version>
<sparkle:releaseNotesLink>https://you.com/app/2.0.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>
https://you.com/app/2.0.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php
</sparkle:fullReleaseNotesLink>
<pubDate>Wed, 09 Jan 2006 19:20:11 +0000</pubDate>
<enclosure url="https://you.com/app/Your%20Great%20App%202.0.zip" length="1623481" type="application/octet-stream" sparkle:edSignature="WVyVJpOx+a5+vNWJVY79TRjFKveNk+VhGJf2iti4CZtJsJewIUGvh/1AKKEAFbH1qUwx+vro1ECuzOsMmumoBA==" />
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
</item>
<item>
<title>Version 1.5 (8 bugs fixed; 2 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:version>1.5</sparkle:version>
<sparkle:releaseNotesLink>https://you.com/app/1.5.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.5</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>
https://you.com/app/1.5.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php?up-to=1.5
</sparkle:fullReleaseNotesLink>
<pubDate>Wed, 01 Jan 2006 12:20:11 +0000</pubDate>
<enclosure url="https://you.com/app/Your%20Great%20App%201.5.zip" length="1472893" type="application/octet-stream" sparkle:edSignature="pNFd7KbcQSu+Mq7UYrbQXTPq82luht2ACXm/r2utp1u/Uv/5hWqctdT2jwQgMejW7DRoeV/hVr6J4VdZYdwWDw==" />
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
</item>
<!-- Now here's an example of a version with a weird internal version number (like an SVN revision) but a human-readable external one. -->
<item>
<title>Version 1.4 (5 bugs fixed; 2 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:releaseNotesLink>https://you.com/app/1.4.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.4</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>
https://you.com/app/1.4.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php?up-to=1.4
</sparkle:fullReleaseNotesLink>
<sparkle:version>241</sparkle:version>
<sparkle:shortVersionString>1.4</sparkle:shortVersionString>
<pubDate>Wed, 25 Dec 2005 12:20:11 +0000</pubDate>
<enclosure url="https://you.com/app/Your%20Great%20App%201.4.zip" sparkle:edSignature="Ody3D/ybSMH4T+P/oNj3LN4F0SA8RJGLEr1TI4UemrBAiJ9aEcDnYV3u58P75AbcFjI13jPYmHDUHXMSTFQbDw==" length="1472349" type="application/octet-stream" />
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
</item>
</channel>
</rss>
+33
View File
@@ -0,0 +1,33 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "2.9.6"
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"
s.documentation_url = "https://sparkle-project.org/documentation/"
s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow2.png"
s.license = {
:type => 'MIT',
:file => 'LICENSE'
}
s.authors = {
'Zorg' => 'zorgiepoo@gmail.com',
'Kornel Lesiński' => 'pornel@pornel.net',
'Jake Petroules' => 'jake.petroules@petroules.com',
'C.W. Betts' => 'computers57@hotmail.com',
'Andy Matuschak' => 'andy@andymatuschak.org',
}
s.platform = :osx, '10.13'
s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.xz" }
s.source_files = 'Sparkle.framework/Versions/B/Headers/*.h'
s.preserve_paths = ['bin/*', 'Symbols']
s.public_header_files = 'Sparkle.framework/Versions/B/Headers/*.h'
s.vendored_frameworks = 'Sparkle.framework'
s.xcconfig = {
'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"',
'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks'
}
s.requires_arc = true
end
+89 -33
View File
@@ -53,6 +53,7 @@
14958C6F19AEBC980061B14F /* test-pubkey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 14958C6C19AEBC610061B14F /* test-pubkey.pem */; };
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */ = {isa = PBXBuildFile; fileRef = 1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */; };
3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
55C14F06136EF6DB00649790 /* SULog.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F04136EF6DB00649790 /* SULog.h */; };
55C14F07136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 55E6F33219EC9F6C00005E76 /* SUErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -141,7 +142,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 */; };
7212F16330A0311500BC9C7D /* testappcast_bundleIdentifiers.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */; };
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 */; };
@@ -169,6 +169,8 @@
72266A8B29464CEA00645376 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
72266A8C29464D0200645376 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */; };
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */; };
7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */; };
7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */; };
7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */; };
722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -195,7 +197,6 @@
723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */; };
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 723F25FD2E75F76400462999 /* AppIcon.icon */; };
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7240852D2CA11C1400ED2FCD /* libz.tbd */; };
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */; };
72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
@@ -301,6 +302,7 @@
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
7267E5F91D3D92DA00D1BF90 /* Autoupdate in Copy Tools */ = {isa = PBXBuildFile; fileRef = 72B398D21D3D879300EE297F /* Autoupdate */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5A41D3D8A8A00D1BF90 /* StatusInfo.m */; };
7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */; };
7269E494264798200088C213 /* SPUSkippedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7269E492264798200088C213 /* SPUSkippedUpdate.h */; };
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
@@ -357,8 +359,6 @@
729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */; };
729F7ECE27409077004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip in Resources */ = {isa = PBXBuildFile; fileRef = 729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */; };
72A1C2631CD6849C004CD282 /* SUUpdatePermissionPrompt.h in Headers */ = {isa = PBXBuildFile; fileRef = 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */; };
72A1C982305EC3E10009ECA3 /* SPUReleaseNotesDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */; };
72A1C983305EC3E10009ECA3 /* SPUReleaseNotesDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */; };
72A450531C69A68900D67EEA /* SUUpdatePermissionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
72A450541C69A68900D67EEA /* SUUpdatePermissionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */; };
72A4A2401BB6567D00E7820D /* SUFileManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */; };
@@ -374,11 +374,26 @@
72AEB1D929A1CB510033883E /* SPUNoUpdateFoundInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 72AEB1D729A1CB510033883E /* SPUNoUpdateFoundInfo.m */; };
72B3DEC91E23472200457642 /* SPUDownloadedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */; };
72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */; };
72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */; };
72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */; };
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767C81C9B707000A07552 /* SUAppcastDriver.h */; };
72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767C91C9B707000A07552 /* SUAppcastDriver.m */; };
72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */; };
72B767CF1C9B924900A07552 /* SPUInstallerDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */; };
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */; };
72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */; };
72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */; };
72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */; };
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */; };
72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */; };
72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */; };
72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */; };
72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */; };
72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */; };
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */; };
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */; };
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
@@ -395,8 +410,6 @@
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */; };
72C56E202F04B3760005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */ = {isa = PBXBuildFile; fileRef = 72C56E212F04C28B0005A484 /* testreleasenotes.html */; };
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */; };
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */; };
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */; };
72D04F3D2B094C8400A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
@@ -420,7 +433,7 @@
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */; };
72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */ = {isa = PBXBuildFile; fileRef = 721C24451CB753E6005440CB /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
72EBE788305E4E3200AB3A73 /* SPUUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */; };
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */; settings = {ATTRIBUTES = (Private, ); }; };
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -918,6 +931,7 @@
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>"; };
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Sparkle.podspec; sourceTree = SOURCE_ROOT; };
14732BB1195FF6B700593899 /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = SOURCE_ROOT; };
14732BB91960EEEE00593899 /* SampleAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SampleAppcast.xml; sourceTree = "<group>"; };
14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; };
@@ -943,6 +957,7 @@
4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = "<group>"; };
525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
555CF29A196C52330000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Sparkle.strings; sourceTree = "<group>"; };
55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = "<group>"; };
55C14F04136EF6DB00649790 /* SULog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULog.h; sourceTree = "<group>"; };
55C14F05136EF6DB00649790 /* SULog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SULog.m; sourceTree = "<group>"; };
55C14F31136EFC2400649790 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -1040,7 +1055,6 @@
720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_minimumAutoupdateVersionSkipping2.xml; sourceTree = "<group>"; };
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>"; };
7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_bundleIdentifiers.xml; sourceTree = "<group>"; };
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; 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>"; };
@@ -1068,6 +1082,8 @@
722589B51E0A24B9005EA0B9 /* Security.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Security.md; sourceTree = "<group>"; };
722589B61E0A24C6005EA0B9 /* Design Practices.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Design Practices.md"; sourceTree = "<group>"; };
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdateDriver.h; sourceTree = "<group>"; };
7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUScheduledUpdateDriver.h; sourceTree = "<group>"; };
7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUScheduledUpdateDriver.m; sourceTree = "<group>"; };
7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadDriver.h; sourceTree = "<group>"; };
7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadDriver.m; sourceTree = "<group>"; };
722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUGentleUserDriverReminders.h; sourceTree = "<group>"; };
@@ -1132,7 +1148,6 @@
723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTouchBarButtonGroup.m; sourceTree = "<group>"; };
723DFF962B3DFF6E00628E6C /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_channels.xml; sourceTree = "<group>"; };
723F25FD2E75F76400462999 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
7240852D2CA11C1400ED2FCD /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUpdaterSettings+Debug.h"; sourceTree = "<group>"; };
7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUpdaterController.h; sourceTree = "<group>"; };
@@ -1230,6 +1245,7 @@
7267E5DD1D3D8F5A00D1BF90 /* SUStatusInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUStatusInfoProtocol.h; path = Autoupdate/SUStatusInfoProtocol.h; sourceTree = SOURCE_ROOT; };
7267E5E31D3D90AA00D1BF90 /* SUFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUFileManager.h; sourceTree = "<group>"; };
7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUFileManager.m; sourceTree = "<group>"; };
7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUResumableUpdate.h; sourceTree = "<group>"; };
7269E492264798200088C213 /* SPUSkippedUpdate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUSkippedUpdate.h; sourceTree = "<group>"; };
7269E493264798200088C213 /* SPUSkippedUpdate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUSkippedUpdate.m; sourceTree = "<group>"; };
7269E4992648F7C00088C213 /* SPUUserUpdateState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUserUpdateState.m; sourceTree = "<group>"; };
@@ -1287,8 +1303,6 @@
729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUserAgent+Private.h"; sourceTree = "<group>"; };
729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SPUUserAgent+Private.m"; sourceTree = "<group>"; };
729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_extraneous.zip; sourceTree = "<group>"; };
72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUReleaseNotesDriver.h; sourceTree = "<group>"; };
72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUReleaseNotesDriver.m; sourceTree = "<group>"; };
72A40F082956120D007C7DD5 /* ConfigFrameworkRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigFrameworkRelease.xcconfig; sourceTree = "<group>"; };
72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdatePermissionResponse.h; sourceTree = "<group>"; };
72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdatePermissionResponse.m; sourceTree = "<group>"; };
@@ -1309,21 +1323,32 @@
72B398D21D3D879300EE297F /* Autoupdate */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Autoupdate; sourceTree = BUILT_PRODUCTS_DIR; };
72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadedUpdate.h; sourceTree = "<group>"; };
72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadedUpdate.m; sourceTree = "<group>"; };
72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInformationalUpdate.h; sourceTree = "<group>"; };
72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInformationalUpdate.m; sourceTree = "<group>"; };
72B767C81C9B707000A07552 /* SUAppcastDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcastDriver.h; sourceTree = "<group>"; };
72B767C91C9B707000A07552 /* SUAppcastDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcastDriver.m; sourceTree = "<group>"; };
72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInstallerDriver.h; sourceTree = "<group>"; };
72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInstallerDriver.m; sourceTree = "<group>"; };
72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbingUpdateDriver.h; sourceTree = "<group>"; };
72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbingUpdateDriver.m; sourceTree = "<group>"; };
72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUBasicUpdateDriver.h; sourceTree = "<group>"; };
72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUBasicUpdateDriver.m; sourceTree = "<group>"; };
72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUIBasedUpdateDriver.h; sourceTree = "<group>"; };
72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUIBasedUpdateDriver.m; sourceTree = "<group>"; };
72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserInitiatedUpdateDriver.h; sourceTree = "<group>"; };
72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUserInitiatedUpdateDriver.m; sourceTree = "<group>"; };
72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUCoreBasedUpdateDriver.h; sourceTree = "<group>"; };
72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCoreBasedUpdateDriver.m; sourceTree = "<group>"; };
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAutomaticUpdateDriver.h; sourceTree = "<group>"; };
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAutomaticUpdateDriver.m; sourceTree = "<group>"; };
72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs.dmg; sourceTree = "<group>"; };
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallerProgressLocalizedStrings.h; sourceTree = "<group>"; };
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = generate_progress_tool_localizations.py; sourceTree = "<group>"; };
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUSpotlightImporterTest.swift; sourceTree = "<group>"; };
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUExtractSignedFeed.h; sourceTree = "<group>"; };
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUExtractSignedFeed.m; sourceTree = "<group>"; };
72C56E0F2EFEF10B0005A484 /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = "<group>"; };
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUAppcastSigningValidationStatus.h; sourceTree = "<group>"; };
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SUFeedSignatureVerifierTest.swift; sourceTree = "<group>"; };
72C56E212F04C28B0005A484 /* testreleasenotes.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = testreleasenotes.html; sourceTree = "<group>"; };
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.no-text.dmg"; sourceTree = "<group>"; };
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg"; sourceTree = "<group>"; };
72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_header.zip; sourceTree = "<group>"; };
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUVerifierInformation.h; sourceTree = "<group>"; };
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUVerifierInformation.m; sourceTree = "<group>"; };
@@ -1356,7 +1381,6 @@
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedApp.zip; sourceTree = "<group>"; };
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedAppVersion2.zip; sourceTree = "<group>"; };
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShowInstallerProgress.m; path = Sparkle/InstallerProgress/ShowInstallerProgress.m; sourceTree = SOURCE_ROOT; };
72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUpdateDriver.m; sourceTree = "<group>"; };
72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUInstallerLauncher+Private.h"; sourceTree = "<group>"; };
72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdateCheck.h; sourceTree = "<group>"; };
72EF30BA2675CF38008CE987 /* SPUAppcastItemStateResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAppcastItemStateResolver.h; sourceTree = "<group>"; };
@@ -1702,6 +1726,7 @@
children = (
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */,
61AAE8220A321A7F00D8810D /* Sparkle.strings */,
55C14BD8136EF00C00649790 /* SUStatus.xib */,
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */,
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */,
);
@@ -1803,8 +1828,6 @@
F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */,
726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */,
726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */,
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */,
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */,
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */,
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */,
726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */,
@@ -1827,7 +1850,6 @@
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */,
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */,
);
path = Resources;
sourceTree = "<group>";
@@ -1909,6 +1931,7 @@
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */,
72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */,
5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */,
14950074195FDF5900BC5B5B /* SUUpdaterTest.m */,
@@ -2042,7 +2065,6 @@
72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */,
72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */,
61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */,
723F25FD2E75F76400462999 /* AppIcon.icon */,
72F0EC44278A55CA002A876A /* screenshot.png */,
);
name = "Test Application";
@@ -2068,20 +2090,26 @@
61CFB2C20E38496B007A1735 /* Drivers */ = {
isa = PBXGroup;
children = (
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */,
72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */,
72B767E81C9D114F00A07552 /* Update Drivers */,
72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */,
72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */,
72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */,
72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */,
7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */,
7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */,
7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */,
72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */,
72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */,
72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */,
72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */,
72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */,
72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */,
728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */,
728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */,
72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */,
72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */,
72B767C81C9B707000A07552 /* SUAppcastDriver.h */,
72B767C91C9B707000A07552 /* SUAppcastDriver.m */,
72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */,
72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */,
);
name = Drivers;
sourceTree = "<group>";
@@ -2131,7 +2159,6 @@
72D954801CBACC35006F28BD /* InstallerProgressAppController.m */,
72D954851CBAD4AE006F28BD /* InstallerProgressDelegate.h */,
72D954821CBAD34F006F28BD /* main.m */,
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */,
72D954841CBAD418006F28BD /* ShowInstallerProgress.h */,
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */,
722194511D3BF987004C34FF /* SPUInstallerAgentProtocol.h */,
@@ -2295,6 +2322,22 @@
path = Autoupdate;
sourceTree = "<group>";
};
72B767E81C9D114F00A07552 /* Update Drivers */ = {
isa = PBXGroup;
children = (
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */,
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */,
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */,
72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */,
72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */,
7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */,
7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */,
72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */,
72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */,
);
name = "Update Drivers";
sourceTree = "<group>";
};
72D9549F1CBB415C006F28BD /* sparkle-cli */ = {
isa = PBXGroup;
children = (
@@ -2447,7 +2490,7 @@
72045CE426FEE708004F96E5 /* strip-framework.sh */,
720C192827127A3800740C8E /* release-move-tag.sh */,
720B4C2325EBFAFD005A0592 /* link-tools.sh */,
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */,
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */,
);
path = Configurations;
sourceTree = "<group>";
@@ -2460,10 +2503,14 @@
buildActionMask = 2147483647;
files = (
61299B3609CB04E000B7442F /* Sparkle.h in Headers */,
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */,
72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */,
72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */,
72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */,
72EF30C12675CF38008CE987 /* SPUAppcastItemState.h in Headers */,
72AEB1D429A1A74E0033883E /* SPUStandardVersionDisplay.h in Headers */,
7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */,
7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */,
7267E5B61D3D8AEE00D1BF90 /* SPUInstallationInfo.h in Headers */,
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */,
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */,
@@ -2475,6 +2522,8 @@
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */,
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */,
723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */,
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */,
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */,
726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */,
7246E0A31C83B685003B4E75 /* SPUStandardUpdaterController.h in Headers */,
725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */,
@@ -2489,9 +2538,9 @@
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */,
61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */,
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */,
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */,
7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */,
72DBA37D1D60CC34002594A8 /* SPUUpdatePermissionRequest.h in Headers */,
72A1C983305EC3E10009ECA3 /* SPUReleaseNotesDriver.h in Headers */,
61B5F8ED09C4CE3C00B25A18 /* SPUUpdater.h in Headers */,
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */,
72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */,
@@ -2501,6 +2550,7 @@
723ABFC4259D4CB300BDB4FA /* SUWKWebView.h in Headers */,
72AEB1D829A1CB510033883E /* SPUNoUpdateFoundInfo.h in Headers */,
725CB9571C7120410064365A /* SPUUserDriver.h in Headers */,
72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */,
72F94F581CC44DE1002DEE68 /* SPUXPCServiceInfo.h in Headers */,
61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */,
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
@@ -2516,6 +2566,7 @@
55C14F06136EF6DB00649790 /* SULog.h in Headers */,
EA1E286E22B665F0004AA304 /* SUSignatures.h in Headers */,
723ABF1B259D055E00BDB4FA /* SUReleaseNotesView.h in Headers */,
72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */,
726F2CE51BC9C33D001971A4 /* SUOperatingSystem.h in Headers */,
61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */,
6196CFF909C72148000DC222 /* SUStatusController.h in Headers */,
@@ -3094,7 +3145,6 @@
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */,
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */,
72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
@@ -3120,10 +3170,8 @@
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */,
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
7212F16330A0311500BC9C7D /* testappcast_bundleIdentifiers.xml in Resources */,
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */,
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */,
5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
729F7EAC27366353004592DC /* test-links.xml in Resources */,
);
@@ -3138,7 +3186,6 @@
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */,
72F0EC45278A55CA002A876A /* screenshot.png in Resources */,
72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */,
);
@@ -3148,6 +3195,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3200,6 +3248,7 @@
61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */,
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */,
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */,
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -3333,6 +3382,7 @@
14652F8219A9746000959E44 /* SULog.m in Sources */,
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */,
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */,
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */,
7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */,
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */,
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */,
@@ -3555,6 +3605,9 @@
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */,
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */,
723ABF31259D062F00BDB4FA /* SULegacyWebView.m in Sources */,
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */,
72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */,
72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */,
72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */,
723ABFC5259D4CB300BDB4FA /* SUWKWebView.m in Sources */,
7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */,
@@ -3565,12 +3618,15 @@
72EF30BF2675CF38008CE987 /* SPUAppcastItemState.m in Sources */,
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */,
7267E5B21D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */,
72EBE788305E4E3200AB3A73 /* SPUUpdateDriver.m in Sources */,
72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */,
728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */,
72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */,
7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */,
726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */,
7246E0A41C83B685003B4E75 /* SPUStandardUpdaterController.m in Sources */,
725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */,
723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */,
72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */,
72DBA37E1D60CC34002594A8 /* SPUUpdatePermissionRequest.m in Sources */,
72EF30C02675CF38008CE987 /* SPUAppcastItemStateResolver.m in Sources */,
61B5F8EE09C4CE3C00B25A18 /* SPUUpdater.m in Sources */,
@@ -3579,8 +3635,8 @@
726E078E1CA891E9001A286B /* SPUUpdaterSettings.m in Sources */,
721D588F25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m in Sources */,
72F9EC401D5E823F004AC8B6 /* SPUUpdaterTimer.m in Sources */,
72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */,
72F94F591CC44DE1002DEE68 /* SPUXPCServiceInfo.m in Sources */,
72A1C982305EC3E10009ECA3 /* SPUReleaseNotesDriver.m in Sources */,
61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */,
72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */,
61B5FC6F09C51F4900B25A18 /* SUAppcastItem.m in Sources */,
@@ -58,15 +58,7 @@
value = "DELTA_AND_MARKDOWN"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "TEST_MODE"
value = "SUPERSEDE"
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
<MetalAPIValidationSettings
isEnabled = "No">
</MetalAPIValidationSettings>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
+3 -3
View File
@@ -91,7 +91,7 @@
/* No comment provided by engineer. */
"Cancel" = "Cancel";
/* Run generate_progress_tool_localizations.py after updating. */
/* No comment provided by engineer. */
"Cancel Update" = "Cancel Update";
/* No comment provided by engineer. */
@@ -124,7 +124,7 @@
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Install on Quit";
/* Run generate_progress_tool_localizations.py after updating. */
/* Take care not to overflow the status window. */
"Installing update…" = "Installing update…";
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
@@ -184,7 +184,7 @@
/* No comment provided by engineer. */
"Update Installed" = "Update Installed";
/* Run generate_progress_tool_localizations.py after updating. */
/* No comment provided by engineer. */
"Updating %@" = "Updating %@";
/* No comment provided by engineer. */
+2 -2
View File
@@ -30,13 +30,13 @@
<string>1</string>
<key>CFBundleLocalizations</key>
<array>
<string>ar</string>
<string>en</string>
<string>ca</string>
<string>ar</string>
<string>cs</string>
<string>da</string>
<string>de</string>
<string>el</string>
<string>en</string>
<string>es</string>
<string>fa</string>
<string>fi</string>
@@ -18,8 +18,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface InstallerProgressAppController : NSObject <NS
- (void)run;
- (void)handleTerminationRequest;
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn));
@end
+56 -105
View File
@@ -11,6 +11,7 @@
#import "SPUMessageTypes.h"
#import "SULog.h"
#import "SULog+NSError.h"
#import "SUApplicationInfo.h"
#import "SPUInstallerAgentProtocol.h"
#import "SUInstallerAgentInitiationProtocol.h"
#import "StatusInfo.h"
@@ -28,9 +29,11 @@
*/
static const NSTimeInterval SUTerminationTimeDelay = 0.3;
// This is slightly shorter than SUTerminationRequestTargetWaitDelay in Autoupdate
// to give Autoupdate extra time to allow receiving the termination message and finishing installation
static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 140000
@interface NSApplication (ActivationAPIs)
- (void)activate;
@end
#endif
@interface InstallerProgressAppController () <NSApplicationDelegate, SPUInstallerAgentProtocol>
@end
@@ -51,7 +54,6 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
__weak id<InstallerProgressDelegate> _delegate;
void (^_terminationCompletionHandler)(void);
dispatch_source_t _targetProcessExitSource;
BOOL _connected;
BOOL _repliedToRegistration;
@@ -60,15 +62,14 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
BOOL _submittedLauncherJob;
BOOL _willTerminate;
BOOL _applicationInitiallyAlive;
BOOL _receivedTerminationRequest;
BOOL _targetProcessExited;
BOOL _copiedApplication;
}
- (instancetype)initWithApplication:(NSApplication *)application arguments:(NSArray<NSString *> *)arguments delegate:(id<InstallerProgressDelegate>)delegate
{
self = [super init];
if (self != nil) {
if (arguments.count != 3) {
if (arguments.count != 4) {
SULog(SULogLevelError, @"Error: Invalid number of arguments supplied: %@", arguments);
[self cleanupAndExitWithStatus:EXIT_FAILURE error:nil];
}
@@ -114,6 +115,10 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
_application = application;
_delegate = delegate;
BOOL copiedApplication = arguments[3].boolValue;
[delegate loadLocalizationStringsFromHost:host copiedApplication:copiedApplication];
_copiedApplication = copiedApplication;
_connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol)];
_connection.exportedObject = self;
@@ -179,39 +184,6 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
[self startConnection];
}
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)__unused sender
{
[self handleTerminationRequest];
return NSTerminateLater;
}
- (void)handleTerminationRequest
{
// Check if we're going to terminate anyway
if (_receivedTerminationRequest) {
return;
}
// If Autoupdate installer is listening for termination completion,
// we will delay termination for a bit to allow us some time to observe
// the targetted app's termination, otherwise we will exit immediately
if (_terminationCompletionHandler == nil) {
[self cleanupAndExitWithStatus:SIGTERM error:nil];
}
_receivedTerminationRequest = YES;
if (_targetProcessExited) {
[self notifyTargetTermination];
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUTerminationRequestTargetWaitDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self cleanupAndExitWithStatus:SIGTERM error:nil];
});
}
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn))
{
if (error != nil) {
@@ -223,17 +195,35 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
[_statusInfo invalidate];
[_connection invalidate];
if (_copiedApplication) {
// Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
NSError *theError = nil;
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
if (![[NSFileManager defaultManager] removeItemAtPath:bundlePath error:&theError]) {
SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
} else {
// There should be nothing else in the parent temporary directory given to us,
// so let us try to remove it. Note rmdir() will fail if there are unexpectably other
// items present
NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
if (fileSystemRepresentation != NULL) {
if (rmdir(fileSystemRepresentation) != 0) {
SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
}
}
}
}
exit(status);
}
- (NSArray<NSRunningApplication *> *)runningApplicationsWithBundle:(NSBundle *)bundle SPU_OBJC_DIRECT
{
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same.
// Make sure to use -[NSURL URLByResolvingSymlinksInPath] rather than -[NSString stringByResolvingSymlinksInPath]
// because the former will normalize it to proper file system representation.
// This is also done when retrieving NSRunningApplication path further below
NSArray<NSString *> *bundlePathComponents = bundle.bundleURL.URLByResolvingSymlinksInPath.pathComponents;
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same
NSArray<NSString *> *bundlePathComponents = bundle.bundlePath.stringByResolvingSymlinksInPath.pathComponents;
NSString *bundleIdentifier = bundle.bundleIdentifier;
NSMutableArray<NSRunningApplication *> *matchedRunningApplications = [[NSMutableArray alloc] init];
@@ -246,7 +236,7 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = [[NSMutableArray alloc] init];
BOOL needsToHandleImproperBundles;
if (@available(macOS 26, *)) {
if (@available(macOS 16, *)) {
needsToHandleImproperBundles = NO;
} else {
needsToHandleImproperBundles = YES;
@@ -355,49 +345,17 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
NSString *isTerminatedKeyPath = NSStringFromSelector(@selector(isTerminated));
if ([keyPath isEqualToString:isTerminatedKeyPath]) {
if (_targetRunningApplication.terminated && _terminationCompletionHandler != nil) {
[self notifyTargetTermination];
_terminationCompletionHandler();
[_targetRunningApplication removeObserver:self forKeyPath:isTerminatedKeyPath];
_terminationCompletionHandler = nil;
_targetRunningApplication = nil;
}
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}
- (void)notifyTargetTermination SPU_OBJC_DIRECT
{
if (_terminationCompletionHandler == nil) {
return;
}
_terminationCompletionHandler();
_terminationCompletionHandler = nil;
[_targetRunningApplication removeObserver:self forKeyPath:NSStringFromSelector(@selector(isTerminated))];
_targetRunningApplication = nil;
if (_targetProcessExitSource != nil) {
dispatch_source_cancel(_targetProcessExitSource);
_targetProcessExitSource = nil;
}
}
- (void)targetProcessDidExit SPU_OBJC_DIRECT
{
if (_targetProcessExited) {
return;
}
_targetProcessExited = YES;
if (_targetProcessExitSource != nil) {
dispatch_source_cancel(_targetProcessExitSource);
_targetProcessExitSource = nil;
}
if (_receivedTerminationRequest && _terminationCompletionHandler != nil) {
[self notifyTargetTermination];
}
}
- (void)listenForTerminationWithCompletion:(void (^)(void))completionHandler
{
dispatch_async(dispatch_get_main_queue(), ^{
@@ -414,23 +372,6 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
self->_terminationCompletionHandler = [completionHandler copy];
[self->_targetRunningApplication addObserver:self forKeyPath:NSStringFromSelector(@selector(isTerminated)) options:NSKeyValueObservingOptionNew context:NULL];
pid_t targetProcessIdentifier = self->_targetRunningApplication.processIdentifier;
if (targetProcessIdentifier > 0) {
dispatch_source_t targetProcessExitSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, (uintptr_t)targetProcessIdentifier, DISPATCH_PROC_EXIT, dispatch_get_main_queue());
if (targetProcessExitSource != nil) {
self->_targetProcessExitSource = targetProcessExitSource;
dispatch_source_set_event_handler(targetProcessExitSource, ^{
[self targetProcessDidExit];
});
dispatch_resume(targetProcessExitSource);
if (kill(targetProcessIdentifier, 0) != 0 && errno == ESRCH) {
[self targetProcessDidExit];
}
}
}
}
} else {
SULog(SULogLevelError, @"Error: -listenForTerminationWithCompletion: called in unexpected state");
@@ -470,7 +411,7 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
- (void)relaunchApplication
{
dispatch_async(dispatch_get_main_queue(), ^{
if (!self->_willTerminate && !self->_receivedTerminationRequest && self->_applicationBundle != nil && self->_applicationInitiallyAlive) {
if (!self->_willTerminate && self->_applicationBundle != nil && self->_applicationInitiallyAlive) {
NSString *pathToRelaunch;
if (self->_normalizedPath != nil) {
pathToRelaunch = self->_normalizedPath;
@@ -506,10 +447,20 @@ static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
- (void)showProgress
{
dispatch_async(dispatch_get_main_queue(), ^{
if (!self->_willTerminate && !self->_receivedTerminationRequest) {
if (!self->_willTerminate) {
// Show app icon in the dock
ProcessSerialNumber psn = { 0, kCurrentProcess };
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
// Note: the application icon needs to be set after showing the icon in the dock
self->_application.applicationIconImage = [SUApplicationInfo bestIconForHost:self->_oldHost];
// Activate ourselves otherwise we will probably be in the background
// See comments in -[SPUStandardUserDriver _activateApplication] for why -activate is not used
[self->_application activateIgnoringOtherApps:YES];
if (@available(macOS 14, *)) {
[self->_application activate];
} else {
[self->_application activateIgnoringOtherApps:YES];
}
[self->_delegate installerProgressShouldDisplayWithHost:self->_oldHost];
}
+1
View File
@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@protocol InstallerProgressDelegate <NSObject>
- (void)loadLocalizationStringsFromHost:(SUHost *)host copiedApplication:(BOOL)copiedApplication;
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host;
- (void)installerProgressShouldStop;
@@ -1,190 +0,0 @@
//
// SPUInstallerProgressLocalizedStrings.h
// Sparkle
//
// This file is auto-generated by Configurations/generate_progress_tool_localizations.py
// Do not edit by hand. Re-run the script after changing the strings below in
// Sparkle/*.lproj/Sparkle.strings
//
#import <Foundation/Foundation.h>
static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{
@"ar": @{
@"Cancel Update": @"إلغاء التحديث",
@"Updating %@": @"تحديث %@",
},
@"ca": @{
@"Installing update…": @"Instal·lant l'actualització…",
@"Updating %@": @"Actualitzant %@",
},
@"cs": @{
@"Cancel Update": @"Zrušit aktualizaci",
@"Installing update…": @"Instaluje se aktualizace…",
@"Updating %@": @"Aktualizuje se %@",
},
@"da": @{
@"Cancel Update": @"Annuller opdatering",
@"Installing update…": @"Installerer opdatering…",
@"Updating %@": @"Opdaterer %@",
},
@"de": @{
@"Cancel Update": @"Aktualisierung abbrechen",
@"Installing update…": @"Update installieren …",
@"Updating %@": @"Aktualisierung von %@",
},
@"el": @{
@"Cancel Update": @"Ακύρωση Ενημέρωσης",
@"Installing update…": @"Εγκατάσταση ενημέρωσης…",
@"Updating %@": @"Ενημέρωση %@",
},
@"en": @{
@"Cancel Update": @"Cancel Update",
@"Installing update…": @"Installing update…",
@"Updating %@": @"Updating %@",
},
@"es": @{
@"Cancel Update": @"Cancelar actualización",
@"Installing update…": @"Instalando actualización…",
@"Updating %@": @"Actualizando %@",
},
@"fa": @{
@"Cancel Update": @"لغو به‌روزرسانی",
@"Installing update…": @"در حال نصب به‌روزرسانی",
@"Updating %@": @"%@ در حال به‌روزرسانی",
},
@"fi": @{
@"Cancel Update": @"Peruuta päivitykset",
@"Installing update…": @"Päivitys asennetaan…",
@"Updating %@": @"Päivitetään %@",
},
@"fr": @{
@"Cancel Update": @"Annuler la mise à jour",
@"Installing update…": @"Installation de la mise à jour…",
@"Updating %@": @"Mise à jour de %@",
},
@"he": @{
@"Cancel Update": @"בטל את העדכון",
@"Installing update…": @"מתקין את העדכון",
@"Updating %@": @"עדכון %@",
},
@"hr": @{
@"Cancel Update": @"Prekini aktualiziranje",
@"Installing update…": @"Instaliranje nadogradnje …",
@"Updating %@": @"%@ se aktualizira",
},
@"hu": @{
@"Cancel Update": @"Frissítés megszakítása",
@"Installing update…": @"Frissítés telepítése…",
@"Updating %@": @"%@ frissítése",
},
@"is": @{
@"Installing update…": @"Set inn uppfærslu…",
@"Updating %@": @"Uppfæri %@",
},
@"it": @{
@"Cancel Update": @"Annulla Aggiornamento",
@"Installing update…": @"Installazione aggiornamento in corso…",
@"Updating %@": @"Aggiornamento di %@",
},
@"ja": @{
@"Cancel Update": @"アップデートをキャンセル",
@"Installing update…": @"アップデートをインストールしています…",
@"Updating %@": @"%@をアップデート中",
},
@"ko": @{
@"Cancel Update": @"업데이트 취소",
@"Installing update…": @"설치 중…",
@"Updating %@": @"%@ 업데이트 중",
},
@"nb": @{
@"Cancel Update": @"Avbryt oppdateringen",
@"Installing update…": @"Installerer oppdateringen…",
@"Updating %@": @"Oppdaterer %@",
},
@"nl": @{
@"Cancel Update": @"Annuleer update",
@"Installing update…": @"Update installeren…",
@"Updating %@": @"%@ bijwerken…",
},
@"nn": @{
@"Cancel Update": @"Avbryt oppdateringa",
@"Installing update…": @"Installerer oppdateringa…",
@"Updating %@": @"Oppdaterer %@",
},
@"pl": @{
@"Cancel Update": @"Anuluj uaktualnianie",
@"Installing update…": @"Instalowanie uaktualnienia…",
@"Updating %@": @"Uaktualniam %@",
},
@"pt-BR": @{
@"Cancel Update": @"Cancelar Atualização",
@"Installing update…": @"Instalando atualização…",
@"Updating %@": @"Atualizando o app %@",
},
@"pt-PT": @{
@"Cancel Update": @"Cancelar atualização",
@"Installing update…": @"A instalar atualização…",
@"Updating %@": @"A atualizar o %@",
},
@"ro": @{
@"Cancel Update": @"Anulează actualizarea",
@"Installing update…": @"Instalează actualizarea…",
@"Updating %@": @"Actualizează %@",
},
@"ru": @{
@"Cancel Update": @"Отменить обновление",
@"Installing update…": @"Устанавливаю обновление…",
@"Updating %@": @"Обновляю %@",
},
@"sk": @{
@"Cancel Update": @"Zrušiť aktualizáciu",
@"Installing update…": @"Inštaluje sa aktualizácia…",
@"Updating %@": @"Aktualizuje sa %@",
},
@"sl": @{
@"Cancel Update": @"Prekliči posodabljanje",
@"Installing update…": @"Nameščanje posodobitve …",
@"Updating %@": @"Posodabljam %@",
},
@"sv": @{
@"Cancel Update": @"Avbryt uppdatering",
@"Installing update…": @"Installerar uppdatering…",
@"Updating %@": @"Uppdaterar %@",
},
@"th": @{
@"Cancel Update": @"ยกเลิกอัพเดท",
@"Installing update…": @"กำลังติดตั้งอัพเดท…",
@"Updating %@": @"กำลังอัพเดท %@",
},
@"tr": @{
@"Cancel Update": @"Güncellemeden Vazgeç",
@"Installing update…": @"Güncelleme kuruluyor…",
@"Updating %@": @"%@ güncelleniyor",
},
@"uk": @{
@"Cancel Update": @"Відмінити оновлення",
@"Installing update…": @"Встановлюю оновлення…",
@"Updating %@": @"Оновлюю %@",
},
@"vi": @{
@"Cancel Update": @"Hủy cập nhật",
@"Installing update…": @"Đang cài đặt bản cập nhật…",
@"Updating %@": @"Đang cập nhật %@",
},
@"zh_CN": @{
@"Cancel Update": @"取消更新",
@"Installing update…": @"正在安装更新…",
@"Updating %@": @"正在更新%@",
},
@"zh_HK": @{
@"Cancel Update": @"取消更新",
@"Installing update…": @"正在安裝更新⋯",
@"Updating %@": @"正在更新 %@",
},
@"zh_TW": @{
@"Cancel Update": @"取消更新",
@"Installing update…": @"正在安裝更新項目⋯",
@"Updating %@": @"正在更新%@",
},
};
+88 -30
View File
@@ -10,50 +10,108 @@
#import "ShowInstallerProgress.h"
#import "SUStatusController.h"
#import "SUHost.h"
#if SPARKLE_COPY_LOCALIZATIONS
#import "SPUInstallerProgressLocalizedStrings.h"
#endif
#import "SULocalizations.h"
@implementation ShowInstallerProgress
{
SUStatusController *_statusController;
NSString *_updatingString;
NSString *_cancelUpdateTitle;
NSString *_installingUpdateTitle;
}
#if SPARKLE_COPY_LOCALIZATIONS
// SPUInstallerProgressLocalizedStringsTable is generated at development time (by Configurations/generate_progress_tool_localizations.py)
static NSDictionary<NSString *, NSString *> *SUBestMatchingInstallerProgressLocalizedStrings(void)
- (void)createStatusControllerWithHost:(SUHost *)host SPU_OBJC_DIRECT
{
NSArray<NSString *> *availableLocalizations = SPUInstallerProgressLocalizedStringsTable.allKeys;
NSArray<NSString *> *preferredLocalizations = [NSBundle preferredLocalizationsFromArray:availableLocalizations];
NSString *bestLocalization = preferredLocalizations.firstObject ?: @"en";
return SPUInstallerProgressLocalizedStringsTable[bestLocalization] ?: SPUInstallerProgressLocalizedStringsTable[@"en"];
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
}
- (void)loadLocalizationStringsFromHost:(SUHost *)host copiedApplication:(BOOL)copiedApplication
{
// Try to retrieve localization strings from the old bundle if possible
// We won't display these strings until installerProgressShouldDisplayWithHost:
// (which will be after the update is trusted)
// If we fail to load localizations in any way, we default to English
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *hostSparkleBundle;
{
NSURL *hostSparkleURL = [host.bundle.privateFrameworksURL URLByAppendingPathComponent:@"Sparkle.framework" isDirectory:YES];
if (hostSparkleURL == nil) {
hostSparkleBundle = nil;
} else {
hostSparkleBundle = [NSBundle bundleWithURL:hostSparkleURL];
}
}
#endif
NSString *updatingString;
{
NSString *hostNameFromBundle = host.name;
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
#if SPARKLE_COPY_LOCALIZATIONS
{
NSString *updatingFormatStringFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Updating %@", @"Sparkle", hostSparkleBundle, nil) : nil;
if (updatingFormatStringFromBundle != nil) {
// Replacing the %@ will be a bit safer than using +[NSString stringWithFormat:]
updatingString = [updatingFormatStringFromBundle stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
} else {
updatingString = [@"Updating " stringByAppendingString:hostName];
}
}
#else
{
updatingString = [@"Updating " stringByAppendingString:hostName];
}
#endif
}
_updatingString = updatingString;
NSString *cancelUpdateTitle;
#if SPARKLE_COPY_LOCALIZATIONS
{
NSString *cancelUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Cancel Update", @"Sparkle", hostSparkleBundle, @"") : nil;
cancelUpdateTitle = (cancelUpdateTitleFromBundle != nil) ? cancelUpdateTitleFromBundle : @"Cancel Update";
}
#else
{
cancelUpdateTitle = @"Cancel Update";
}
#endif
_cancelUpdateTitle = cancelUpdateTitle;
NSString *installingUpdateTitle;
#if SPARKLE_COPY_LOCALIZATIONS
{
NSString *installingUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Installing update…", @"Sparkle", hostSparkleBundle, @"") : nil;
installingUpdateTitle = (installingUpdateTitleFromBundle != nil) ? installingUpdateTitleFromBundle : @"Installing update…";
}
#else
{
installingUpdateTitle = @"Installing update…";
}
#endif
_installingUpdateTitle = installingUpdateTitle;
// Initialize status controller immediately if app isn't copied, before the app may be swapped/removed
// This gaurantees we will be able to load the nib
if (!copiedApplication) {
[self createStatusControllerWithHost:host];
}
}
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host
{
#if SPARKLE_COPY_LOCALIZATIONS
NSDictionary<NSString *, NSString *> *localizedStrings = SUBestMatchingInstallerProgressLocalizedStrings();
#else
NSDictionary<NSString *, NSString *> *localizedStrings = @{};
#endif
NSString *hostNameFromBundle = host.name;
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
NSString *updatingFormatString = localizedStrings[@"Updating %@"] ?: @"Updating %@";
NSString *updatingString = [updatingFormatString stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
NSString *cancelUpdateTitle = localizedStrings[@"Cancel Update"] ?: @"Cancel Update";
NSString *installingUpdateTitle = localizedStrings[@"Installing update…"] ?: @"Installing update…";
if (_statusController == nil) {
[self createStatusControllerWithHost:host];
}
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:updatingString centerPointValue:nil minimizable:NO closable:NO];
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
[_statusController setButtonTitle:cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
[_statusController beginActionWithTitle:installingUpdateTitle maxProgressValue:0 statusText:@""];
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
[_statusController showWindow:self];
}
+1 -1
View File
@@ -27,7 +27,7 @@ int main(int __unused argc, const char __unused *argv[])
dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigtermSource, ^{
[appController handleTerminationRequest];
[appController cleanupAndExitWithStatus:SIGTERM error:nil];
});
dispatch_resume(sigtermSource);
+1 -1
View File
@@ -149,7 +149,7 @@
return NO;
}
// An error occurred
// An error occured
SULog(SULogLevelError, @"Error: failed to detect if process is running under rosetta with error: %d", errno);
return YES;
}
+1 -1
View File
@@ -17,7 +17,7 @@ typedef NS_ENUM(NSInteger, SPUAppcastSigningValidationStatus)
SPUAppcastSigningValidationStatusSkipped = 0,
/**
The appcast is signed and validation has passed successfully.
The appcast is signed and validation has passed succesfully.
*/
SPUAppcastSigningValidationStatusSucceeded,
+23
View File
@@ -0,0 +1,23 @@
//
// SPUAutomaticUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate, SPUUserDriver;
SPU_OBJC_DIRECT_MEMBERS @interface SPUAutomaticUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
+155
View File
@@ -0,0 +1,155 @@
//
// SPUAutomaticUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUAutomaticUpdateDriver.h"
#import "SPUUpdateDriver.h"
#import "SUHost.h"
#import "SPUUpdaterDelegate.h"
#import "SPUCoreBasedUpdateDriver.h"
#import "SULog.h"
#import "SUAppcastItem.h"
#import "SPUUserDriver.h"
#import "SUErrors.h"
#include "AppKitPrevention.h"
@interface SPUAutomaticUpdateDriver () <SPUCoreBasedUpdateDriverDelegate>
@end
@implementation SPUAutomaticUpdateDriver
{
SPUCoreBasedUpdateDriver *_coreDriver;
SUAppcastItem* _updateItem;
__weak id _updater;
__weak id<SPUUserDriver> _userDriver;
__weak id _updaterDelegate;
BOOL _installerDidFinishPreparation;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_updater = updater;
// The user driver is only used for a termination callback
_userDriver = userDriver;
_updaterDelegate = updaterDelegate;
_coreDriver = [[SPUCoreBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updateCheck:SPUUpdateCheckUpdatesInBackground updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_coreDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
{
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_coreDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES requiresSilentInstall:YES];
}
- (void)resumeInstallingUpdate
{
// Nothing really to do here.. this shouldn't be called.
SULog(SULogLevelError, @"Error: resumeInstallingUpdate: called on SPUAutomaticUpdateDriver");
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)__unused resumableUpdate
{
// Nothing really to do here.. this shouldn't be called.
SULog(SULogLevelError, @"Error: resumeDownloadedUpdate: called on SPUAutomaticUpdateDriver");
}
// Note: critical updates can be downloaded automatically first before needing user attention
static BOOL SPUUpdateRequiresUserAttentionBeforeDownloading(SUAppcastItem *updateItem)
{
return (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade || updateItem.signingValidationStatus == SPUAppcastSigningValidationStatusFailed);
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
_updateItem = updateItem;
if (SPUUpdateRequiresUserAttentionBeforeDownloading(updateItem)) {
[_coreDriver deferInformationalUpdate:updateItem secondaryUpdate:secondaryUpdateItem];
[self abortUpdate];
} else {
[_coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:YES];
}
}
- (BOOL)showingUpdate
{
return NO;
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
_installerDidFinishPreparation = YES;
if (!willInstallImmediately) {
BOOL installationHandledByDelegate = NO;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)]) {
__weak __typeof__(self) weakSelf = self;
installationHandledByDelegate = [updaterDelegate updater:_updater willInstallUpdateOnQuit:_updateItem immediateInstallationBlock:^{
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:NO];
}
});
}];
}
if (!installationHandledByDelegate) {
// We are done and can safely abort now
// The installer tool will keep the installation alive
[self abortUpdate];
}
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(NSError *)error
{
// It should not be necessary to include properties from SPUUpdateRequiresUserAttentionBeforeDownloading() because _installerDidFinishPreparation should be NO in those cases,
// but we'll include the check anyway
BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!_installerDidFinishPreparation || _updateItem.criticalUpdate || SPUUpdateRequiresUserAttentionBeforeDownloading(_updateItem));
[_coreDriver abortUpdateAndShowNextUpdateImmediately:showNextUpdateImmediately error:error];
}
@end
+46
View File
@@ -0,0 +1,46 @@
//
// SPUBasicUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUpdateCheck.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUAppcastItem;
@protocol SPUUpdaterDelegate;
@protocol SPUBasicUpdateDriverDelegate <NSObject>
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem systemDomain:(NSNumber * _Nullable)systemDomain;
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)basicDriverDidFinishLoadingAppcast;
@end
SPU_OBJC_DIRECT_MEMBERS @interface SPUBasicUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldSignalShowingUpdate resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error;
@end
NS_ASSUME_NONNULL_END
+292
View File
@@ -0,0 +1,292 @@
//
// SPUBasicUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUBasicUpdateDriver.h"
#import "SUAppcastDriver.h"
#import "SPUUpdaterDelegate.h"
#import "SUErrors.h"
#import "SULocalizations.h"
#import "SUHost.h"
#import "SUAppcastItem.h"
#import "SPUProbeInstallStatus.h"
#import "SPUInstallationInfo.h"
#import "SPUResumableUpdate.h"
#import "SPUAppcastItemState.h"
#import "SUAppcastItem+Private.h"
#import "SPUInstallationType.h"
#import "SUVersionDisplayProtocol.h"
#import "SPUStandardVersionDisplay.h"
#import "SPUNoUpdateFoundInfo.h"
#include "AppKitPrevention.h"
@interface SPUBasicUpdateDriver () <SUAppcastDriverDelegate>
@end
@implementation SPUBasicUpdateDriver
{
SUAppcastDriver *_appcastDriver;
SUHost *_host;
SPUUpdateDriverCompletion _completionBlock;
SPUUpdateCheck _updateCheck;
__weak id _updater;
__weak id <SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUBasicUpdateDriverDelegate> _delegate;
BOOL _aborted;
}
- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_host = host;
_updateCheck = updateCheck;
_updater = updater;
_updaterDelegate = updaterDelegate;
_delegate = delegate;
_appcastDriver = [[SUAppcastDriver alloc] initWithHost:host updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
_completionBlock = [completionBlock copy];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
{
if ([_host isRunningOnReadOnlyVolume]) {
NSString *hostName = _host.name;
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
if ([_host isRunningTranslocated]) {
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningTranslocated userInfo:@{ NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Quit %1$@, move it into your Applications folder, relaunch it from there and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated if it’s running from the location it was downloaded to.", SPARKLE_TABLE, sparkleBundle, nil), hostName], }]];
} else {
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated because it was opened from a read-only or a temporary location.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName] }]];
}
} else {
[_appcastDriver loadAppcastFromURL:appcastURL userAgent:userAgent httpHeaders:httpHeaders inBackground:background];
}
}
- (void)notifyResumableUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain SPU_OBJC_DIRECT
{
if (updateItem == nil) {
[_delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUResumeAppcastError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"Failed to resume installing update.", SPARKLE_TABLE, SUSparkleBundle(), nil) }]];
} else {
// Kind of lying, but triggering the notification so drivers can know when to stop showing initial fetching progress
[self notifyFinishLoadingAppcast];
SUAppcastItem *nonNullUpdateItem = updateItem;
[self notifyFoundValidUpdateWithAppcastItem:nonNullUpdateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain resuming:YES];
}
}
- (void)resumeInstallingUpdate
{
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
dispatch_async(dispatch_get_main_queue(), ^{
[self notifyResumableUpdateItem:installationInfo.appcastItem secondaryUpdateItem:nil systemDomain:@(installationInfo.systemDomain)];
});
}];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[self notifyResumableUpdateItem:resumableUpdate.updateItem secondaryUpdateItem:resumableUpdate.secondaryUpdateItem systemDomain:nil];
}
- (void)didFailToFetchAppcastWithError:(NSError *)error
{
if (!_aborted) {
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
}
- (void)notifyFinishLoadingAppcast SPU_OBJC_DIRECT
{
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)didFinishLoadingAppcast:(SUAppcast *)appcast
{
if (!_aborted) {
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector((updater:didFinishLoadingAppcast:))]) {
[updaterDelegate updater:_updater didFinishLoadingAppcast:appcast];
}
[self notifyFinishLoadingAppcast];
}
}
- (void)notifyFoundValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain resuming:(BOOL)resuming SPU_OBJC_DIRECT
{
if (!_aborted) {
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id updater = _updater;
if (!resuming) {
// Give the delegate a chance to bail
NSError *shouldNotProceedError = nil;
if ([updaterDelegate respondsToSelector:@selector(updater:shouldProceedWithUpdate:updateCheck:error:)] && ![updaterDelegate updater:updater shouldProceedWithUpdate:updateItem updateCheck:_updateCheck error:&shouldNotProceedError]) {
[delegate basicDriverIsRequestingAbortUpdateWithError:shouldNotProceedError];
return;
}
}
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFindValidUpdateNotification
object:updater
userInfo:@{ SUUpdaterAppcastItemNotificationKey: updateItem }];
if ([updaterDelegate respondsToSelector:@selector((updater:didFindValidUpdate:))]) {
[updaterDelegate updater:updater didFindValidUpdate:updateItem];
}
[delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain];
}
}
- (void)didFindValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem
{
[self notifyFoundValidUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryAppcastItem systemDomain:nil resuming:NO];
}
- (void)didNotFindUpdateWithLatestAppcastItem:(nullable SUAppcastItem *)latestAppcastItem hostToLatestAppcastItemComparisonResult:(NSComparisonResult)hostToLatestAppcastItemComparisonResult background:(BOOL)background
{
if (!_aborted) {
NSString *localizedDescription;
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#else
NSBundle *sparkleBundle = nil;
#endif
SPUNoUpdateFoundReason reason;
if (latestAppcastItem != nil) {
switch (hostToLatestAppcastItemComparisonResult) {
case NSOrderedDescending:
// This means the user is a 'newer than latest' version. give a slight hint to the user instead of wrongly claiming this version is identical to the latest feed version.
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnNewerThanLatestVersion;
break;
case NSOrderedSame:
// No new update is available and we're on the latest
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnLatestVersion;
break;
case NSOrderedAscending:
// A new update is available but cannot be installed
// More detailed recovery suggestions are in SPUNoUpdateFoundRecoverySuggestion()
if (!latestAppcastItem.arm64HardwareRequirementIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your Mac is too old", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64;
} else if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your macOS version is too old", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonSystemIsTooOld;
} else if (!latestAppcastItem.maximumOperatingSystemVersionIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your macOS version is too new", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonSystemIsTooNew;
} else {
// We shouldn't realistically get here
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonUnknown;
}
break;
}
} else {
// When no updates are found in the appcast
// We will need to assume the user is up to date if the feed doesn't have any applicable update items
// There could be update items on channels the updater is not subscribed to for example. But we can't tell the user about them.
// There could also only be update items available for other platforms or none at all.
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnLatestVersion;
}
// We use the standard version displayer here to construct a reason string,
// but it's possible for the user driver to override this before displaying if they wish
id<SUVersionDisplay> versionDisplayer = [SPUStandardVersionDisplay standardVersionDisplay];
NSString *recoverySuggestion = SPUNoUpdateFoundRecoverySuggestion(reason, latestAppcastItem, _host, versionDisplayer, sparkleBundle);
NSString *recoveryOption = SULocalizedStringFromTableInBundle(@"OK", SPARKLE_TABLE, sparkleBundle, nil);
NSMutableDictionary *userInfo =
[NSMutableDictionary dictionaryWithDictionary:@{
NSLocalizedDescriptionKey: localizedDescription,
NSLocalizedRecoverySuggestionErrorKey: recoverySuggestion,
NSLocalizedRecoveryOptionsErrorKey: @[recoveryOption],
SPUNoUpdateFoundReasonKey: @(reason),
SPUNoUpdateFoundUserInitiatedKey: @(!background),
}];
if (latestAppcastItem != nil) {
userInfo[SPULatestAppcastItemFoundKey] = latestAppcastItem;
}
NSError *notFoundError =
[NSError
errorWithDomain:SUSparkleErrorDomain
code:SUNoUpdateError
userInfo:[userInfo copy]];
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id updater = _updater;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:error:))]) {
[updaterDelegate updaterDidNotFindUpdate:updater error:notFoundError];
} else if ([updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:))]) {
[updaterDelegate updaterDidNotFindUpdate:updater];
}
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:updater userInfo:userInfo];
}
[_delegate basicDriverIsRequestingAbortUpdateWithError:notFoundError];
}
}
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error
{
_aborted = YES;
[_appcastDriver cleanup:^{
if (self->_completionBlock != nil) {
self->_completionBlock(shouldShowUpdateImmediately, resumableUpdate, error);
self->_completionBlock = nil;
}
}];
}
@end
+77
View File
@@ -0,0 +1,77 @@
//
// SPUCoreBasedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUserUpdateState.h"
#import "SPUUpdateCheck.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUAppcastItem;
@protocol SPUUpdaterDelegate;
@protocol SPUCoreBasedUpdateDriverDelegate <NSObject>
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)basicDriverDidFinishLoadingAppcast;
- (void)downloadDriverWillBeginDownload;
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length;
- (void)coreDriverDidStartExtractingUpdate;
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
- (void)installerDidExtractUpdateWithProgress:(double)progress;
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement;
@end
SPU_OBJC_DIRECT_MEMBERS @interface SPUCoreBasedUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background;
- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem;
- (void)extractDownloadedUpdate;
- (void)clearDownloadedUpdate;
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)installUpdateStatus displayingUserInterface:(BOOL)displayingUserInterface;
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error;
@end
NS_ASSUME_NONNULL_END
+402
View File
@@ -0,0 +1,402 @@
//
// SPUCoreBasedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUCoreBasedUpdateDriver.h"
#import "SUHost.h"
#import "SPUUpdaterDelegate.h"
#import "SPUBasicUpdateDriver.h"
#import "SPUInstallerDriver.h"
#import "SPUDownloadDriver.h"
#import "SULog.h"
#import "SULog+NSError.h"
#import "SUErrors.h"
#import "SPUResumableUpdate.h"
#import "SPUDownloadedUpdate.h"
#import "SPUInformationalUpdate.h"
#import "SUAppcastItem.h"
#import "SULocalizations.h"
#import "SPUInstallationType.h"
#import "SUPhasedUpdateGroupInfo.h"
#include "AppKitPrevention.h"
@interface SPUCoreBasedUpdateDriver () <SPUBasicUpdateDriverDelegate, SPUDownloadDriverDelegate, SPUInstallerDriverDelegate>
@end
@implementation SPUCoreBasedUpdateDriver
{
SPUBasicUpdateDriver *_basicDriver;
SPUDownloadDriver *_downloadDriver;
SPUInstallerDriver *_installerDriver;
SUAppcastItem *_updateItem;
SUAppcastItem * _Nullable _secondaryUpdateItem;
id<SPUResumableUpdate> _resumableUpdate;
SPUDownloadedUpdate *_downloadedUpdateForRemoval;
SUHost *_host;
NSString *_userAgent;
NSDictionary * _Nullable _httpHeaders;
__weak id _updater; // if we didn't have legacy support, I'd remove this..
__weak id <SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUCoreBasedUpdateDriverDelegate> _delegate;
BOOL _resumingInstallingUpdate;
BOOL _silentInstall;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_delegate = delegate;
NSString *bundleIdentifier = host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
_basicDriver = [[SPUBasicUpdateDriver alloc] initWithHost:host updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self];
_installerDriver = [[SPUInstallerDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater updaterDelegate:updaterDelegate delegate:self];
_host = host;
_updater = updater;
_updaterDelegate = updaterDelegate;
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_basicDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_installerDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall
{
_userAgent = [userAgent copy];
_httpHeaders = httpHeaders;
_silentInstall = silentInstall;
[_basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background];
}
- (void)resumeInstallingUpdate
{
_resumingInstallingUpdate = YES;
_silentInstall = NO;
[_basicDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
_resumableUpdate = resumableUpdate;
_silentInstall = NO;
[_basicDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFinishLoadingAppcast
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain
{
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
if (_resumingInstallingUpdate) {
assert(systemDomain != nil);
[_installerDriver resumeInstallingUpdateWithUpdateItem:updateItem systemDomain:systemDomain.boolValue];
}
[_delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem];
}
- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background SPU_OBJC_DIRECT
{
_downloadDriver = [[SPUDownloadDriver alloc] initWithUpdateItem:updateItem secondaryUpdateItem:secondaryUpdateItem host:_host userAgent:_userAgent httpHeaders:_httpHeaders inBackground:background delegate:self];
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector((updater:willDownloadUpdate:withRequest:))]) {
[updaterDelegate updater:updater willDownloadUpdate:updateItem withRequest:_downloadDriver.request];
}
[_downloadDriver downloadFile];
}
- (void)downloadDriverWillBeginDownload
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)]) {
[delegate downloadDriverWillBeginDownload];
}
}
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverDidReceiveExpectedContentLength:)]) {
[delegate downloadDriverDidReceiveExpectedContentLength:expectedContentLength];
}
}
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverDidReceiveDataOfLength:)]) {
[delegate downloadDriverDidReceiveDataOfLength:length];
}
}
- (void)downloadDriverDidDownloadUpdate:(SPUDownloadedUpdate *)downloadedUpdate
{
// Use a new update group for our next downloaded update
// We could restrict this to when the appcast was downloaded in the background,
// but it shouldn't matter.
if (downloadedUpdate.updateItem.phasedRolloutInterval != nil) {
[SUPhasedUpdateGroupInfo setNewUpdateGroupIdentifierForHost:_host];
}
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:didDownloadUpdate:)]) {
[updaterDelegate updater:updater didDownloadUpdate:_updateItem];
}
_resumableUpdate = downloadedUpdate;
[self extractUpdate:downloadedUpdate];
}
- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
_resumableUpdate = [[SPUInformationalUpdate alloc] initWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem];
}
- (void)extractDownloadedUpdate
{
id<SPUResumableUpdate> resumableUpdate = _resumableUpdate;
assert(resumableUpdate != nil && [resumableUpdate isKindOfClass:[SPUDownloadedUpdate class]]);
[self extractUpdate:(SPUDownloadedUpdate *)resumableUpdate];
}
- (void)clearDownloadedUpdate
{
id<NSObject> downloadedUpdateObject = (_resumableUpdate != nil) ? _resumableUpdate : _downloadedUpdateForRemoval;
if (downloadedUpdateObject == nil) {
SULog(SULogLevelError, @"Warning: clearDownloadedUpdate called but no downloaded update is tracked");
return;
}
if ([downloadedUpdateObject isKindOfClass:[SPUDownloadedUpdate class]]) {
if (_downloadDriver == nil) {
_downloadDriver = [[SPUDownloadDriver alloc] initWithHost:_host];
}
SPUDownloadedUpdate *downloadedUpdate = (SPUDownloadedUpdate *)downloadedUpdateObject;
[_downloadDriver removeDownloadedUpdate:downloadedUpdate];
}
// Clear any type of resumable update
_resumableUpdate = nil;
}
- (void)extractUpdate:(SPUDownloadedUpdate *)downloadedUpdate SPU_OBJC_DIRECT
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:willExtractUpdate:)]) {
[updaterDelegate updater:updater willExtractUpdate:_updateItem];
}
// Now we have to extract the downloaded archive.
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(coreDriverDidStartExtractingUpdate)]) {
[delegate coreDriverDidStartExtractingUpdate];
}
[_installerDriver extractDownloadedUpdate:downloadedUpdate silently:_silentInstall completion:^(NSError * _Nullable error) {
if (error != nil) {
if (error.code != SUInstallationAuthorizeLaterError) {
[self clearDownloadedUpdate];
}
[self->_delegate coreDriverIsRequestingAbortUpdateWithError:error];
} else {
// If the installer started properly, we can't use the downloaded update archive anymore
// Especially if the installer fails later and we try resuming the update with a missing archive file
// We must clear the download after the installer begins using it however (in -installerDidStartInstalling)
self->_downloadedUpdateForRemoval = downloadedUpdate;
self->_resumableUpdate = nil;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:didExtractUpdate:)]) {
[updaterDelegate updater:updater didExtractUpdate:self->_updateItem];
}
}
}];
}
- (void)downloadDriverDidFailToDownloadFileWithError:(NSError *)error
{
if ([_updateItem isDeltaUpdate]) {
SULog(SULogLevelError, @"Failed to download delta update. Falling back to regular update...");
SULogError(error);
[self fallBackAndDownloadRegularUpdate];
} else {
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector((updater:failedToDownloadUpdate:error:))]) {
NSError *errorToReport = [error.userInfo objectForKey:NSUnderlyingErrorKey];
if (errorToReport == nil) {
errorToReport = error;
}
[updaterDelegate updater:updater failedToDownloadUpdate:_updateItem error:errorToReport];
}
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
}
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidStartInstallingWithApplicationTerminated:)]) {
[delegate installerDidStartInstallingWithApplicationTerminated:applicationTerminated];
}
}
- (void)installerDidStartExtracting
{
// The installer has moved the archive and no longer needs the download directory
[self clearDownloadedUpdate];
}
- (void)installerDidExtractUpdateWithProgress:(double)progress
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidExtractUpdateWithProgress:)]) {
[delegate installerDidExtractUpdateWithProgress:progress];
}
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately];
}
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)response displayingUserInterface:(BOOL)displayingUserInterface
{
switch (response) {
case SPUUserUpdateChoiceDismiss:
[_delegate coreDriverIsRequestingAbortUpdateWithError:nil];
break;
case SPUUserUpdateChoiceSkip:
[_installerDriver cancelUpdate];
break;
case SPUUserUpdateChoiceInstall:
[_installerDriver installWithToolAndRelaunch:YES displayingUserInterface:displayingUserInterface];
break;
}
}
- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector((updater:willInstallUpdate:))]) {
[updaterDelegate updater:updater willInstallUpdate:_updateItem];
}
if (relaunch) {
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterWillRestartNotification object:updater];
if ([updaterDelegate respondsToSelector:@selector((updaterWillRelaunchApplication:))]) {
[updaterDelegate updaterWillRelaunchApplication:updater];
}
}
}
}
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidFinishInstallationAndRelaunched:acknowledgement:)]) {
[delegate installerDidFinishInstallationAndRelaunched:relaunched acknowledgement:acknowledgement];
} else {
acknowledgement();
}
}
- (void)installerIsRequestingAbortInstallWithError:(nullable NSError *)error
{
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
- (void)fallBackAndDownloadRegularUpdate SPU_OBJC_DIRECT
{
SUAppcastItem *secondaryUpdateItem = _secondaryUpdateItem;
assert(secondaryUpdateItem != nil);
BOOL backgroundDownload = _downloadDriver.inBackground;
// Fall back to the non-delta update. Note that we don't want to trigger another update was found event.
_updateItem = secondaryUpdateItem;
_secondaryUpdateItem = nil;
[self downloadUpdateFromAppcastItem:secondaryUpdateItem secondaryAppcastItem:nil inBackground:backgroundDownload];
}
- (void)installerDidFailToApplyDeltaUpdate
{
[self clearDownloadedUpdate];
[self fallBackAndDownloadRegularUpdate];
}
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error
{
[_installerDriver abortInstall];
void (^basicDriverAbort)(void) = ^{
id<SPUResumableUpdate> resumableUpdate = (error == nil || error.code == SUInstallationAuthorizeLaterError) ? self->_resumableUpdate : nil;
[self->_basicDriver abortUpdateAndShowNextUpdateImmediately:shouldShowUpdateImmediately resumableUpdate:resumableUpdate error:error];
};
if (_downloadDriver != nil) {
[_downloadDriver cleanup:^{
basicDriverAbort();
}];
} else {
basicDriverAbort();
}
}
@end
+1 -1
View File
@@ -39,7 +39,7 @@ SPU_OBJC_DIRECT_MEMBERS
#endif
@interface SPUDownloadDriver : NSObject
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background cachePolicy:(NSURLRequestCachePolicy)cachePolicy delegate:(id<SPUDownloadDriverDelegate>)delegate;
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
- (instancetype)initWithUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
+7 -3
View File
@@ -114,7 +114,7 @@
return self;
}
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background cachePolicy:(NSURLRequestCachePolicy)cachePolicy delegate:(id<SPUDownloadDriverDelegate>)delegate
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate
{
self = [self initWithHost:host];
if (self != nil) {
@@ -122,7 +122,11 @@
_inBackground = background;
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
request.cachePolicy = cachePolicy;
// Note the cachePolicy has no effect on persistent downloads on disk (i.e downloading update archives)
// It impacts temporary in-memory downloads such as appcast feeds and release notes.
// For now we don't use caching, but with more testing/experimenting that could change
// (e.g. not downloading same feed unmodified from previous request).
request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
if (userAgent != nil) {
[request setValue:(NSString * _Nonnull)userAgent forHTTPHeaderField:@"User-Agent"];
@@ -147,7 +151,7 @@
NSURL *updateFileURL = updateItem.fileURL;
assert(updateFileURL != nil);
self = [self initWithRequestURL:updateFileURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:background cachePolicy:NSURLRequestReloadIgnoringLocalCacheData delegate:delegate];
self = [self initWithRequestURL:updateFileURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:background delegate:delegate];
if (self != nil) {
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
+2 -6
View File
@@ -7,18 +7,14 @@
//
#import <Foundation/Foundation.h>
#import "SPUResumableUpdate.h"
NS_ASSUME_NONNULL_BEGIN
@class SUAppcastItem;
SPU_OBJC_DIRECT_MEMBERS @interface SPUDownloadedUpdate : NSObject
SPU_OBJC_DIRECT_MEMBERS @interface SPUDownloadedUpdate : NSObject <SPUResumableUpdate>
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryItem downloadBookmarkData:(NSData *)downloadBookmarkData downloadToken:(NSString *)downloadToken;
@property (nonatomic, readonly) SUAppcastItem *updateItem;
@property (nonatomic, readonly, nullable) SUAppcastItem *secondaryUpdateItem;
@property (nonatomic, readonly) NSData *downloadBookmarkData;
@property (nonatomic, readonly) NSString *downloadToken;
+2
View File
@@ -13,6 +13,8 @@
@implementation SPUDownloadedUpdate
// If we ever enable auto-synthesize in the future, we'll still need this synthesize
// because the property is declared in a protocol
@synthesize updateItem = _updateItem;
@synthesize secondaryUpdateItem = _secondaryUpdateItem;
+20
View File
@@ -0,0 +1,20 @@
//
// SPUInformationalUpdate.h
// Sparkle
//
// Created by Mayur Pawashe on 1/8/17.
// Copyright © 2017 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUResumableUpdate.h"
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SPUInformationalUpdate : NSObject <SPUResumableUpdate>
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem;
@end
NS_ASSUME_NONNULL_END
+31
View File
@@ -0,0 +1,31 @@
//
// SPUInformationalUpdate.m
// Sparkle
//
// Created by Mayur Pawashe on 1/8/17.
// Copyright © 2017 Sparkle Project. All rights reserved.
//
#import "SPUInformationalUpdate.h"
#include "AppKitPrevention.h"
@implementation SPUInformationalUpdate
// If we ever enable auto-synthesize in the future, we'll still need this synthesize
// because the property is declared in a protocol
@synthesize updateItem = _updateItem;
@synthesize secondaryUpdateItem = _secondaryUpdateItem;
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
self = [super init];
if (self != nil) {
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
}
return self;
}
@end
-2
View File
@@ -33,8 +33,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUInstallerDriver : NSObject
- (void)resumeInstallingUpdateWithUpdateItem:(SUAppcastItem *)updateItem systemDomain:(BOOL)systemDomain;
- (void)cancelSupersededInstallerBeforeLaunching;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)extractDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate silently:(BOOL)silently completion:(void (^)(NSError * _Nullable))completionHandler;
+85 -82
View File
@@ -32,7 +32,6 @@
#include "AppKitPrevention.h"
#define FIRST_INSTALLER_MESSAGE_TIMEOUT 7ull
#define CANCEL_SUPERSEDED_INSTALLER_TIMEOUT 3ull
#if SPARKLE_BUILD_LEGACY_SUUPDATER
@interface NSObject (PrivateDelegateMethods)
@@ -42,6 +41,17 @@
@end
#endif
// Note: we don't want to directly pull in AppKit here especially if the main application does not need it
@interface NSObject (ActivationAPIs)
// NSApplication
+ (id)sharedApplication;
- (void)yieldActivationToApplication:(id)application;
// NSRunningApplication
+ (NSArray *)runningApplicationsWithBundleIdentifier:(NSString *)bundleIdentifier;
- (NSURL *)bundleURL;
@end
@interface SPUInstallerDriver () <SUInstallerCommunicationProtocol>
@end
@@ -63,11 +73,11 @@
SPUInstallerMessageType _currentStage;
NSUInteger _extractionAttempts;
BOOL _postponedOnce;
BOOL _relaunch;
BOOL _systemDomain;
BOOL _aborted;
BOOL _notifiedDelegateInstallationWillFinish;
BOOL _cancelSupersededInstaller;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater updaterDelegate:(id<SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id<SPUInstallerDriverDelegate>)delegate
@@ -149,38 +159,26 @@
[_delegate installerIsRequestingAbortInstallWithError:installerError];
}
- (id<SUInstallerConnectionProtocol>)createInstallerConnectionAndGetServiceName:(NSString * __autoreleasing *)outServiceName SPU_OBJC_DIRECT
{
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
id<SUInstallerConnectionProtocol> installerConnection;
#if INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED
if (SPUXPCServiceIsEnabled(SUEnableInstallerConnectionServiceKey)) {
installerConnection = [[SUXPCInstallerConnection alloc] initWithDelegate:self];
} else
#endif
{
installerConnection = [[SUInstallerConnection alloc] initWithDelegate:self remote:NO];
}
if (outServiceName != NULL) {
*outServiceName = SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
}
return installerConnection;
}
- (void)setUpConnection SPU_OBJC_DIRECT
{
if (_installerConnection != nil) {
return;
}
NSString *serviceName = nil;
_installerConnection = [self createInstallerConnectionAndGetServiceName:&serviceName];
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
// Check if we're using remote SUXPCInstallerConnection for diagnostic purposes
BOOL usingInstallerService = ![(id<NSObject>)_installerConnection isKindOfClass:SUInstallerConnection.class];
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;
[_installerConnection setInvalidationHandler:^{
@@ -209,6 +207,7 @@
});
}];
NSString *serviceName = SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
NSString *installationType = _updateItem.installationType;
assert(installationType != nil);
@@ -224,15 +223,7 @@
_currentStage = SPUInstallerNotStarted;
if (_installerConnection == nil) {
if (_cancelSupersededInstaller) {
_cancelSupersededInstaller = NO;
[self cancelSupersededInstallerWithCompletion:^{
[self launchAutoUpdateSilently:silently completion:completionHandler];
}];
} else {
[self launchAutoUpdateSilently:silently completion:completionHandler];
}
[self launchAutoUpdateSilently:silently completion:completionHandler];
} else {
// The Install tool is already alive; just send out installation input data again
[self sendInstallationData];
@@ -246,35 +237,6 @@
_systemDomain = systemDomain;
}
- (void)cancelSupersededInstallerBeforeLaunching
{
_cancelSupersededInstaller = YES;
}
- (void)cancelSupersededInstallerWithCompletion:(void (^)(void))completionHandler SPU_OBJC_DIRECT
{
NSString *serviceName = nil;
id<SUInstallerConnectionProtocol> installerConnection = [self createInstallerConnectionAndGetServiceName:&serviceName];
__block BOOL completed = NO;
void (^completeCancellation)(void) = ^{
if (!completed) {
completed = YES;
[installerConnection invalidate];
completionHandler();
}
};
[installerConnection setInvalidationHandler:^{
dispatch_async(dispatch_get_main_queue(), completeCancellation);
}];
[installerConnection setServiceName:serviceName systemDomain:_systemDomain];
[installerConnection handleMessageWithIdentifier:SPUCancelInstallation data:[NSData data]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(CANCEL_SUPERSEDED_INSTALLER_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), completeCancellation);
}
- (void)sendInstallationData SPU_OBJC_DIRECT
{
NSString *pathToRelaunch = _applicationBundle.bundlePath;
@@ -536,8 +498,8 @@
// Send a probe/ping to the status service, which should boost/prioritize its startup
if (hostBundleIdentifier != nil) {
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL statusServiceIsRunning) {
if (!statusServiceIsRunning) {
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL stausServiceIsRunning) {
if (!stausServiceIsRunning) {
SULog(SULogLevelError, @"Error: failed to probe status service for %@ from the framework", hostBundleIdentifier);
}
}];
@@ -559,29 +521,30 @@
{
assert(_updateItem);
id<SPUInstallerDriverDelegate> delegate = _delegate;
if (![self mayUpdateAndRestart])
{
[_delegate installerIsRequestingAbortInstallWithError:nil];
[delegate installerIsRequestingAbortInstallWithError:nil];
return;
}
// Give the host app an opportunity to postpone the install and relaunch.
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvokingBlock:)]) {
__weak __typeof__(self) weakSelf = self;
if ([updaterDelegate updater:updater shouldPostponeRelaunchForUpdate:_updateItem untilInvokingBlock:^{
[weakSelf _installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}]) {
return;
if (!_postponedOnce)
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvokingBlock:)]) {
_postponedOnce = YES;
__weak __typeof__(self) weakSelf = self;
if ([updaterDelegate updater:updater shouldPostponeRelaunchForUpdate:_updateItem untilInvokingBlock:^{
[weakSelf installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}]) {
return;
}
}
}
[self _installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}
- (void)_installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI SPU_OBJC_DIRECT
{
if (_updateWillInstallHandler != NULL) {
_updateWillInstallHandler();
}
@@ -594,11 +557,51 @@
_relaunch = relaunch;
// If AppKit is loaded, we will yield to our Sparkle progress app
// This will let the system know it should be okay for the progress agent to activate itself (if necessary)
// Note we don't want to directly pull in AppKit here especially if the main application does not need it
if (showUI) {
if (@available(macOS 14, *)) {
// Make sure we are not root before using AppKit API
if (geteuid() != 0) {
Class applicationClass = NSClassFromString(@"NSApplication");
if ([applicationClass respondsToSelector:@selector(sharedApplication)]) {
NSObject *application = [applicationClass sharedApplication];
if ([application respondsToSelector:@selector(yieldActivationToApplication:)]) {
Class runningApplicationClass = NSClassFromString(@"NSRunningApplication");
if ([runningApplicationClass respondsToSelector:@selector(runningApplicationsWithBundleIdentifier:)]) {
NSArray *runningApplications = [runningApplicationClass runningApplicationsWithBundleIdentifier:@SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID];
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
id targetRunningApplication = nil;
for (id runningApplication in runningApplications) {
if ([(NSObject *)runningApplication respondsToSelector:@selector(bundleURL)]) {
NSURL *bundleURL = [(NSObject *)runningApplication bundleURL];
if (hostBundleIdentifier != nil && [bundleURL.pathComponents containsObject:hostBundleIdentifier]) {
targetRunningApplication = runningApplication;
break;
}
}
}
if (targetRunningApplication != nil) {
[application yieldActivationToApplication:targetRunningApplication];
}
}
}
}
}
}
}
// The user can request trying to relaunch/quit the app multiple times
// Avoid re-notifying the delegate twice
if (!_notifiedDelegateInstallationWillFinish) {
_notifiedDelegateInstallationWillFinish = YES;
[_delegate installerWillFinishInstallationAndRelaunch:relaunch];
[delegate installerWillFinishInstallationAndRelaunch:relaunch];
}
uint8_t response[2] = {(uint8_t)relaunch, (uint8_t)showUI};
+26 -39
View File
@@ -18,24 +18,14 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
+ (NSString *)_cachePathForCacheDirectory:(NSURL *)cacheURL bundleIdentifier:(NSString *)bundleIdentifier SPU_OBJC_DIRECT
{
NSString *appCacheIdentifier = bundleIdentifier;
{
// If an app has an ill-formed bundle identifier that ends with ".app" or ".service"
// or anything similarly problematic, we will append ".sparkle" to it
// so that the cache directory doesn't look like a protected bundle directory,
// which can cause other systematic issues
// https://github.com/sparkle-project/Sparkle/discussions/2881
NSArray<NSString *> *problematicBundleIdentifierExtensions = @[@".app", @".service", @".xpc", @".appex", @".bundle", @".plugin", @".saver", @".kext"];
// Transforming the bundle identifier into a lowercased variant for suffix comparison
// rather than case-insensitive comparing the pathExtension (which may return "" for ".app")
NSString *lowercasedBundleIdentifier = bundleIdentifier.lowercaseString;
for (NSString *badExtension in problematicBundleIdentifierExtensions) {
if ([lowercasedBundleIdentifier hasSuffix:badExtension]) {
appCacheIdentifier = [bundleIdentifier stringByAppendingString:@".sparkle"];
break;
}
}
// If an app has an ill-formed bundle identifier that ends with ".app" we will append ".sparkle" to it
// so that the cache directory doesn't look like an app bundle directory, which can cause other systematic issues
// https://github.com/sparkle-project/Sparkle/discussions/2881
NSString *appCacheIdentifier;
if ([bundleIdentifier hasSuffix:@".app"] || [bundleIdentifier hasSuffix:@".APP"]) {
appCacheIdentifier = [bundleIdentifier stringByAppendingString:@".sparkle"];
} else {
appCacheIdentifier = bundleIdentifier;
}
NSString *resultPath = [[[cacheURL URLByAppendingPathComponent:appCacheIdentifier isDirectory:YES] URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER isDirectory:YES] path];
@@ -58,31 +48,28 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
{
NSMutableArray<NSString *> *filePathsToRemove = [NSMutableArray array];
NSFileManager *fileManager = [NSFileManager defaultManager];
NSDirectoryEnumerator *directoryEnumerator = [fileManager enumeratorAtPath:directory];
NSDate *currentDate = [NSDate date];
for (NSString *filename in directoryEnumerator) {
NSString *filePath = [directory stringByAppendingPathComponent:filename];
NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:filePath error:NULL];
if (fileAttributes != nil) {
NSDate *lastModificationDate = [fileAttributes objectForKey:NSFileModificationDate];
NSTimeInterval timeIntervalSinceLastModificationDate = [currentDate timeIntervalSinceDate:lastModificationDate];
if (timeIntervalSinceLastModificationDate >= OLD_ITEM_DELETION_INTERVAL) {
[filePathsToRemove addObject:[directory stringByAppendingPathComponent:filename]];
} else if (timeIntervalSinceLastModificationDate < 0) {
// Reset the modification date if it's far out in the future
NSError *resetModificationDateError = nil;
if (![fileManager setAttributes:@{NSFileModificationDate: currentDate} ofItemAtPath:filePath error:&resetModificationDateError]) {
SULog(SULogLevelError, @"Failed to reset modification date of file modified in future: %@", resetModificationDateError.localizedDescription);
if ([fileManager fileExistsAtPath:directory]) {
NSDirectoryEnumerator *directoryEnumerator = [fileManager enumeratorAtPath:directory];
NSDate *currentDate = [NSDate date];
for (NSString *filename in directoryEnumerator)
{
NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:[directory stringByAppendingPathComponent:filename] error:NULL];
if (fileAttributes != nil)
{
NSDate *lastModificationDate = [fileAttributes objectForKey:NSFileModificationDate];
if ([currentDate timeIntervalSinceDate:lastModificationDate] >= OLD_ITEM_DELETION_INTERVAL)
{
[filePathsToRemove addObject:[directory stringByAppendingPathComponent:filename]];
}
}
[directoryEnumerator skipDescendants];
}
[directoryEnumerator skipDescendants];
}
for (NSString *filename in filePathsToRemove) {
[fileManager removeItemAtPath:filename error:NULL];
for (NSString *filename in filePathsToRemove)
{
[fileManager removeItemAtPath:filename error:NULL];
}
}
}
+23
View File
@@ -0,0 +1,23 @@
//
// SPUProbingUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUProbingUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
+90
View File
@@ -0,0 +1,90 @@
//
// SPUProbingUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUProbingUpdateDriver.h"
#import "SPUBasicUpdateDriver.h"
#include "AppKitPrevention.h"
@interface SPUProbingUpdateDriver () <SPUBasicUpdateDriverDelegate>
@end
@implementation SPUProbingUpdateDriver
{
SPUBasicUpdateDriver *_basicDriver;
id<SPUResumableUpdate> _resumableUpdate;
}
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_basicDriver = [[SPUBasicUpdateDriver alloc] initWithHost:host updateCheck:SPUUpdateCheckUpdateInformation updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_basicDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
{
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES];
}
- (void)resumeInstallingUpdate
{
[_basicDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
_resumableUpdate = resumableUpdate;
[_basicDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)__unused appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)__unused secondaryAppcastItem systemDomain:(NSNumber * _Nullable)__unused systemDomain
{
// Stop as soon as we have an answer
[self abortUpdate];
}
- (BOOL)showingUpdate
{
return NO;
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
[_basicDriver abortUpdateAndShowNextUpdateImmediately:NO resumableUpdate:_resumableUpdate error:error];
}
@end
-27
View File
@@ -1,27 +0,0 @@
//
// SPUReleaseNotesDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUDownloadDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUSignatures, SPUDownloadData;
// Downloads and (if required) verifies release notes data for a found update
SPU_OBJC_DIRECT_MEMBERS @interface SPUReleaseNotesDriver : NSObject <SPUDownloadDriverDelegate>
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler;
- (void)startDownload;
- (void)cleanup:(void (^)(void))cleanupHandler;
@end
NS_ASSUME_NONNULL_END
-121
View File
@@ -1,121 +0,0 @@
//
// SPUReleaseNotesDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUReleaseNotesDriver.h"
#import "SUHost.h"
#import "SUErrors.h"
#import "SPUDownloadData.h"
#import "SPUDownloadDataPrivate.h"
#import "SPUExtractSignedFeed.h"
#import "SUSignatures.h"
#import "SUSignatureVerifier.h"
#import "SPUVerifierInformation.h"
#import "SULocalizations.h"
#include "AppKitPrevention.h"
@implementation SPUReleaseNotesDriver
{
SPUDownloadDriver *_downloadDriver;
SUHost *_host;
SUSignatures *_signatures;
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
uint64_t _contentLength;
}
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler
{
self = [super init];
if (self != nil) {
_host = host;
_signatures = signatures;
_contentLength = contentLength;
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO cachePolicy:NSURLRequestReloadIgnoringLocalCacheData delegate:self];
_completionHandler = [completionHandler copy];
} else {
assert(false);
}
return self;
}
- (void)startDownload
{
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
{
if (_completionHandler != nil) {
SPUDownloadData *downloadDataToPassToUserDriver;
// Strip out any sign warning comment prefix for markdown data so that user drivers
// will not have to deal with parsing them (if their markdown parsers don't handle decoding HTML)
NSString *MIMEType = downloadDataToValidate.MIMEType;
NSString *pathExtension = _downloadDriver.request.URL.pathExtension;
if ([MIMEType isEqualToString:@"text/markdown"] || [MIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame || [pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
NSData *contentData = SPUExtractReleaseNotesContent(downloadDataToValidate.data);
if (contentData.length != downloadDataToValidate.data.length) {
downloadDataToPassToUserDriver = [[SPUDownloadData alloc] initWithData:contentData URL:downloadDataToValidate.URL textEncodingName:downloadDataToValidate.textEncodingName MIMEType:downloadDataToValidate.MIMEType];
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
if (_host.requiresSignedAppcast) {
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:_contentLength];
verifierInformation.actualContentLength = downloadDataToValidate.data.length;
NSError *verifierError = nil;
if (![signatureVerifier verifyData:downloadDataToValidate.data signatures:_signatures fileKind:@"release notes" verifierInformation:verifierInformation error:&verifierError]) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"The release notes is improperly signed and could not be validated. Please contact the app developer for more information.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (verifierError != nil) {
[userInfo setObject:verifierError forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
_completionHandler = nil;
}
}
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
{
if (_completionHandler != nil) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while downloading the release notes.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (error != nil) {
[userInfo setObject:error forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
_completionHandler = nil;
}
}
- (void)cleanup:(void (^)(void))cleanupHandler
{
_completionHandler = nil;
[_downloadDriver cleanup:cleanupHandler];
}
@end
+22
View File
@@ -0,0 +1,22 @@
//
// SPUResumableUpdate.h
// Sparkle
//
// Created by Mayur Pawashe on 7/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class SUAppcastItem;
@protocol SPUResumableUpdate <NSObject>
@property (nonatomic, readonly) SUAppcastItem *updateItem;
@property (nonatomic, readonly, nullable) SUAppcastItem *secondaryUpdateItem;
@end
NS_ASSUME_NONNULL_END
+24
View File
@@ -0,0 +1,24 @@
//
// SPUScheduledUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/15/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUIBasedUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUScheduledUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
+109
View File
@@ -0,0 +1,109 @@
//
// SPUScheduledUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/15/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUScheduledUpdateDriver.h"
#import "SUHost.h"
#import "SUErrors.h"
#import "SPUUpdaterDelegate.h"
#import "SPUUserDriver.h"
#include "AppKitPrevention.h"
@interface SPUScheduledUpdateDriver() <SPUUIBasedUpdateDriverDelegate>
@end
@implementation SPUScheduledUpdateDriver
{
SPUUIBasedUpdateDriver *_uiDriver;
void (^_updateDidShowHandler)(void);
BOOL _showedUpdate;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_uiDriver = [[SPUUIBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:NO updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_uiDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))handler
{
_updateDidShowHandler = [handler copy];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_uiDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES];
}
- (void)resumeInstallingUpdate
{
[_uiDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[_uiDriver resumeUpdate:resumableUpdate];
}
- (void)uiDriverDidShowUpdate
{
_showedUpdate = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
}
}
- (BOOL)showingUpdate
{
return _showedUpdate;
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
{
[self abortUpdateWithError:error];
}
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
[_uiDriver abortUpdateWithError:error showErrorToUser:_showedUpdate];
}
@end
+15 -35
View File
@@ -35,8 +35,11 @@
#import <AppKit/AppKit.h>
// Delay before we need to show the checking for updates progress window when user initiates an update check
static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 140000
@interface NSApplication (ActivationAPIs)
- (void)activate;
@end
#endif
@interface SPUStandardUserDriver () <SPUGentleUserDriverReminders>
@@ -60,7 +63,6 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
id<NSObject> _applicationBecameActiveAfterUpdateAlertBecameKeyObserver;
NSValue *_updateAlertWindowFrameValue;
SUStatusController *_checkingController;
dispatch_block_t _showCheckingControllerWindowDelayBlock;
SUUpdateAlert *_activeUpdateAlert;
SPUUpdaterSettings *_updaterSettings;
@@ -127,7 +129,7 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
- (void)_activateApplication SPU_OBJC_DIRECT
{
// -[NSApp activate] does not always work reliably from backgrounded apps when the user initiates checks for updates
// from e.g. a menu bar. The OS should grant active focus to the application, but it is inconsistent (last tested on 26.5.1).
// from e.g. a menu bar. The OS should grant active focus to the appliation, but it is inconsistent (last tested on 26.5.1).
// For now we will prefer the deprecated more reliant API
[NSApp activateIgnoringOtherApps:YES];
}
@@ -474,7 +476,6 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
[_statusController showWindow:nil];
mayNeedToActivateApp = YES;
} else if (_checkingController != nil) {
[self cancelShowCheckingControllerWindowDelayBlock];
[_checkingController showWindow:nil];
mayNeedToActivateApp = YES;
} else if (_retryTerminatingApplication != nil) {
@@ -545,44 +546,23 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
#endif
_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 accessibilityIdentifier:@"SUStatusCancel"];
// Obtain focus. Useful if:
// - The update check is requested from another app (e.g. System Preferences)
// - The user triggers the update check from an NSStatusItem (which does not activate the app)
if (![NSApp isActive]) {
// For background applications, obtain focus.
// Useful if the update check is requested from another app like System Preferences.
if ([SUApplicationInfo isBackgroundApplication:[NSApplication sharedApplication]]) {
[self _activateApplication];
}
// Don't show checking for updates window immediately
// Only show it if the check is taking a noticeable amount of time.
// This reduces the chance of a very sudden/quick transition between
// checking for updates and showing the next UI.
__weak __typeof__(self) weakSelf = self;
_showCheckingControllerWindowDelayBlock = dispatch_block_create_with_qos_class((dispatch_block_flags_t)0, QOS_CLASS_USER_INITIATED, 0, ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_checkingController showWindow:strongSelf];
}
});
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUShowCheckingForUpdatesTimeDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), _showCheckingControllerWindowDelayBlock);
}
- (void)cancelShowCheckingControllerWindowDelayBlock SPU_OBJC_DIRECT
{
if (_showCheckingControllerWindowDelayBlock != nil) {
dispatch_cancel(_showCheckingControllerWindowDelayBlock);
_showCheckingControllerWindowDelayBlock = nil;
}
[_checkingController showWindow:self];
}
- (void)closeCheckingWindow SPU_OBJC_DIRECT
{
if (_checkingController != nil)
{
[self cancelShowCheckingControllerWindowDelayBlock];
[_checkingController close];
_checkingController = nil;
_cancellation = nil;
@@ -616,7 +596,7 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
// Ideally we should use -[NSAlert alertWithError:] however
// unfortunately Sparkle may return error messages with descriptions that contain
// recovery suggestions. So we will check if an explicit recovery suggestion exists,
// and set the message and informative text appropriately.
// and set the mesage and informative text appropriately.
// In the future we should audit potential error messages and make them consistent.
NSAlert *alert = [[NSAlert alloc] init];
NSString *recoverySuggestion = [error localizedRecoverySuggestion];
@@ -628,7 +608,7 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
alert.informativeText = error.localizedDescription;
}
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, @"Run generate_progress_tool_localizations.py after updating.")];
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, nil)];
[self showAlert:alert secondaryAction:nil];
acknowledgement();
@@ -785,7 +765,7 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
centerPointValue = nil;
}
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating."), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), nil), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
if (_updateAlertWindowWasInactive) {
[_statusController.window orderFront:nil];
@@ -886,7 +866,7 @@ static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
if (applicationTerminated) {
// Note this will only show up if -showReadyToInstallAndRelaunch: was called beforehand
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating.") maxProgressValue:0.0 statusText:nil];
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil];
[_statusController setButtonEnabled:NO];
} else {
// The "quit" event can always be canceled or delayed by the application we're updating
+48
View File
@@ -0,0 +1,48 @@
//
// SPUUIBasedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@protocol SPUUIBasedUpdateDriverDelegate <NSObject>
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)uiDriverDidShowUpdate;
- (void)basicDriverDidFinishLoadingAppcast;
@end
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUUIBasedUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showedUserProgress;
@end
NS_ASSUME_NONNULL_END
+507
View File
@@ -0,0 +1,507 @@
//
// SPUUIBasedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUUIBasedUpdateDriver.h"
#import "SPUCoreBasedUpdateDriver.h"
#import "SPUUserDriver.h"
#import "SUHost.h"
#import "SUConstants.h"
#import "SPUUpdaterDelegate.h"
#import "SUAppcastItem.h"
#import "SUErrors.h"
#import "SPUDownloadData.h"
#import "SPUDownloadDataPrivate.h"
#import "SPUExtractSignedFeed.h"
#import "SPUResumableUpdate.h"
#import "SPUDownloadDriver.h"
#import "SPUSkippedUpdate.h"
#import "SPUUserUpdateState+Private.h"
#import "SUAppcastItem+Private.h"
#import "SUSignatures.h"
#import "SUSignatureVerifier.h"
#import "SPUVerifierInformation.h"
#import "SULocalizations.h"
#include "AppKitPrevention.h"
// Private class for downloading release notes
@interface SPUReleaseNotesDriver: NSObject <SPUDownloadDriverDelegate>
@end
@implementation SPUReleaseNotesDriver
{
SPUDownloadDriver *_downloadDriver;
SUHost *_host;
SUSignatures *_signatures;
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
uint64_t _contentLength;
}
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
{
self = [super init];
if (self != nil) {
_host = host;
_signatures = signatures;
_contentLength = contentLength;
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO delegate:self];
_completionHandler = [completionHandler copy];
} else {
assert(false);
}
return self;
}
- (void)startDownload SPU_OBJC_DIRECT
{
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
{
if (_completionHandler != nil) {
SPUDownloadData *downloadDataToPassToUserDriver;
// Strip out any sign warning comment prefix for markdown data so that user drivers
// will not have to deal with parsing them (if their markdown parsers don't handle decoding HTML)
NSString *MIMEType = downloadDataToValidate.MIMEType;
NSString *pathExtension = _downloadDriver.request.URL.pathExtension;
if ([MIMEType isEqualToString:@"text/markdown"] || [MIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame || [pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
NSData *contentData = SPUExtractReleaseNotesContent(downloadDataToValidate.data);
if (contentData.length != downloadDataToValidate.data.length) {
downloadDataToPassToUserDriver = [[SPUDownloadData alloc] initWithData:contentData URL:downloadDataToValidate.URL textEncodingName:downloadDataToValidate.textEncodingName MIMEType:downloadDataToValidate.MIMEType];
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
if (_host.requiresSignedAppcast) {
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:_contentLength];
verifierInformation.actualContentLength = downloadDataToValidate.data.length;
NSError *verifierError = nil;
if (![signatureVerifier verifyData:downloadDataToValidate.data signatures:_signatures fileKind:@"release notes" verifierInformation:verifierInformation error:&verifierError]) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"The release notes is improperly signed and could not be validated. Please contact the app developer for more information.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (verifierError != nil) {
[userInfo setObject:verifierError forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
_completionHandler = nil;
}
}
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
{
if (_completionHandler != nil) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while downloading the release notes.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (error != nil) {
[userInfo setObject:error forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
_completionHandler = nil;
}
}
- (void)cleanup:(void (^)(void))cleanupHandler SPU_OBJC_DIRECT
{
_completionHandler = nil;
[_downloadDriver cleanup:cleanupHandler];
}
@end
@interface SPUUIBasedUpdateDriver() <SPUCoreBasedUpdateDriverDelegate>
@end
@implementation SPUUIBasedUpdateDriver
{
SPUCoreBasedUpdateDriver *_coreDriver;
SUHost *_host;
id<SPUUserDriver> _userDriver;
SPUReleaseNotesDriver *_releaseNotesDriver;
NSDictionary *_httpHeaders;
NSString *_userAgent;
__weak id _updater;
__weak id<SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUUIBasedUpdateDriverDelegate> _delegate;
BOOL _userInitiated;
BOOL _resumingInstallingUpdate;
BOOL _resumingDownloadedInfoOrUpdate;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_userDriver = userDriver;
_delegate = delegate;
_updater = updater;
_userInitiated = userInitiated;
_updaterDelegate = updaterDelegate;
_host = host;
SPUUpdateCheck updateCheck = userInitiated ? SPUUpdateCheckUpdates : SPUUpdateCheckUpdatesInBackground;
_coreDriver = [[SPUCoreBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_coreDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_coreDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)_clearSkippedUpdatesIfUserInitiated SPU_OBJC_DIRECT
{
if (_userInitiated) {
[SPUSkippedUpdate clearSkippedUpdateForHost:_host];
}
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
{
_httpHeaders = httpHeaders;
_userAgent = userAgent;
[self _clearSkippedUpdatesIfUserInitiated];
[_coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background requiresSilentInstall:NO];
}
- (void)resumeInstallingUpdate
{
[self _clearSkippedUpdatesIfUserInitiated];
_resumingInstallingUpdate = YES;
[_coreDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[self _clearSkippedUpdatesIfUserInitiated];
_resumingDownloadedInfoOrUpdate = YES;
[_coreDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFinishLoadingAppcast
{
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
SPUUserUpdateStage stage;
// Major upgrades and information only updates are not downloaded automatically, as well as feeds that failed signing validation
if (_resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate && updateItem.signingValidationStatus != SPUAppcastSigningValidationStatusFailed) {
stage = SPUUserUpdateStageDownloaded;
} else if (_resumingInstallingUpdate) {
stage = SPUUserUpdateStageInstalling;
} else {
stage = SPUUserUpdateStageNotDownloaded;
}
SPUUserUpdateState *state = [[SPUUserUpdateState alloc] initWithStage:stage userInitiated:_userInitiated];
[_userDriver showUpdateFoundWithAppcastItem:updateItem state:state reply:^(SPUUserUpdateChoice userChoice) {
dispatch_async(dispatch_get_main_queue(), ^{
// Rule out invalid choices
SPUUserUpdateChoice validatedChoice;
if (updateItem.isInformationOnlyUpdate && userChoice == SPUUserUpdateChoiceInstall) {
validatedChoice = SPUUserUpdateChoiceDismiss;
} else {
validatedChoice = userChoice;
}
id updater = self->_updater;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector(updater:userDidMakeChoice:forUpdate:state:)]) {
[updaterDelegate updater:updater userDidMakeChoice:validatedChoice forUpdate:updateItem state:state];
} else if (validatedChoice == SPUUserUpdateChoiceSkip && [updaterDelegate respondsToSelector:@selector(updater:userDidSkipThisVersion:)]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[updaterDelegate updater:updater userDidSkipThisVersion:updateItem];
#pragma clang diagnostic pop
}
}
switch (validatedChoice) {
case SPUUserUpdateChoiceInstall: {
switch (stage) {
case SPUUserUpdateStageDownloaded:
[self->_coreDriver extractDownloadedUpdate];
break;
case SPUUserUpdateStageInstalling:
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
case SPUUserUpdateStageNotDownloaded:
[self->_coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:NO];
break;
}
break;
}
case SPUUserUpdateChoiceSkip: {
[SPUSkippedUpdate skipUpdate:updateItem host:self->_host];
switch (stage) {
case SPUUserUpdateStageDownloaded:
case SPUUserUpdateStageNotDownloaded:
// Informational and major updates can be resumed too, so make sure we check
// self->_resumingDownloadedInfoOrUpdate instead of the stage we pass to user driver
if (self->_resumingDownloadedInfoOrUpdate) {
[self->_coreDriver clearDownloadedUpdate];
}
[delegate uiDriverIsRequestingAbortUpdateWithError:nil];
break;
case SPUUserUpdateStageInstalling:
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
}
break;
}
case SPUUserUpdateChoiceDismiss: {
switch (stage) {
case SPUUserUpdateStageDownloaded:
case SPUUserUpdateStageNotDownloaded: {
[self->_delegate uiDriverIsRequestingAbortUpdateWithError:nil];
break;
}
case SPUUserUpdateStageInstalling: {
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
}
}
break;
}
}
});
}];
if ([delegate respondsToSelector:@selector(uiDriverDidShowUpdate)]) {
[delegate uiDriverDidShowUpdate];
}
if (updateItem.releaseNotesURL != nil && (![updaterDelegate respondsToSelector:@selector(updater:shouldDownloadReleaseNotesForUpdate:)] || [updaterDelegate updater:_updater shouldDownloadReleaseNotesForUpdate:updateItem])) {
__weak __typeof__(self) weakSelf = self;
_releaseNotesDriver = [[SPUReleaseNotesDriver alloc] initWithReleaseNotesURL:updateItem.releaseNotesURL contentLength:updateItem.releaseNotesContentLength signatures:updateItem.releaseNotesSignatures httpHeaders:_httpHeaders userAgent:_userAgent host:_host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
id <SPUUserDriver> userDriver = strongSelf->_userDriver;
if (downloadData != nil) {
[userDriver showUpdateReleaseNotesWithDownloadData:(SPUDownloadData * _Nonnull)downloadData];
} else {
[userDriver showUpdateReleaseNotesFailedToDownloadWithError:(NSError * _Nonnull)error];
}
}
}];
[_releaseNotesDriver startDownload];
}
}
- (void)downloadDriverWillBeginDownload
{
void (^cancelDownload)(void) = ^{
dispatch_async(dispatch_get_main_queue(), ^{
id<SPUUpdaterDelegate> updaterDelegate = self->_updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector((userDidCancelDownload:))]) {
[updaterDelegate userDidCancelDownload:self->_updater];
}
[self->_delegate uiDriverIsRequestingAbortUpdateWithError:nil];
});
};
[_userDriver showDownloadInitiatedWithCancellation:cancelDownload];
}
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
{
[_userDriver showDownloadDidReceiveExpectedContentLength:expectedContentLength];
}
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
{
[_userDriver showDownloadDidReceiveDataOfLength:length];
}
- (void)coreDriverDidStartExtractingUpdate
{
[_userDriver showDownloadDidStartExtractingUpdate];
}
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
{
if ([_userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication:)]) {
__weak __typeof__(self) weakSelf = self;
[_userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated retryTerminatingApplication:^{
if (!applicationTerminated) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:YES];
}
});
}
}];
} else if ([_userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:)]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated];
#pragma clang diagnostic pop
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(showInstallingUpdate)]) {
[_userDriver showInstallingUpdate];
}
if (!applicationTerminated) {
if ([_userDriver respondsToSelector:@selector(showSendingTerminationSignal)]) {
[_userDriver showSendingTerminationSignal];
}
}
#pragma clang diagnostic pop
}
}
- (void)installerDidExtractUpdateWithProgress:(double)progress
{
[_userDriver showExtractionReceivedProgress:progress];
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
if (!willInstallImmediately) {
[_userDriver showReadyToInstallAndRelaunch:^(SPUUserUpdateChoice choice) {
dispatch_async(dispatch_get_main_queue(), ^{
[self->_coreDriver finishInstallationWithResponse:choice displayingUserInterface:YES];
});
}];
}
}
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
{
if ([_userDriver respondsToSelector:@selector(showUpdateInstalledAndRelaunched:acknowledgement:)]) {
[_userDriver showUpdateInstalledAndRelaunched:relaunched acknowledgement:acknowledgement];
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showUpdateInstallationDidFinishWithAcknowledgement:acknowledgement];
#pragma clang diagnostic pop
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
- (void)_abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser SPU_OBJC_DIRECT
{
void (^abortUpdate)(void) = ^{
if (showErrorToUser) {
[self->_userDriver dismissUpdateInstallation];
}
[self->_coreDriver abortUpdateAndShowNextUpdateImmediately:NO error:error];
};
if (error != nil && showErrorToUser) {
NSError *nonNullError = error;
if (error.code == SUNoUpdateError) {
if ([_userDriver respondsToSelector:@selector(showUpdateNotFoundWithError:acknowledgement:)]) {
[_userDriver showUpdateNotFoundWithError:(NSError * _Nonnull)error acknowledgement:^{
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
} else if ([_userDriver respondsToSelector:@selector(showUpdateNotFoundWithAcknowledgement:)]) {
// Eventually we should remove this fallback once clients adopt -showUpdateNotFoundWithError:acknowledgement:
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showUpdateNotFoundWithAcknowledgement:^{
#pragma clang diagnostic pop
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
}
} else if (error.code == SUInstallationCanceledError || error.code == SUInstallationAuthorizeLaterError) {
abortUpdate();
} else {
[_userDriver showUpdaterError:nonNullError acknowledgement:^{
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
}
} else {
abortUpdate();
}
}
- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser
{
if (_releaseNotesDriver != nil) {
[_releaseNotesDriver cleanup:^{
[self _abortUpdateWithError:error showErrorToUser:showErrorToUser];
}];
} else {
[self _abortUpdateWithError:error showErrorToUser:showErrorToUser];
}
}
@end
+17 -40
View File
@@ -6,43 +6,18 @@
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class SPUDownloadedUpdate;
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
@protocol SPUResumableUpdate;
// The driver's cycle has ended. resumableLocalUpdate reflects the local state (a downloaded-but-not-installed
// update) that should be passed back in on the next cycle, if any.
typedef void (^SPUUpdateDriverCompletion)(BOOL shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable resumableLocalUpdate, NSError * _Nullable error);
typedef void (^SPUUpdateDriverCompletion)(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error);
typedef NS_ENUM(NSUInteger, SPUUpdateDriverInstallMode) {
// The driver only probes for update information and never shows anything or downloads/installs
// (eg: -checkForUpdateInformation)
SPUUpdateDriverInstallModeNone,
// The driver may silently download and stage/install an update without asking first.
// If an update needs the user's attention before proceeding (eg: it's a major upgrade,
// informational-only, critical, or requires authorization), the driver escalates to
// SPUUpdateDriverInstallModeShowingUI in the same cycle rather than proceeding silently.
SPUUpdateDriverInstallModeAutomatic,
// The driver presents UI via the user driver and asks before downloading/installing.
SPUUpdateDriverInstallModeShowingUI,
};
// This class drives an update check cycle: querying the appcast, downloading, extracting,
// installing, and presenting UI as needed, according to its install mode.
SPU_OBJC_DIRECT_MEMBERS @interface SPUUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(nullable id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate userInitiated:(BOOL)userInitiated installMode:(SPUUpdateDriverInstallMode)installMode;
// Only meaningful for a driver constructed with SPUUpdateDriverInstallModeAutomatic.
// Must be set (along with impatientUpdateCheckInterval) before starting a check.
@property (nonatomic, copy) NSDate *lastImpatientCheckedDate;
@property (nonatomic) NSTimeInterval impatientUpdateCheckInterval;
// This protocol describes an update driver that drives updates
// An update driver may have multiple levels of other controller components (eg: basic update driver, core based update driver, ui based update driver, appcast driver, etc)
// The update driver and the components the driver has communicates via parameter passing and delegation..
// The old Sparkle architecture communicated via subclassing and method overriding, but this lead to bugs due to high coupling, and complexity of not being aware of methods being executed.
// The newer architecture is still complex but should be more reliable to maintain and extend.
@protocol SPUUpdateDriver <NSObject>
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
@@ -50,17 +25,19 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUUpdateDriver : NSObject
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
// Checks for updates, resuming resumableLocalUpdate (a downloaded-but-not-installed update) if one
// was passed back from a prior cycle's completion handler. The driver also probes on its own for an
// update that an external installer job (eg: from another instance of the updater)
// may already be staging or installing; if it finds one, that global state
// takes priority over resumableLocalUpdate.
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(nullable NSDictionary *)httpHeaders resumingLocalUpdate:(nullable SPUDownloadedUpdate *)resumableLocalUpdate;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
@property (nonatomic, readonly) BOOL showingUpdate;
// A likely implementation of -abortUpdate is invoking -abortUpdateWithError: by passing nil
- (void)abortUpdate;
// This should be invoked on the update driver to finish the update driver's work
- (void)abortUpdateWithError:(nullable NSError *)error;
- (void)abortUpdateWithError:(NSError * _Nullable)error;
@end
-1052
View File
File diff suppressed because it is too large. Load diff
+185 -136
View File
@@ -19,12 +19,18 @@
#import "SULog+NSError.h"
#import "SUCodeSigningVerifier.h"
#import "SUSystemProfiler.h"
#import "SPUScheduledUpdateDriver.h"
#import "SPUProbingUpdateDriver.h"
#import "SPUUserInitiatedUpdateDriver.h"
#import "SPUAutomaticUpdateDriver.h"
#import "SPUProbeInstallStatus.h"
#import "SUAppcastItem.h"
#import "SPUInstallationInfo.h"
#import "SUErrors.h"
#import "SPUXPCServiceInfo.h"
#import "SPUUpdaterCycle.h"
#import "SPUUpdaterTimer.h"
#import "SPUDownloadedUpdate.h"
#import "SPUResumableUpdate.h"
#import "SUSignatures.h"
#import "SPUUserAgent+Private.h"
#import "SPUGentleUserDriverReminders.h"
@@ -50,7 +56,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
@implementation SPUUpdater
{
id<SPUUserDriver> _userDriver;
SPUUpdateDriver *_driver;
id <SPUUpdateDriver> _driver;
SUHost *_host;
SUHost *_mainBundleHost;
NSBundle *_applicationBundle;
@@ -58,9 +64,8 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
SPUUpdaterSettings *_updaterSettings;
SPUUpdaterCycle *_updaterCycle;
SPUUpdaterTimer *_updaterTimer;
SPUDownloadedUpdate *_resumableLocalUpdate;
id<SPUResumableUpdate> _resumableUpdate;
NSDate *_updateLastCheckedDate;
NSDate *_updateLastImpatientCheckedDate;
NSURL *_lastCheckedFeedURL;
NSSet<NSString *> * _lastAllowedChannels;
@@ -73,7 +78,6 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
BOOL _loggedATSWarning;
BOOL _loggedNoSecureKeyWarning;
BOOL _loggedUpdateSecurityPolicyWarning;
BOOL _loggedFeedBundleIdentifierWarning;
BOOL _updatingMainBundle;
}
@@ -101,10 +105,6 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_delegate = delegate;
// Initialized to the current date instead of nil so the first update check runs
// correctly if there's a installation in progress by another external updater
_updateLastImpatientCheckedDate = [NSDate date];
NSBundle *mainBundle = [NSBundle mainBundle];
_updatingMainBundle = [hostBundle isEqualTo:mainBundle];
@@ -380,26 +380,14 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
return NO;
}
} else if (_host.requiresFeedBundleIdentifier) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, %@ needs to also be enabled if %@ is enabled for %@. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/customization/", SURequireSignedFeedKey, SURequireFeedBundleIdentifierKey, hostName] }];
}
return NO;
}
if (_updatingMainBundle) {
if (!_loggedUpdateSecurityPolicyWarning && mainBundleHost.hasUpdateSecurityPolicy) {
SULog(SULogLevelDefault, @"Warning: %@ has a custom NSUpdateSecurityPolicy in its Info.plist. This may cause issues when installing updates. Please consider removing this key for your builds using Sparkle if you do not really require a custom update security policy.", hostName);
_loggedUpdateSecurityPolicyWarning = YES;
}
if (!_loggedFeedBundleIdentifierWarning && requiresSignedFeed && ![_host boolForInfoDictionaryKey:SURequireFeedBundleIdentifierKey]) {
SULog(SULogLevelDefault, @"Warning: %@ is enabled but %@ is not enabled for %@. For increased security, please consider enabling %@ and adding a %@ element to your signed feed. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/#3-segue-for-security-concerns.", SURequireSignedFeedKey, SURequireFeedBundleIdentifierKey, hostName, SURequireFeedBundleIdentifierKey, SUAppcastElementBundleIdentifier);
_loggedFeedBundleIdentifierWarning = YES;
}
}
return YES;
@@ -527,58 +515,87 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
if (firingImmediately) {
[self _checkForUpdatesInBackground];
} else {
NSTimeInterval checkInterval = [self updateCheckInterval];
// This callback is asynchronous, so the timer may be set. Invalidate to make sure it isn't.
[_updaterTimer invalidate];
NSTimeInterval intervalSinceCheck;
if (usingCurrentDate) {
// How long has it been since last we checked for an update?
NSDate *lastCheckDate = [self lastUpdateCheckDate];
if (!lastCheckDate) {
lastCheckDate = [NSDate distantPast];
}
intervalSinceCheck = [[NSDate date] timeIntervalSinceDate:lastCheckDate];
if (intervalSinceCheck < 0) {
// Last update check date is in the future and bogus, so reset it to current date
[self updateLastUpdateCheckDate];
// This may not return the same update check interval as the developer has configured
// Notably it may differ when we have an update that has been already downloaded and needs to resume,
// as well as if that update is marked critical or not
void (^retrieveNextUpdateCheckInterval)(void (^)(NSTimeInterval)) = ^(void (^completionHandler)(NSTimeInterval)) {
NSString *hostBundleIdentifier = self->_host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
dispatch_async(dispatch_get_main_queue(), ^{
NSTimeInterval regularCheckInterval = [self updateCheckInterval];
NSTimeInterval impatientCheckInterval = [self->_updaterSettings impatientUpdateCheckInterval];
if (installationInfo == nil) {
// Proceed as normal if there's no resumable updates
completionHandler(regularCheckInterval);
} else {
if ([installationInfo.appcastItem isCriticalUpdate] || [installationInfo.appcastItem isInformationOnlyUpdate]) {
completionHandler(MIN(regularCheckInterval, impatientCheckInterval));
} else {
completionHandler(MAX(regularCheckInterval, impatientCheckInterval));
}
}
});
}];
};
self.canCheckForUpdates = NO;
self.sessionInProgress = YES;
retrieveNextUpdateCheckInterval(^(NSTimeInterval updateCheckInterval) {
[self setCanCheckForUpdates:YES];
[self setSessionInProgress:NO];
// This callback is asynchronous, so the timer may be set. Invalidate to make sure it isn't.
[self->_updaterTimer invalidate];
NSTimeInterval intervalSinceCheck;
if (usingCurrentDate) {
// How long has it been since last we checked for an update?
NSDate *lastCheckDate = [self lastUpdateCheckDate];
if (!lastCheckDate) { lastCheckDate = [NSDate distantPast]; }
intervalSinceCheck = [[NSDate date] timeIntervalSinceDate:lastCheckDate];
if (intervalSinceCheck < 0) {
// Last update check date is in the future and bogus, so reset it to current date
[self updateLastUpdateCheckDate];
intervalSinceCheck = 0;
}
} else {
intervalSinceCheck = 0;
}
} else {
intervalSinceCheck = 0;
}
NSTimeInterval minimumUpdateCheckInterval = self->_updaterSettings.minimumUpdateCheckInterval;
// Now we want to figure out how long until we check again.
if (checkInterval < minimumUpdateCheckInterval)
checkInterval = minimumUpdateCheckInterval;
if (intervalSinceCheck < checkInterval) {
NSTimeInterval delayUntilCheck = (checkInterval - intervalSinceCheck); // It hasn't been long enough.
if ([delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)]) {
[delegate updater:self willScheduleUpdateCheckAfterDelay:delayUntilCheck];
NSTimeInterval minimumUpdateCheckInterval = self->_updaterSettings.minimumUpdateCheckInterval;
// Now we want to figure out how long until we check again.
if (updateCheckInterval < minimumUpdateCheckInterval)
updateCheckInterval = minimumUpdateCheckInterval;
if (intervalSinceCheck < updateCheckInterval) {
NSTimeInterval delayUntilCheck = (updateCheckInterval - intervalSinceCheck); // It hasn't been long enough.
if ([delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)]) {
[delegate updater:self willScheduleUpdateCheckAfterDelay:delayUntilCheck];
}
if ([self->_userDriver respondsToSelector:@selector(logGentleScheduledUpdateReminderWarningIfNeeded)]) {
[(id<SPUGentleUserDriverReminders>)self->_userDriver logGentleScheduledUpdateReminderWarningIfNeeded];
}
uint64_t leewayUpdateCheckInterval = self->_updaterSettings.leewayUpdateCheckInterval;
[self->_updaterTimer startAndFireAfterDelay:delayUntilCheck leewayUpdateCheckInterval:leewayUpdateCheckInterval];
} else {
// We're overdue! Run one now.
[self _checkForUpdatesInBackground];
}
if ([_userDriver respondsToSelector:@selector(logGentleScheduledUpdateReminderWarningIfNeeded)]) {
[(id<SPUGentleUserDriverReminders>)_userDriver logGentleScheduledUpdateReminderWarningIfNeeded];
}
uint64_t leewayUpdateCheckInterval = _updaterSettings.leewayUpdateCheckInterval;
[_updaterTimer startAndFireAfterDelay:delayUntilCheck leewayUpdateCheckInterval:leewayUpdateCheckInterval];
} else {
// We're overdue! Run one now.
[self _checkForUpdatesInBackground];
}
});
}
}
- (void)updaterTimerDidFire
{
// User can perform a checkForUpdates check around the same time the timer is ready to fire
if (!_sessionInProgress) {
if (!_sessionInProgress)
{
[self _checkForUpdatesInBackground];
}
}
@@ -587,24 +604,42 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
{
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
id<SPUUpdaterDelegate> delegate = _delegate;
SPUUpdateDriverInstallMode installMode = [self automaticallyDownloadsUpdates] ? SPUUpdateDriverInstallModeAutomatic : SPUUpdateDriverInstallModeShowingUI;
SPUUpdateDriver *updateDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:delegate userInitiated:NO installMode:installMode];
if (installMode == SPUUpdateDriverInstallModeAutomatic) {
if ([_updateLastImpatientCheckedDate timeIntervalSinceNow] > 0) {
// Last impatient checked date is bogus (in the future), reset it
_updateLastImpatientCheckedDate = [NSDate date];
}
updateDriver.impatientUpdateCheckInterval = _updaterSettings.impatientUpdateCheckInterval;
updateDriver.lastImpatientCheckedDate = _updateLastImpatientCheckedDate;
}
[self checkForUpdatesWithDriver:updateDriver updateCheck:SPUUpdateCheckUpdatesInBackground];
// We don't want the probe check to act on the driver if the updater is going near death
__weak __typeof__(self) weakSelf = self;
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL installerIsRunning) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf == nil) {
return;
}
id<SPUUpdaterDelegate> delegate = strongSelf->_delegate;
id <SPUUpdateDriver> updateDriver;
if (!installerIsRunning && [strongSelf automaticallyDownloadsUpdates] && strongSelf->_resumableUpdate == nil) {
updateDriver =
[[SPUAutomaticUpdateDriver alloc]
initWithHost:strongSelf->_host
applicationBundle:strongSelf->_applicationBundle
updater:strongSelf
userDriver:strongSelf->_userDriver
updaterDelegate:delegate];
} else {
updateDriver =
[[SPUScheduledUpdateDriver alloc]
initWithHost:strongSelf->_host
applicationBundle:strongSelf->_applicationBundle
updater:strongSelf
userDriver:strongSelf->_userDriver
updaterDelegate:delegate];
}
[strongSelf checkForUpdatesWithDriver:updateDriver updateCheck:SPUUpdateCheckUpdatesInBackground installerInProgress:installerIsRunning];
});
}];
}
// This is the developer-facing checkForUpdatesInBackground
@@ -687,9 +722,20 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
SPUUpdateDriver *theUpdateDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:_delegate userInitiated:YES installMode:SPUUpdateDriverInstallModeShowingUI];
[self checkForUpdatesWithDriver:theUpdateDriver updateCheck:SPUUpdateCheckUpdates];
id <SPUUpdateDriver> theUpdateDriver = [[SPUUserInitiatedUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:_delegate];
NSString *bundleIdentifier = _host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
__weak __typeof__(self) weakSelf = self;
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf checkForUpdatesWithDriver:theUpdateDriver updateCheck:SPUUpdateCheckUpdates installerInProgress:installerInProgress];
}
});
}];
}
- (void)checkForUpdateInformation
@@ -705,27 +751,36 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
return;
}
__weak __typeof__(self) weakSelf = self;
if (!_startedUpdater) {
SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
return;
}
if (_sessionInProgress) {
SULog(SULogLevelError, @"Error: -checkForUpdateInformation called but .sessionInProgress == YES");
return;
}
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
SPUUpdateDriver *probingDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:nil updaterDelegate:_delegate userInitiated:NO installMode:SPUUpdateDriverInstallModeNone];
[self checkForUpdatesWithDriver:probingDriver updateCheck:SPUUpdateCheckUpdateInformation];
NSString *bundleIdentifier = _host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf checkForUpdatesWithDriver:[[SPUProbingUpdateDriver alloc] initWithHost:strongSelf->_host updater:strongSelf updaterDelegate:strongSelf->_delegate] updateCheck:SPUUpdateCheckUpdateInformation installerInProgress:installerInProgress];
}
});
}];
}
- (void)checkForUpdatesWithDriver:(SPUUpdateDriver *)d updateCheck:(SPUUpdateCheck)updateCheck SPU_OBJC_DIRECT
- (void)checkForUpdatesWithDriver:(id <SPUUpdateDriver> )d updateCheck:(SPUUpdateCheck)updateCheck installerInProgress:(BOOL)installerInProgress SPU_OBJC_DIRECT
{
if (_driver != nil) {
SULog(SULogLevelError, @"Error: checkForUpdatesWithDriver:updateCheck: called when _driver != nil");
SULog(SULogLevelError, @"Error: checkForUpdatesWithDriver:updateCheck:installerInProgress: called when _driver != nil");
return;
}
@@ -736,29 +791,30 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_driver = d;
assert(_driver != nil);
void (^notifyDelegateOfDriverCompletion)(NSError * _Nullable) = ^(NSError * _Nullable error) {
void (^notifyDelegateOfDriverCompletion)(NSError * _Nullable, BOOL) = ^(NSError * _Nullable error, BOOL shouldShowUpdateImmediately) {
id<SPUUpdaterDelegate> delegate = self->_delegate;
if (error != nil) {
if (error.code != SUNoUpdateError && error.code != SUInstallationCanceledError) { // Let's not bother logging this.
if (error.code != SUNoUpdateError && error.code != SUInstallationCanceledError && error.code != SUInstallationAuthorizeLaterError) { // Let's not bother logging this.
SULogError(error);
}
// Notify host app that update driver has aborted if a non-recoverable error occurs
if ([delegate respondsToSelector:@selector((updater:didAbortWithError:))]) {
if (error.code != SUInstallationAuthorizeLaterError && [delegate respondsToSelector:@selector((updater:didAbortWithError:))]) {
[delegate updater:self didAbortWithError:(NSError * _Nonnull)error];
}
}
// Notify host app that update driver has finished
if ([delegate respondsToSelector:@selector((updater:didFinishUpdateCycleForUpdateCheck:error:))]) {
// As long as we're not going to immediately kick off a new check
if (!shouldShowUpdateImmediately && [delegate respondsToSelector:@selector((updater:didFinishUpdateCycleForUpdateCheck:error:))]) {
[delegate updater:self didFinishUpdateCycleForUpdateCheck:updateCheck error:error];
}
};
void (^abortUpdateDriver)(NSError * _Nullable , BOOL) = ^(NSError * _Nullable abortError, BOOL shouldScheduleNextUpdateCheck) {
__weak __typeof__(self) weakSelf = self;
[self->_driver setCompletionHandler:^(BOOL __unused shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable __unused resumableLocalUpdate, NSError * _Nullable error) {
[self->_driver setCompletionHandler:^(BOOL __unused shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable __unused resumableUpdate, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
strongSelf->_driver = nil;
@@ -768,7 +824,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
strongSelf.sessionInProgress = NO;
strongSelf.canCheckForUpdates = YES;
notifyDelegateOfDriverCompletion(error);
notifyDelegateOfDriverCompletion(error, NO);
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
if (!strongSelf->_sessionInProgress) {
@@ -794,7 +850,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
([delegate respondsToSelector:@selector((updaterMayCheckForUpdates:))] && ![delegate updaterMayCheckForUpdates:self]))
#pragma clang diagnostic pop
{
abortUpdateDriver((mayCheckForUpdatesError != nil) ? mayCheckForUpdatesError : [NSError errorWithDomain:SUSparkleErrorDomain code:SUUpdateCheckDeclinedError userInfo:nil], YES);
abortUpdateDriver(mayCheckForUpdatesError, YES);
return;
}
@@ -810,34 +866,27 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
// Run our update driver and schedule next update check on its completion
__weak __typeof__(self) weakSelf = self;
[_driver setCompletionHandler:^(BOOL shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable resumableLocalUpdate, NSError * _Nullable error) {
[_driver setCompletionHandler:^(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
strongSelf->_resumableLocalUpdate = resumableLocalUpdate;
[strongSelf updateLastUpdateCheckDate];
// Track the last downloaded date locally the first time the automatic update driver
// downloads an update in the background. This is later used for the impatient update check.
if (shouldResetImpatientCheckDate) {
strongSelf->_updateLastImpatientCheckedDate = [strongSelf lastUpdateCheckDate];
}
strongSelf->_resumableUpdate = resumableUpdate;
strongSelf->_driver = nil;
[strongSelf updateLastUpdateCheckDate];
[strongSelf setSessionInProgress:NO];
[strongSelf setCanCheckForUpdates:YES];
if (!strongSelf->_updatingMainBundle && error == nil && resumableLocalUpdate == nil) {
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);
notifyDelegateOfDriverCompletion(error, shouldShowUpdateImmediately);
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
if (!strongSelf->_sessionInProgress) {
[strongSelf scheduleNextUpdateCheckFiringImmediately:NO usingCurrentDate:NO];
[strongSelf scheduleNextUpdateCheckFiringImmediately:shouldShowUpdateImmediately usingCurrentDate:NO];
}
}
}];
@@ -852,18 +901,25 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
[weakSelf updateLastUpdateCheckDate];
}];
// Check that the parameterized feed URL is valid
NSURL *theFeedURL = [self parameterizedFeedURL];
if (theFeedURL == nil) {
// I think this is really unlikely to occur but better be safe
// We will not schedule a next update check if the feed URL cannot be formed
SULog(SULogLevelError, @"Error: failed to retrieve feed URL for bundle");
abortUpdateDriver([NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: @"Sparkle cannot form a valid feed URL." }], NO);
if (installerInProgress) {
// Resume an update that has already begun installing in the background
[_driver resumeInstallingUpdate];
} else if (_resumableUpdate != nil) {
// Resume an update or info that has already been downloaded
[_driver resumeUpdate:(id<SPUResumableUpdate> _Nonnull)_resumableUpdate];
} else {
// The driver probes on its own for an update an external installer job may already be
// staging or installing; otherwise it resumes _resumableLocalUpdate, if any
[_driver checkForUpdatesAtAppcastURL:theFeedURL withUserAgent:_userAgentString httpHeaders:_httpHeaders resumingLocalUpdate:_resumableLocalUpdate];
// Check that the parameterized feed URL is valid
NSURL *theFeedURL = [self parameterizedFeedURL];
if (theFeedURL == nil) {
// I think this is really unlikely to occur but better be safe
// We will not schedule a next update check if the feed URL cannot be formed
SULog(SULogLevelError, @"Error: failed to retrieve feed URL for bundle");
abortUpdateDriver([NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: @"Sparkle cannot form a valid feed URL." }], NO);
} else {
// Check for new updates
[_driver checkForUpdatesAtAppcastURL:theFeedURL withUserAgent:_userAgentString httpHeaders:_httpHeaders];
}
}
}
@@ -1193,21 +1249,14 @@ 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 *currentDate = [NSDate date];
if (sendingSystemProfile) {
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey ofClass:NSDate.class];
if (!lastSubmitDate) {
lastSubmitDate = [NSDate distantPast];
}
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
NSTimeInterval timeSinceLastSubmission = [currentDate timeIntervalSinceDate:lastSubmitDate];
if (timeSinceLastSubmission < 0) {
// Ignore dates far out in the future
sendingSystemProfile = NO;
[_host setObject:currentDate forUserDefaultsKey:SULastProfileSubmitDateKey];
} else if (timeSinceLastSubmission < oneWeek) {
NSTimeInterval timeSinceLastSubmission = [lastSubmitDate timeIntervalSinceNow] * -1;
if (timeSinceLastSubmission < oneWeek) {
sendingSystemProfile = NO;
}
}
@@ -1223,7 +1272,7 @@ static NSString *escapeURLComponent(NSString *str) {
if (sendingSystemProfile)
{
parameters = [parameters arrayByAddingObjectsFromArray:[self systemProfileArray]];
[_host setObject:currentDate forUserDefaultsKey:SULastProfileSubmitDateKey];
[_host setObject:[NSDate date] forUserDefaultsKey:SULastProfileSubmitDateKey];
}
if ([parameters count] == 0) { return baseFeedURL; }
@@ -1307,7 +1356,7 @@ static NSString *escapeURLComponent(NSString *str) {
// Abort any on-going updates
// A driver could be retained by another object (eg: a timer),
// so not aborting could mean it stays alive longer than we'd want
[_driver abortUpdateWithError:nil];
[_driver abortUpdate];
_driver = nil;
}
+1 -1
View File
@@ -186,7 +186,7 @@ NS_SWIFT_UI_ACTOR @protocol SPUUpdaterDelegate <NSObject>
- `SPULatestAppcastItemFoundKey`: if available, this may provide the latest `SUAppcastItem` that was found. This will be @c nil if it's unavailable.
- `SPUNoUpdateFoundReasonKey`: This will provide the `SPUNoUpdateFoundReason`.
For example the reason could be because the latest version in the feed requires a newer OS version or could be because the user is already on the latest version.
- `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user initiated an update check manually.
- `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user intitiated an update check manually.
@param updater The updater instance.
@param error An error containing information on why a new valid update was not found
+1 -1
View File
@@ -79,7 +79,7 @@ SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUUpdaterSettings : NSObject
* The impatient update check interval.
*
* If an update has already been downloaded automatically in the background, Sparkle may not notify users of the update immediately,
* and tries to install the update silently on quit without notifying the user.
* and tries to install the update siliently on quit without notifying the user.
*
* Sparkle uses this long impatient update check interval to decide when to notify the user of the update if they haven't quit the app for a long time.
* By default this check interval is set to 604800 seconds (which is 1 week). This interval must be bigger than the `updateCheckInterval`.
+1 -8
View File
@@ -17,8 +17,6 @@
dispatch_source_t _source;
__weak id<SPUUpdaterTimerDelegate> _delegate;
NSUInteger _timerGeneration;
}
- (instancetype)initWithDelegate:(id<SPUUpdaterTimerDelegate>)delegate
@@ -39,15 +37,11 @@
dispatch_time_t timeToFire = dispatch_walltime(NULL, (int64_t)(delay * NSEC_PER_SEC));
dispatch_source_set_timer(_source, timeToFire, DISPATCH_TIME_FOREVER, leewayUpdateCheckInterval * NSEC_PER_SEC);
_timerGeneration++;
NSUInteger currentTimerGeneration = _timerGeneration;
__weak __typeof__(self) weakSelf = self;
dispatch_source_set_event_handler(_source, ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
if (strongSelf->_timerGeneration == currentTimerGeneration) {
[strongSelf->_delegate updaterTimerDidFire];
}
[strongSelf->_delegate updaterTimerDidFire];
}
});
@@ -59,7 +53,6 @@
if (_source != nil) {
dispatch_source_cancel(_source);
_source = nil;
_timerGeneration++;
}
}
+1 -1
View File
@@ -291,7 +291,7 @@ SU_EXPORT NS_SWIFT_UI_ACTOR @protocol SPUUserDriver <NSObject>
- (void)showUpdateInstallationDidFinishWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateInstalledAndRelaunched:acknowledgement: instead");
- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs. This method is no longer called.");
- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs.");
- (void)showInstallingUpdate __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");
+23
View File
@@ -0,0 +1,23 @@
//
// SPUUserInitiatedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate, SPUUserDriver;
SPU_OBJC_DIRECT_MEMBERS @interface SPUUserInitiatedUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
+149
View File
@@ -0,0 +1,149 @@
//
// SPUUserInitiatedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUUserInitiatedUpdateDriver.h"
#import "SPUUIBasedUpdateDriver.h"
#import "SPUUserDriver.h"
#include "AppKitPrevention.h"
@interface SPUUserInitiatedUpdateDriver () <SPUUIBasedUpdateDriverDelegate>
@end
@implementation SPUUserInitiatedUpdateDriver
{
SPUUIBasedUpdateDriver *_uiDriver;
id<SPUUserDriver> _userDriver;
void (^_updateDidShowHandler)(void);
BOOL _showingUserInitiatedProgress;
BOOL _showingUpdate;
BOOL _aborted;
}
@synthesize showingUpdate = _showingUpdate;
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_uiDriver = [[SPUUIBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:YES updaterDelegate:updaterDelegate delegate:self];
_userDriver = userDriver;
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_uiDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))handler
{
_updateDidShowHandler = [handler copy];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_uiDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
_showingUserInitiatedProgress = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
_updateDidShowHandler = nil;
}
[_userDriver showUserInitiatedUpdateCheckWithCancellation:^{
dispatch_async(dispatch_get_main_queue(), ^{
if (self->_showingUserInitiatedProgress) {
[self abortUpdate];
}
});
}];
[_uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:NO];
}
- (void)resumeInstallingUpdate
{
[_uiDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[_uiDriver resumeUpdate:resumableUpdate];
}
- (void)uiDriverDidShowUpdate
{
// When a new update check has not been initiated and an update has been resumed,
// update the driver to indicate we are showing an update to the user
_showingUpdate = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
_updateDidShowHandler = nil;
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)basicDriverDidFinishLoadingAppcast
{
if (_showingUserInitiatedProgress) {
_showingUserInitiatedProgress = NO;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)]) {
[_userDriver dismissUserInitiatedUpdateCheck];
}
#pragma clang diagnostic pop
}
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
if (_showingUserInitiatedProgress) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)]) {
[_userDriver dismissUserInitiatedUpdateCheck];
}
#pragma clang diagnostic pop
_showingUserInitiatedProgress = NO;
}
_aborted = YES;
[_uiDriver abortUpdateWithError:error showErrorToUser:YES];
}
@end
-2
View File
@@ -30,8 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
- (SUAppcast *)copyByFilteringItems:(BOOL (^)(SUAppcastItem *))filterBlock;
@property (readonly, nonatomic, copy) NSSet<NSString *> *bundleIdentifiers;
@end
NS_ASSUME_NONNULL_END
+4 -30
View File
@@ -21,17 +21,10 @@
#include "AppKitPrevention.h"
@interface SUAppcast ()
@property (readonly, nonatomic, copy) NSSet<NSString *> *bundleIdentifiers;
@end
@implementation SUAppcast
@synthesize items = _items;
@synthesize signingValidationStatus = _signingValidationStatus;
@synthesize bundleIdentifiers = _bundleIdentifiers;
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus error:(NSError * __autoreleasing *)error
{
@@ -93,22 +86,6 @@
return nil;
}
NSArray *channelNodes = [document nodesForXPath:@"/rss/channel/*" error:errorp];
if (nil == channelNodes) {
return nil;
}
NSMutableSet<NSString *> *bundleIdentifiers = [NSMutableSet set];
for (NSXMLNode *channelNode in channelNodes) {
if ([[self sparkleNamespacedNameOfNode:channelNode] isEqualToString:SUAppcastElementBundleIdentifier]) {
NSString *bundleIdentifier = [channelNode.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
if (bundleIdentifier.length > 0) {
[bundleIdentifiers addObject:bundleIdentifier];
}
}
}
_bundleIdentifiers = [bundleIdentifiers copy];
NSArray *xmlItems = [document nodesForXPath:@"/rss/channel/item" error:errorp];
if (nil == xmlItems) {
return nil;
@@ -168,8 +145,7 @@
[dict setObject:descriptionDict forKey:SURSSElementDescription];
}
} else if ([name isEqualToString:SUAppcastElementReleaseNotesLink]) {
// Trim whitespace to maintain backwards compatibility
NSString *releaseNotesLink = [node.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
NSString *releaseNotesLink = node.stringValue;
if (releaseNotesLink != nil) {
NSDictionary *attributes = [self attributesOfNode:(NSXMLElement *)node];
@@ -201,7 +177,7 @@
NSMutableArray *names = [NSMutableArray array];
NSEnumerator *childEnum = [[node children] objectEnumerator];
for (NSXMLNode *child in childEnum) {
NSString *childName = [self sparkleNamespacedNameOfNode:child];
NSString *childName = child.name;
if (childName) {
[names addObject:childName];
}
@@ -211,13 +187,12 @@
NSMutableSet *informationalUpdateVersions = [NSMutableSet set];
NSEnumerator *childEnum = [[node children] objectEnumerator];
for (NSXMLNode *child in childEnum) {
NSString *childName = [self sparkleNamespacedNameOfNode:child];
if ([childName isEqualToString:SUAppcastElementVersion]) {
if ([child.name isEqualToString:SUAppcastElementVersion]) {
NSString *version = child.stringValue;
if (version != nil) {
[informationalUpdateVersions addObject:version];
}
} else if ([childName isEqualToString:SUAppcastElementBelowVersion]) {
} else if ([child.name isEqualToString:SUAppcastElementBelowVersion]) {
NSString *version = child.stringValue;
if (version != nil) {
// Denote version is used as an upper bound by using '<'
@@ -311,7 +286,6 @@
other->_items = newItems;
other->_signingValidationStatus = _signingValidationStatus;
other->_bundleIdentifiers = _bundleIdentifiers;
return other;
}
+1 -1
View File
@@ -33,7 +33,7 @@ SUAppcastDriverDefinitionAttribute
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id <SUAppcastDriverDelegate>)delegate;
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background resumingUpdate:(BOOL)resumingUpdate;
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)cleanup:(void (^)(void))completionHandler;
+19 -67
View File
@@ -35,10 +35,8 @@
#include "AppKitPrevention.h"
#define SUInitialFailedFeedSigningValidationDateKey @"SUInitialFailedFeedSigningValidationDate"
#define SUFeedLastCacheBypassCheckTimeKey @"SUFeedLastCacheBypassCheckTime"
#define DEFAULT_APPCAST_FAILURE_EXPIRATION_INTERVAL 1728000 // 20 days
#define CACHE_BYPASS_CHECK_INTERVAL 1814400 // 3 weeks
@interface SUAppcastDriver () <SPUDownloadDriverDelegate>
@end
@@ -65,7 +63,7 @@
return self;
}
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background resumingUpdate:(BOOL)resumingUpdate
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
{
assert(NSThread.isMainThread);
@@ -75,53 +73,13 @@
}
requestHTTPHeaders[@"Accept"] = @"application/rss+xml,*/*;q=0.1";
NSURLRequestCachePolicy cachePolicy;
if ([_host boolForInfoDictionaryKey:SUDisableFeedCacheValidationKey]) {
// The developer disabled feed cache validation
cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
} else if (resumingUpdate) {
// We already have an update downloaded or installing that we can fall back to resuming,
// so we will risk always respecting the cache
cachePolicy = NSURLRequestReloadRevalidatingCacheData;
} else if (!background) {
// Always fetch the freshest feed when the user explicitly asks us to check
cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
} else {
// With NSURLRequestReloadRevalidatingCacheData, ETag / If-Modified-Since can be used so that
// a previously cached file can be used if it hasn't changed on the server.
// However we have a bypass check interval periodically to force ignoring the cache data if
// something happens to go wrong.
SUHost *hostForCacheBypassCheckTime = _host;
NSString *cacheBypassCheckTimeKey = [SUHost mainBundleUserDefaultsKey:SUFeedLastCacheBypassCheckTimeKey forHost:&hostForCacheBypassCheckTime];
NSDate *lastCacheBypassCheckDate = [hostForCacheBypassCheckTime objectForUserDefaultsKey:cacheBypassCheckTimeKey ofClass:NSDate.class];
BOOL needsCacheBypass;
if (lastCacheBypassCheckDate == nil) {
needsCacheBypass = YES;
} else {
NSTimeInterval intervalSinceLastCacheBypassCheck = [[NSDate date] timeIntervalSinceDate:lastCacheBypassCheckDate];
needsCacheBypass = (intervalSinceLastCacheBypassCheck < 0 || intervalSinceLastCacheBypassCheck >= CACHE_BYPASS_CHECK_INTERVAL);
}
cachePolicy = needsCacheBypass ? NSURLRequestReloadIgnoringLocalCacheData : NSURLRequestReloadRevalidatingCacheData;
}
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:appcastURL host:_host userAgent:userAgent httpHeaders:requestHTTPHeaders inBackground:background cachePolicy:cachePolicy delegate:self];
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:appcastURL host:_host userAgent:userAgent httpHeaders:requestHTTPHeaders inBackground:background delegate:self];
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
{
if (_downloadDriver.request.cachePolicy == NSURLRequestReloadIgnoringLocalCacheData) {
// Reset the cache bypass any time the feed has been downloaded successfully
SUHost *hostForCacheBypassCheckTime = _host;
NSString *cacheBypassCheckTimeKey = [SUHost mainBundleUserDefaultsKey:SUFeedLastCacheBypassCheckTimeKey forHost:&hostForCacheBypassCheckTime];
[hostForCacheBypassCheckTime setObject:[NSDate date] forUserDefaultsKey:cacheBypassCheckTimeKey];
}
SPUAppcastItemStateResolver *stateResolver = [[SPUAppcastItemStateResolver alloc] initWithHostVersion:_host.version applicationVersionComparator:[self versionComparator] standardVersionComparator:[SUStandardVersionComparator defaultComparator]];
NSData *downloadedAppcastData = downloadData.data;
@@ -155,8 +113,21 @@
// If a significant period of time passes with verification still failing, we may operate in a 'safe' mode as fallback
// and allow an app to be updated through key rotation
SUHost *hostForFailedSigningValidationDate = _host;
NSString *initialFailedFeedSigningValidationDateKey = [SUHost mainBundleUserDefaultsKey:SUInitialFailedFeedSigningValidationDateKey forHost:&hostForFailedSigningValidationDate];
// If main bundle and host bundle differ, use the main bundle (updater) with a host bundle identifier to record the validation failure date
// This ensures external updaters record this date separately from an app updating itself.
SUHost *hostForFailedSigningValidationDate;
NSString *initialFailedFeedSigningValidationDateKey;
NSBundle *mainBundle = NSBundle.mainBundle;
if ([mainBundle isEqual:_host.bundle]) {
hostForFailedSigningValidationDate = _host;
initialFailedFeedSigningValidationDateKey = SUInitialFailedFeedSigningValidationDateKey;
} else {
hostForFailedSigningValidationDate = [[SUHost alloc] initWithBundle:mainBundle];
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
initialFailedFeedSigningValidationDateKey = (hostBundleIdentifier != nil) ? [SUInitialFailedFeedSigningValidationDateKey"_" stringByAppendingString:hostBundleIdentifier] : nil;
}
NSError *verifyAppcastDataInnerError = nil;
if (![signatureVerifier verifyData:verifiedAppcastData signatures:signatures fileKind:@"appcast" verifierInformation:verifierInformation error:&verifyAppcastDataInnerError]) {
@@ -177,15 +148,7 @@
[hostForFailedSigningValidationDate setObject:currentDate forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
canRecoverFromSigningValidationFailure = NO;
} else {
NSTimeInterval timeIntervalSinceFirstFailedValidationDate = [currentDate timeIntervalSinceDate:firstFailedSigningValidationDate];
if (timeIntervalSinceFirstFailedValidationDate < 0) {
// Record first signing validation date if stored date is far out in future
[hostForFailedSigningValidationDate setObject:currentDate forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
canRecoverFromSigningValidationFailure = NO;
} else {
canRecoverFromSigningValidationFailure = (timeIntervalSinceFirstFailedValidationDate >= failureExpirationInterval);
}
canRecoverFromSigningValidationFailure = ([currentDate timeIntervalSinceDate:firstFailedSigningValidationDate] >= failureExpirationInterval);
}
}
@@ -232,18 +195,7 @@
return;
}
if (appcastSigningValidationStatus == SPUAppcastSigningValidationStatusSucceeded && _host.requiresFeedBundleIdentifier) {
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
if (hostBundleIdentifier == nil || ![loadedAppcast.bundleIdentifiers containsObject:hostBundleIdentifier]) {
NSError *bundleIdentifierError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The update feed is rejected because %@ is enabled and no %@ element in the feed matches the bundle identifier %@.", SURequireFeedBundleIdentifierKey, SUAppcastElementBundleIdentifier, hostBundleIdentifier] }];
[delegate didFailToFetchAppcastWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while parsing the update feed.", SPARKLE_TABLE, SUSparkleBundle(), nil), NSUnderlyingErrorKey: bundleIdentifierError }]];
return;
}
}
// Now process the loaded appcast and find a suitable update item
[delegate didFinishLoadingAppcast:loadedAppcast];
+1 -1
View File
@@ -188,7 +188,7 @@ SU_EXPORT NS_SWIFT_SENDABLE @interface SUAppcastItem : NSObject<NSSecureCoding>
This version string should contain three period-separated components.
Example: @c 12.0.0
Example: @c 10.13.0
Use `minimumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement.
+9 -9
View File
@@ -567,10 +567,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
processedInfoURL = [NSURL URLWithString:infoLinkURLString];
}
if (processedInfoURL != nil && ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
if ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
infoURL = processedInfoURL;
} else {
SULog(SULogLevelError, @"Info URL must have a http or https URL scheme: %@", infoLinkURLString);
SULog(SULogLevelError, @"%@ -%@ Info URL must have a http or https URL scheme.", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
}
}
}
@@ -622,11 +622,11 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
fileURL = [NSURL URLWithString:fileURLString];
}
if (fileURL != nil && ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
if ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
_fileURL = fileURL;
} else {
if (error) {
*error = [NSString stringWithFormat:@"File URL must have a http or https URL scheme: %@", fileURLString];
*error = @"File URLs must have a http or https URL scheme";
}
return nil;
}
@@ -825,10 +825,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
} else {
url = [NSURL URLWithString:releaseNotesString];
}
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
_releaseNotesURL = url;
} else {
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme: %@", releaseNotesString);
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
_releaseNotesURL = nil;
}
} else if ([_itemDescription hasPrefix:@"http://"] || [_itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that.
@@ -843,7 +843,7 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
#endif
];
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:SUAppcastAttributeLength] longLongValue];
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:@"length"] longLongValue];
_releaseNotesContentLength = (releaseNotesLength > 0) ? (uint64_t)releaseNotesLength : 0;
}
@@ -857,10 +857,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
} else {
url = [NSURL URLWithString:fullReleaseNotesString];
}
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
_fullReleaseNotesURL = url;
} else {
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme: %@", fullReleaseNotesString);
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme.");
_fullReleaseNotesURL = nil;
}
} else {
-3
View File
@@ -47,9 +47,7 @@ extern NSString *const SUPublicDSAKeyKey;
extern NSString *const SUPublicDSAKeyFileKey;
extern NSString *const SUPublicEDKeyKey;
extern NSString *const SURequireSignedFeedKey;
extern NSString *const SURequireFeedBundleIdentifierKey;
extern NSString *const SUVerifyUpdateBeforeExtractionKey;
extern NSString *const SUDisableFeedCacheValidationKey;
extern NSString *const SUAutomaticallyUpdateKey;
extern NSString *const SUAllowsAutomaticUpdatesKey;
extern NSString *const SUEnableAutomaticChecksKey;
@@ -84,7 +82,6 @@ extern NSString *const SUAppcastAttributeLength;
extern NSString *const SUAppcastElementVersion;
extern NSString *const SUAppcastElementShortVersionString;
extern NSString *const SUAppcastElementBundleIdentifier;
extern NSString *const SUAppcastElementCriticalUpdate;
extern NSString *const SUAppcastElementDeltas;
extern NSString *const SUAppcastElementMinimumAutoupdateVersion;
-3
View File
@@ -34,9 +34,7 @@ NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey";
NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile";
NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
NSString *const SURequireSignedFeedKey = @"SURequireSignedFeed";
NSString *const SURequireFeedBundleIdentifierKey = @"SURequireFeedBundleIdentifier";
NSString *const SUVerifyUpdateBeforeExtractionKey = @"SUVerifyUpdateBeforeExtraction";
NSString *const SUDisableFeedCacheValidationKey = @"SUDisableFeedCacheValidation";
NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
NSString *const SUEnableSystemProfilingKey = @"SUEnableSystemProfiling";
@@ -73,7 +71,6 @@ NSString *const SUAppcastAttributeLength = @"sparkle:length";
NSString *const SUAppcastElementVersion = SUAppcastAttributeVersion;
NSString *const SUAppcastElementShortVersionString = SUAppcastAttributeShortVersionString;
NSString *const SUAppcastElementBundleIdentifier = @"sparkle:bundleIdentifier";
NSString *const SUAppcastElementCriticalUpdate = @"sparkle:criticalUpdate";
NSString *const SUAppcastElementDeltas = @"sparkle:deltas";
NSString *const SUAppcastElementMinimumAutoupdateVersion = @"sparkle:minimumAutoupdateVersion";
-1
View File
@@ -45,7 +45,6 @@ typedef NS_ENUM(OSStatus, SUError) {
SURunningTranslocated = 1005,
SUWebKitTerminationError = 1006,
SUReleaseNotesError = 1007,
SUUpdateCheckDeclinedError = 1008,
// Download phase errors.
SUTemporaryDirectoryError = 2000,
+1 -1
View File
@@ -68,7 +68,7 @@ SUFileManagerDefinitionAttribute
* sourceURL and destinationURL must reside on the same volume otherwise this operation will fail.
* If any symbolic links are encountered in these paths during path resolution, this operation will fail.
*/
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error;
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error API_AVAILABLE(macosx(11.0));
/**
* Returns a URL by resolving links in path.
-6
View File
@@ -22,17 +22,12 @@ SUHostDefinitionAttribute
@property (nonatomic, readonly) NSBundle *bundle;
// Returns the user defaults key and host used for storing a user default that is keyed based on the
// main bundle updating the host (which may differ if an external updater is updating another bundle)
+ (NSString *)mainBundleUserDefaultsKey:(NSString *)key forHost:(SUHost * _Nonnull __autoreleasing * _Nonnull)outHost;
- (instancetype)initWithBundle:(NSBundle *)aBundle;
- (instancetype)init NS_UNAVAILABLE;
@property (readonly, nonatomic, copy) NSString *bundlePath;
@property (readonly, nonatomic, copy) NSString *name;
@property (readonly, nonatomic, copy) NSOrderedSet<NSString *> *infoDictionaryNames;
@property (readonly, nonatomic, copy) NSString *version;
@property (readonly, nonatomic) BOOL validVersion;
@property (readonly, nonatomic, copy) NSString *displayVersion;
@@ -44,7 +39,6 @@ SUHostDefinitionAttribute
@property (nonatomic, readonly) BOOL hasUpdateSecurityPolicy;
@property (nonatomic, readonly) BOOL requiresSignedAppcast;
@property (nonatomic, readonly) BOOL requiresFeedBundleIdentifier;
- (nullable id)objectForInfoDictionaryKey:(NSString *)key ofClass:(Class)aClass;
- (nullable NSNumber *)boolNumberForInfoDictionaryKey:(NSString *)key;
+11 -53
View File
@@ -38,28 +38,6 @@ static void *SUHostObservableContext = &SUHostObservableContext;
@synthesize bundle = _bundle;
+ (NSString *)mainBundleUserDefaultsKey:(NSString *)key forHost:(SUHost * _Nonnull __autoreleasing * _Nonnull)outHost
{
SUHost *host = *outHost;
SUHost *storageHost;
NSString *userDefaultsKey;
if (host->_isMainBundle) {
storageHost = host;
userDefaultsKey = key;
} else {
NSBundle *mainBundle = NSBundle.mainBundle;
storageHost = [[SUHost alloc] initWithBundle:mainBundle];
NSString *hostBundleIdentifier = host.bundle.bundleIdentifier;
userDefaultsKey = (hostBundleIdentifier != nil) ? [NSString stringWithFormat:@"%@_%@", key, hostBundleIdentifier] : key;
}
*outHost = storageHost;
return userDefaultsKey;
}
- (instancetype)initWithBundle:(NSBundle *)aBundle
{
if ((self = [super init]))
@@ -140,34 +118,19 @@ static void *SUHostObservableContext = &SUHostObservableContext;
return _bundle.bundlePath;
}
- (NSOrderedSet<NSString *> *)infoDictionaryNamesStoppingAtFirstMatch:(BOOL)stopAtFirstMatch SPU_OBJC_DIRECT
{
NSMutableOrderedSet<NSString *> *names = [NSMutableOrderedSet orderedSet];
// Allow host bundle to provide a custom name
for (NSString *key in @[@"SUBundleName", @"CFBundleDisplayName", (__bridge NSString *)kCFBundleNameKey]) {
NSString *name = [self objectForInfoDictionaryKey:key ofClass:NSString.class];
if (name.length > 0) {
[names addObject:name];
if (stopAtFirstMatch) {
break;
}
}
}
return [names copy];
}
- (NSOrderedSet<NSString *> *)infoDictionaryNames
{
return [self infoDictionaryNamesStoppingAtFirstMatch:NO];
}
- (NSString * _Nonnull)name
{
NSString *name = [self infoDictionaryNamesStoppingAtFirstMatch:YES].firstObject;
if (name != nil) {
return name;
}
NSString *name;
// Allow host bundle to provide a custom name
name = [self objectForInfoDictionaryKey:@"SUBundleName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:@"CFBundleDisplayName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey ofClass:NSString.class];
if (name && name.length > 0) return name;
return [[[NSFileManager defaultManager] displayNameAtPath:[self bundlePath]] stringByDeletingPathExtension];
}
@@ -268,11 +231,6 @@ static void *SUHostObservableContext = &SUHostObservableContext;
return [self boolForInfoDictionaryKey:SURequireSignedFeedKey];
}
- (BOOL)requiresFeedBundleIdentifier
{
return [self boolForInfoDictionaryKey:SURequireFeedBundleIdentifierKey];
}
- (SUPublicKeys *)publicKeys
{
return [[SUPublicKeys alloc] initWithEd:[self publicEDKey]
+6 -4
View File
@@ -22,10 +22,12 @@ static void SULogErrors(NSArray<NSError *> *errors, int recursionLimit)
NSDictionary<NSErrorUserInfoKey, id> *userInfo = error.userInfo;
NSArray<NSError *> *underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey];
if (underlyingErrors != nil) {
SULogErrors(underlyingErrors, recursionLimit - 1);
continue;
if (@available(macOS 11.3, *)) {
NSArray<NSError *> *underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey];
if (underlyingErrors != nil) {
SULogErrors(underlyingErrors, recursionLimit - 1);
continue;
}
}
NSError *underlyingError = userInfo[NSUnderlyingErrorKey];
+124
View File
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24764" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24764"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SUStatusController">
<connections>
<outlet property="_actionButton" destination="12" id="0jE-Zn-L18"/>
<outlet property="_progressBar" destination="11" id="Cwm-99-fCT"/>
<outlet property="_statusTextField" destination="16" id="oOr-uc-6cX"/>
<outlet property="window" destination="5" id="25"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window identifier="SUStatus" title="Set in Code" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
<windowStyleMask key="styleMask" titled="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="200" y="222" width="400" height="107"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="923"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" misplaced="YES" id="6">
<rect key="frame" x="0.0" y="0.0" width="400" height="107"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="20" y="42" width="64" height="64"/>
<constraints>
<constraint firstAttribute="height" constant="64" id="BT1-iv-l2H"/>
<constraint firstAttribute="width" constant="64" id="eYK-yn-PVe"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="NSApplicationIcon" id="53"/>
<connections>
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
</connections>
</imageView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="E7u-iB-1VW" userLabel="Status text and progress">
<rect key="frame" x="92" y="52" width="288" height="44"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="-2" y="28" 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 wantsLayer="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
<rect key="frame" x="0.0" y="0.0" 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="280" y="20" width="100" height="24"/>
<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"/>
</buttonCell>
<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="90" y="24" 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"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="statusText" id="17"/>
<binding destination="-2" name="hidden" keyPath="statusText" id="33">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNil</string>
</dictionary>
</binding>
</connections>
</textField>
</subviews>
<constraints>
<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 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" 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"/>
</window>
</objects>
<resources>
<image name="NSApplicationIcon" width="32" height="32"/>
</resources>
</document>
+47 -140
View File
@@ -26,15 +26,19 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
@implementation SUStatusController
{
NSString *_windowTitle;
NSValue *_centerPointValue;
NSString *_title;
NSString *_buttonTitle;
SUHost *_host;
NSButton *_touchBarButton;
NSTextField *_titleField;
NSButton *_actionButton;
NSProgressIndicator *_progressBar;
IBOutlet NSButton *_actionButton;
IBOutlet NSTextField *_statusTextField;
IBOutlet NSProgressIndicator *_progressBar;
BOOL _minimizable;
BOOL _closable;
}
@synthesize title = _title;
@@ -45,145 +49,15 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
- (instancetype)initWithHost:(SUHost *)aHost windowTitle:(NSString *)windowTitle centerPointValue:(NSValue *)centerPointValue minimizable:(BOOL)minimizable closable:(BOOL)closable
{
NSWindow *window;
NSImageView *imageView;
NSTextField *titleField;
NSProgressIndicator *progressBar;
NSButton *actionButton;
NSTextField *statusTextField;
{
NSWindowStyleMask styleMask = NSWindowStyleMaskTitled;
if (minimizable) {
styleMask |= NSWindowStyleMaskMiniaturizable;
}
if (closable) {
styleMask |= NSWindowStyleMaskClosable;
}
window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 107) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
window.identifier = @"SUStatus";
window.title = windowTitle;
window.releasedWhenClosed = NO;
window.allowsToolTipsWhenApplicationIsInactive = NO;
window.autorecalculatesKeyViewLoop = NO;
// Don't let this window make other active windows exit in Stage Manager
window.collectionBehavior = NSWindowCollectionBehaviorFullScreenAuxiliary;
window.contentMinSize = NSMakeSize(213, 107);
NSView *contentView = window.contentView;
imageView = [[NSImageView alloc] initWithFrame:NSZeroRect];
imageView.translatesAutoresizingMaskIntoConstraints = NO;
imageView.refusesFirstResponder = YES;
imageView.imageAlignment = NSImageAlignLeft;
imageView.imageScaling = NSImageScaleAxesIndependently;
imageView.image = [SUApplicationInfo bestIconForHost:aHost];
[contentView addSubview:imageView];
NSView *statusContainerView = [[NSView alloc] initWithFrame:NSZeroRect];
statusContainerView.translatesAutoresizingMaskIntoConstraints = NO;
[contentView addSubview:statusContainerView];
titleField = [NSTextField labelWithString:@""];
titleField.translatesAutoresizingMaskIntoConstraints = NO;
titleField.focusRingType = NSFocusRingTypeNone;
titleField.font = [NSFont boldSystemFontOfSize:[NSFont systemFontSize]];
titleField.textColor = [NSColor controlTextColor];
[titleField setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
// Don't let the title string line wrap
[titleField setContentCompressionResistancePriority:1000 forOrientation:NSLayoutConstraintOrientationHorizontal];
[statusContainerView addSubview:titleField];
progressBar = [[NSProgressIndicator alloc] initWithFrame:NSZeroRect];
progressBar.translatesAutoresizingMaskIntoConstraints = NO;
progressBar.wantsLayer = YES;
progressBar.style = NSProgressIndicatorStyleBar;
progressBar.indeterminate = YES;
progressBar.maxValue = 100;
[progressBar setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
[progressBar setUsesThreadedAnimation:YES];
[statusContainerView addSubview:progressBar];
actionButton = [NSButton buttonWithTitle:@"" target:nil action:NULL];
actionButton.translatesAutoresizingMaskIntoConstraints = NO;
if (@available(macOS 26, *)) {
actionButton.controlSize = NSControlSizeLarge;
}
[actionButton setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
actionButton.accessibilityIdentifier = @"SUStatusButton";
[contentView addSubview:actionButton];
statusTextField = [NSTextField labelWithString:@""];
[statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
statusTextField.translatesAutoresizingMaskIntoConstraints = NO;
statusTextField.focusRingType = NSFocusRingTypeNone;
statusTextField.textColor = [NSColor controlTextColor];
[statusTextField setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
// Make horizontal compression resistance required for the status text field
[statusTextField setContentCompressionResistancePriority:1000 forOrientation:NSLayoutConstraintOrientationHorizontal];
[contentView addSubview:statusTextField];
[NSLayoutConstraint activateConstraints:@[
// Status container's internal layout
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:titleField attribute:NSLayoutAttributeTrailing multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:progressBar attribute:NSLayoutAttributeBottom multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:titleField attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeTop multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:progressBar attribute:NSLayoutAttributeTrailing multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:titleField attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeLeading multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:progressBar attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeLeading multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:progressBar attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:titleField attribute:NSLayoutAttributeBottom multiplier:1 constant:8],
// imageView
[imageView.widthAnchor constraintEqualToConstant:64],
[imageView.heightAnchor constraintEqualToConstant:64],
[NSLayoutConstraint constraintWithItem:imageView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeTop multiplier:1 constant:4],
[NSLayoutConstraint constraintWithItem:imageView attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeLeading multiplier:1 constant:20],
// statusContainerView position
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeCenterY multiplier:1 constant:0],
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeTrailing multiplier:1 constant:8],
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeTrailing multiplier:1 constant:20],
// statusTextField position
[NSLayoutConstraint constraintWithItem:statusTextField attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeTrailing multiplier:1 constant:8],
[NSLayoutConstraint constraintWithItem:statusTextField attribute:NSLayoutAttributeFirstBaseline relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeFirstBaseline multiplier:1 constant:0],
// actionButton position
[NSLayoutConstraint constraintWithItem:actionButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeBottom multiplier:1 constant:8],
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeBottom multiplier:1 constant:20],
[NSLayoutConstraint constraintWithItem:actionButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:statusTextField attribute:NSLayoutAttributeTrailing multiplier:1 constant:25],
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:20],
[actionButton.widthAnchor constraintGreaterThanOrEqualToConstant:100],
]];
}
self = [super initWithWindow:window];
if (self != nil)
self = [super initWithWindowNibName:@"SUStatus" owner:self];
if (self)
{
_host = aHost;
_titleField = titleField;
_actionButton = actionButton;
_progressBar = progressBar;
_centerPointValue = centerPointValue;
_minimizable = minimizable;
_closable = closable;
_windowTitle = [windowTitle copy];
[self setShouldCascadeWindows:NO];
// Finish setting up bindings
{
NSRect windowFrame = window.frame;
if (centerPointValue != nil) {
NSPoint centerPoint = centerPointValue.pointValue;
[window setFrameOrigin:NSMakePoint(centerPoint.x - windowFrame.size.width / 2.0, centerPoint.y - windowFrame.size.height / 2.0)];
} else {
[window center];
}
[titleField bind:NSValueBinding toObject:self withKeyPath:@"title" options:nil];
[progressBar bind:NSMaxValueBinding toObject:self withKeyPath:@"maxProgressValue" options:nil];
[progressBar bind:NSValueBinding toObject:self withKeyPath:@"progressValue" options:nil];
[actionButton bind:NSTitleBinding toObject:self withKeyPath:@"buttonTitle" options:nil];
[statusTextField bind:NSValueBinding toObject:self withKeyPath:@"statusText" options:nil];
[statusTextField bind:NSHiddenBinding toObject:self withKeyPath:@"statusText" options:@{NSValueTransformerNameBindingOption: NSIsNilTransformerName}];
}
}
return self;
}
@@ -193,6 +67,39 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
return [NSString stringWithFormat:@"%@ <%@>", [self class], _host.bundlePath];
}
- (void)windowDidLoad
{
NSWindow *window = self.window;
NSRect windowFrame = window.frame;
if (_centerPointValue != nil) {
NSPoint centerPoint = _centerPointValue.pointValue;
[window setFrameOrigin:NSMakePoint(centerPoint.x - windowFrame.size.width / 2.0, centerPoint.y - windowFrame.size.height / 2.0)];
} else {
[window center];
}
if (_minimizable) {
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskMiniaturizable);
}
if (_closable) {
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskClosable);
}
[_progressBar setUsesThreadedAnimation:YES];
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
if (@available(macOS 16, *)) {
_actionButton.controlSize = NSControlSizeLarge;
}
window.title = _windowTitle;
}
- (NSImage *)applicationIcon
{
return [SUApplicationInfo bestIconForHost:_host];
}
- (void)beginActionWithTitle:(NSString *)aTitle maxProgressValue:(double)aMaxProgressValue statusText:(NSString *)aStatusText
{
self.title = aTitle;
+34 -27
View File
@@ -55,7 +55,7 @@
// So even though macOS 12 supports TextKit 2 we do not use it there.
// My development machines are currently on macOS 26 so I know TextKit 2 works well there.
// macOS 13 - 15 requires more testing if we care to make the switch there.
if (@available(macOS 26, *)) {
if (@available(macOS 16, *)) {
// Create NSTextView using TextKit 2
// https://developer.apple.com/documentation/appkit/nstextview/1449347-initwithframe
@@ -213,7 +213,7 @@ static void processMarkdownFragmentAttributedString(NSAttributedString *fragment
}
case NSPresentationIntentKindBlockQuote: {
// Advance text that wraps to next line by this divider width
// Multiple levels of block quotes will be advanced multiple times
// Multiple levels of block quotes will be advanced mulitiple times
// Special rendering via text attachments or decorations is not done because
// it's complex and may have tradeoffs
@@ -363,38 +363,45 @@ static NSAttributedString *formatMarkdownAttributedString(NSAttributedString *or
[_textView setContinuousSpellCheckingEnabled:NO];
_textView.usesFontPanel = NO;
_textView.editable = NO;
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
if (@available(macOS 10.14, *)) {
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
}
[_scrollView setHasVerticalScroller:YES];
[_scrollView setHasHorizontalScroller:NO];
if (_prefersMarkdown) {
dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_USER_INITIATED, 0);
dispatch_queue_t markdownDispatchQueue = dispatch_queue_create("org.sparkle-project.markdown-loader", queuePriority);
dispatch_async(markdownDispatchQueue, ^{
NSError *loadMarkdownError = nil;
NSAttributedString *originalMarkdownAttributedString = [[NSAttributedString alloc] initWithMarkdownString:contents options:nil baseURL:baseURL error:&loadMarkdownError];
if (@available(macOS 12, *)) {
dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_USER_INITIATED, 0);
if (originalMarkdownAttributedString == nil) {
// Fallback to plain-text
dispatch_queue_t markdownDispatchQueue = dispatch_queue_create("org.sparkle-project.markdown-loader", queuePriority);
dispatch_async(markdownDispatchQueue, ^{
NSError *loadMarkdownError = nil;
NSAttributedString *originalMarkdownAttributedString = [[NSAttributedString alloc] initWithMarkdownString:contents options:nil baseURL:baseURL error:&loadMarkdownError];
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)self->_fontPointSize] }];
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:attributedString completionHandler:completionHandler];
});
} else {
NSAttributedString *formattedAttributedString = formatMarkdownAttributedString(originalMarkdownAttributedString, (CGFloat)self->_fontPointSize);
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:formattedAttributedString completionHandler:completionHandler];
});
}
});
return;
if (originalMarkdownAttributedString == nil) {
// Fallback to plain-text
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)self->_fontPointSize] }];
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:attributedString completionHandler:completionHandler];
});
} else {
NSAttributedString *formattedAttributedString = formatMarkdownAttributedString(originalMarkdownAttributedString, (CGFloat)self->_fontPointSize);
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:formattedAttributedString completionHandler:completionHandler];
});
}
});
return;
} else {
SULog(SULogLevelDefault, @"Warning: falling back to plain text because markdown support requires macOS 12 or newer");
}
}
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)_fontPointSize] }];
+20 -16
View File
@@ -299,10 +299,14 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
usedReleaseNotesFormat = preferredReleaseNotesFormat;
break;
case SUReleaseNotesFormatHTML:
if ([[NSProcessInfo processInfo] isMacCatalystApp]) {
usedReleaseNotesFormat = SUReleaseNotesFormatPlainText;
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) or markdown (.md) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" or %@=\"markdown\" attribute in that element.", SUAppcastAttributeFormat, SUAppcastAttributeFormat);
if (@available(macOS 10.15, *)) {
if ([[NSProcessInfo processInfo] isMacCatalystApp]) {
usedReleaseNotesFormat = SUReleaseNotesFormatPlainText;
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) or markdown (.md) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" or %@=\"markdown\" attribute in that element.", SUAppcastAttributeFormat, SUAppcastAttributeFormat);
} else {
usedReleaseNotesFormat = preferredReleaseNotesFormat;
}
} else {
usedReleaseNotesFormat = preferredReleaseNotesFormat;
}
@@ -373,10 +377,12 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
_releaseNotesView.view.autoresizingMask = (NSAutoresizingMaskOptions)(NSViewWidthSizable | NSViewHeightSizable);
// We need a transparent background
// 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];
if (@available(macOS 10.14, *)) {
// We need a transparent background
// 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];
}
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
@@ -407,7 +413,11 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
_releaseNotesBoxView.boxType = NSBoxCustom;
_releaseNotesBoxView.cornerRadius = boxCornerRadius;
_releaseNotesBoxView.borderColor = NSColor.separatorColor;
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;
@@ -426,13 +436,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
_installButton.title = SULocalizedStringFromTableInBundle(@"Install Update", SPARKLE_TABLE, sparkleBundle, @"");
_automaticallyInstallUpdatesButton.title = SULocalizedStringFromTableInBundle(@"Automatically download and install updates in the future", SPARKLE_TABLE, sparkleBundle, @"");
// Fix to make sure buttons are on right side in RTL languages like Hebrew and Arabic
// We do same modification in SUUpdatePermissionPrompt
_automaticallyInstallUpdatesButton.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
_automaticallyInstallUpdatesButton.imagePosition = NSImageLeading;
_automaticallyInstallUpdatesButton.alignment = NSTextAlignmentNatural;
if (@available(macOS 26, *)) {
if (@available(macOS 16, *)) {
_skipButton.controlSize = NSControlSizeLarge;
_laterButton.controlSize = NSControlSizeLarge;
_installButton.controlSize = NSControlSizeLarge;
+10 -50
View File
@@ -20,8 +20,6 @@
static NSString *const SUUpdatePermissionPromptTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdatePermissionPrompt";
static const CGFloat SUUpdatePermissionPromptGroupElementSpacing = 12.0;
@interface SUUpdatePermissionPrompt () <NSTouchBarDelegate>
// These properties are used for bindings
@@ -37,12 +35,9 @@ static const CGFloat SUUpdatePermissionPromptGroupElementSpacing = 12.0;
IBOutlet NSStackView *_stackView;
IBOutlet NSView *_promptView;
IBOutlet NSImageView *_applicationIconImageView;
IBOutlet NSLayoutConstraint *_applicationIconLeadingLayoutConstraint;
IBOutlet NSView *_moreInfoView;
IBOutlet NSView *_placeholderView;
IBOutlet NSView *_responseView;
IBOutlet NSStackView *_responseButtonsStackView;
IBOutlet NSView *_infoChoiceView;
IBOutlet NSView *_automaticallyDownloadUpdatesView;
IBOutlet NSButton *_cancelButton;
@@ -93,63 +88,28 @@ static const CGFloat SUUpdatePermissionPromptGroupElementSpacing = 12.0;
- (void)windowDidLoad
{
NSWindow *window = self.window;
window.movableByWindowBackground = YES;
[self.window center];
_infoChoiceView.hidden = ![self shouldAskAboutProfile];
_automaticallyDownloadUpdatesView.hidden = ![self allowsAutomaticUpdates];
// The disclosed profile info is kept outside of the stack view in the nib, otherwise it would
// cover the rest of the dialog in Interface Builder. Insert it above the response buttons.
NSUInteger disclosureIndex = [_stackView.arrangedSubviews indexOfObject:_responseView];
if (disclosureIndex != NSNotFound) {
[_stackView insertArrangedSubview:_placeholderView atIndex:(NSInteger)disclosureIndex];
[_stackView insertArrangedSubview:_moreInfoView atIndex:(NSInteger)disclosureIndex + 1];
}
for (NSView *disclosedView in @[_placeholderView, _moreInfoView]) {
[disclosedView.widthAnchor constraintEqualToAnchor:_stackView.widthAnchor].active = YES;
}
// Give the question and the choices below it better grouping
[_stackView setCustomSpacing:SUUpdatePermissionPromptGroupElementSpacing afterView:_promptView];
[_stackView addArrangedSubview:_promptView];
[_stackView addArrangedSubview:_automaticallyDownloadUpdatesView];
[_stackView addArrangedSubview:_infoChoiceView];
[_stackView addArrangedSubview:_placeholderView];
[_stackView addArrangedSubview:_moreInfoView];
[_stackView addArrangedSubview:_responseView];
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
// Keep hidden window title for accessibility
window.title = SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil);
window.titleVisibility = NSWindowTitleHidden;
// Fix to make sure buttons are on right side, aligned correctly, and pointing correct direction
// in RTL languages like Hebrew and Arabic
for (NSButton *checkbox in @[_automaticallyDownloadAndInstallUpdatesButton, _includeAnonymousSystemProfileButton]) {
checkbox.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
checkbox.imagePosition = NSImageLeading;
checkbox.alignment = NSTextAlignmentNatural;
}
_anonymousInfoDisclosureButton.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
_cancelButton.controlSize = NSControlSizeLarge;
_checkButton.controlSize = NSControlSizeLarge;
if (@available(macOS 26, *)) {
} else {
// Alerts center their icon before macOS 26
_applicationIconLeadingLayoutConstraint.active = NO;
[_applicationIconImageView.centerXAnchor constraintEqualToAnchor:_promptView.centerXAnchor].active = YES;
}
_checkButton.title = SULocalizedStringFromTableInBundle(@"Check Automatically", SPARKLE_TABLE, sparkleBundle, nil);
_cancelButton.title = SULocalizedStringFromTableInBundle(@"Don’t Check", SPARKLE_TABLE, sparkleBundle, nil);
_checkForUpdatesAutomaticallyTextField.stringValue = SULocalizedStringFromTableInBundle(@"Check for updates automatically?", SPARKLE_TABLE, sparkleBundle, nil);
_includeAnonymousSystemProfileButton.title = SULocalizedStringFromTableInBundle(@"Include anonymous system profile", SPARKLE_TABLE, sparkleBundle, nil);
_automaticallyDownloadAndInstallUpdatesButton.title = SULocalizedStringFromTableInBundle(@"Automatically download and install updates", SPARKLE_TABLE, sparkleBundle, nil);
_anonymousSystemProfileDisclosureInformation.stringValue = SULocalizedStringFromTableInBundle(@"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:", SPARKLE_TABLE, sparkleBundle, nil);
[window center];
}
- (BOOL)tableView:(NSTableView *) __unused tableView shouldSelectRow:(NSInteger) __unused row { return NO; }
+274 -244
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="25406" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="25406"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -10,8 +10,6 @@
<connections>
<outlet property="_anonymousInfoDisclosureButton" destination="JW6-0z-Ud3" id="grm-Uj-KJs"/>
<outlet property="_anonymousSystemProfileDisclosureInformation" destination="46" id="Ctt-KG-z3I"/>
<outlet property="_applicationIconImageView" destination="NBn-FN-XAx" id="Bqt-3M-Vzp"/>
<outlet property="_applicationIconLeadingLayoutConstraint" destination="Xku-5M-xMC" id="Ldj-8R-Wmq"/>
<outlet property="_automaticallyDownloadAndInstallUpdatesButton" destination="BId-kb-eYW" id="FLp-cT-Pth"/>
<outlet property="_automaticallyDownloadUpdatesView" destination="37T-Ef-DtX" id="Ojd-zE-6Kd"/>
<outlet property="_cancelButton" destination="cFC-wV-H3j" id="B1o-H0-cr1"/>
@@ -23,7 +21,6 @@
<outlet property="_placeholderHeightLayoutConstraint" destination="yis-HR-OIe" id="npL-hg-wRq"/>
<outlet property="_placeholderView" destination="AGr-V0-0al" id="UnQ-rl-QSS"/>
<outlet property="_promptView" destination="Yrl-Dt-Qvb" id="qbO-fw-1YD"/>
<outlet property="_responseButtonsStackView" destination="Rbs-4k-Wq2" id="XdV-Ih-bvk"/>
<outlet property="_responseView" destination="0CP-x7-YFK" id="AcW-Md-hSP"/>
<outlet property="_stackView" destination="qNw-uD-4Bg" id="EIt-kn-pJ0"/>
<outlet property="window" destination="5" id="126"/>
@@ -31,211 +28,21 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="5" userLabel="Update Permission Prompt">
<windowStyleMask key="styleMask" titled="YES" fullSizeContentView="YES"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Profile Info">
<windowStyleMask key="styleMask" titled="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="83" y="492" width="296" height="262"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="923"/>
<rect key="contentRect" x="83" y="492" width="488" height="379"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="296" height="278"/>
<rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qNw-uD-4Bg">
<rect key="frame" x="0.0" y="0.0" width="296" height="278"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Yrl-Dt-Qvb" userLabel="Prompt View">
<rect key="frame" x="0.0" y="136" width="296" height="142"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="NBn-FN-XAx" userLabel="Program icon">
<rect key="frame" x="20" y="58" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="KbC-i0-ZyN"/>
<constraint firstAttribute="width" secondItem="NBn-FN-XAx" secondAttribute="height" multiplier="1:1" id="Osy-kb-JTR"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="clc-hq-1NY"/>
<connections>
<binding destination="-2" name="value" keyPath="icon" id="JD9-MU-vwB"/>
</connections>
</imageView>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8" userLabel="Title text field">
<rect key="frame" x="18" y="26" width="260" height="16"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Check for updates automatically?" id="gmh-T4-BO0">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField focusRingType="none" verticalHuggingPriority="999" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia" userLabel="Description text field">
<rect key="frame" x="18" y="0.0" width="260" height="16"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="DO NOT LOCALIZE" id="cfa-j0-Ya4">
<font key="font" metaFont="system"/>
<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="promptDescription" id="dvR-Lp-2jl"/>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="tgW-Jp-Aia" secondAttribute="trailing" constant="20" symbolic="YES" id="Fwc-c2-DDZ"/>
<constraint firstAttribute="trailing" secondItem="IgD-Pj-pc8" secondAttribute="trailing" constant="20" symbolic="YES" id="HXU-lh-GWa"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="top" secondItem="NBn-FN-XAx" secondAttribute="bottom" constant="16" id="Jbz-hb-8QF"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="20" symbolic="YES" id="Wl8-N0-skJ"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="20" symbolic="YES" id="Xku-5M-xMC"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="fad-TA-xIj"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="top" secondItem="IgD-Pj-pc8" secondAttribute="bottom" constant="10" id="nN4-jN-Fdn"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="leading" secondItem="IgD-Pj-pc8" secondAttribute="leading" id="s7w-Aw-JQY"/>
<constraint firstAttribute="bottom" secondItem="tgW-Jp-Aia" secondAttribute="bottom" id="uS1-FX-kSX"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="37T-Ef-DtX" userLabel="Automatic Download View">
<rect key="frame" x="0.0" y="114" width="296" height="14"/>
<subviews>
<button focusRingType="none" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kb-eYW" userLabel="Automatically Download Updates Button">
<rect key="frame" x="20" y="0.0" width="245" height="14"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" focusRingType="none" inset="2" id="AUc-33-qGN">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="automaticallyDownloadUpdates" id="5Me-7t-mMu"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="BId-kb-eYW" firstAttribute="leading" secondItem="37T-Ef-DtX" secondAttribute="leading" constant="20" symbolic="YES" id="MnW-AM-QzP"/>
<constraint firstAttribute="bottom" secondItem="BId-kb-eYW" secondAttribute="bottom" id="QXK-90-kUJ"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="BId-kb-eYW" secondAttribute="trailing" constant="20" symbolic="YES" id="Vk3-CH-cXd"/>
<constraint firstItem="BId-kb-eYW" firstAttribute="top" secondItem="37T-Ef-DtX" secondAttribute="top" id="YrX-aL-LAq"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ov1-yV-Uol" userLabel="Anonymous Info View">
<rect key="frame" x="0.0" y="92" width="296" height="14"/>
<subviews>
<button focusRingType="none" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="Include Anonymous System Profile Button">
<rect key="frame" x="20" y="0.0" width="197" height="14"/>
<buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
<dictionary key="options">
<integer key="NSNullPlaceholder" value="1"/>
<bool key="NSValidatesImmediately" value="YES"/>
</dictionary>
</binding>
</connections>
</button>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3" userLabel="Anonymous Info Disclosure Button">
<rect key="frame" x="221" y="-1" width="16" height="16"/>
<buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
<behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
</constraints>
<connections>
<action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
<binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="leading" secondItem="a90-Iq-FgS" secondAttribute="trailing" constant="4" id="6Y1-s7-g6r"/>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="centerY" secondItem="a90-Iq-FgS" secondAttribute="centerY" id="BNJ-xV-faQ"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="ov1-yV-Uol" secondAttribute="leading" constant="20" symbolic="YES" id="ILg-Qu-R6M"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="top" secondItem="ov1-yV-Uol" secondAttribute="top" id="Mh6-5L-xqM"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JW6-0z-Ud3" secondAttribute="trailing" constant="20" symbolic="YES" id="U4G-Eh-HPu"/>
<constraint firstAttribute="bottom" secondItem="a90-Iq-FgS" secondAttribute="bottom" id="qij-uH-6Yl"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="0CP-x7-YFK" userLabel="Response View">
<rect key="frame" x="0.0" y="0.0" width="296" height="84"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rbs-4k-Wq2" userLabel="Response Buttons View">
<rect key="frame" x="16" y="16" width="264" height="56"/>
<subviews>
<button tag="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
<rect key="frame" x="0.0" y="32" width="264" height="24"/>
<buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
<connections>
<action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
</connections>
</button>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
<rect key="frame" x="0.0" y="0.0" width="264" height="24"/>
<buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
<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="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="sMh-ha-r7R" firstAttribute="width" secondItem="Rbs-4k-Wq2" secondAttribute="width" id="Wjn-5Q-8Rt"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="width" secondItem="Rbs-4k-Wq2" secondAttribute="width" id="Xdp-6L-3Kv"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="Rbs-4k-Wq2" secondAttribute="bottom" constant="16" id="B76-mf-2m9"/>
<constraint firstItem="Rbs-4k-Wq2" firstAttribute="top" secondItem="0CP-x7-YFK" secondAttribute="top" constant="12" id="Fyr-gv-3TM"/>
<constraint firstAttribute="trailing" secondItem="Rbs-4k-Wq2" secondAttribute="trailing" constant="16" id="PWc-tb-dWV"/>
<constraint firstItem="Rbs-4k-Wq2" firstAttribute="leading" secondItem="0CP-x7-YFK" secondAttribute="leading" constant="16" id="l3J-Va-WaM"/>
</constraints>
</customView>
</subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qNw-uD-4Bg">
<rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="0CP-x7-YFK" secondAttribute="trailing" id="Bnq-4X-Lsd"/>
<constraint firstAttribute="trailing" secondItem="37T-Ef-DtX" secondAttribute="trailing" id="Hcd-Yv-5Rt"/>
<constraint firstItem="37T-Ef-DtX" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Nnu-9x-Sc3"/>
<constraint firstAttribute="trailing" secondItem="Yrl-Dt-Qvb" secondAttribute="trailing" id="Ptu-1S-Kdj"/>
<constraint firstItem="ov1-yV-Uol" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Rjc-8T-Uwq"/>
<constraint firstItem="Yrl-Dt-Qvb" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Vzq-cB-2Rn"/>
<constraint firstAttribute="trailing" secondItem="ov1-yV-Uol" secondAttribute="trailing" id="Wsk-3D-Gzv"/>
<constraint firstItem="0CP-x7-YFK" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Ykt-3J-Fpm"/>
<constraint firstAttribute="width" constant="296" id="gcK-Q4-n9c"/>
<constraint firstAttribute="width" constant="437" id="gcK-Q4-n9c"/>
</constraints>
<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>
@@ -247,19 +54,89 @@ Gw
</view>
<point key="canvasLocation" x="264" y="181"/>
</window>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGr-V0-0al" userLabel="Placeholder View">
<rect key="frame" x="0.0" y="0.0" width="360" height="193"/>
<constraints>
<constraint firstAttribute="height" constant="193" id="yis-HR-OIe"/>
</constraints>
<point key="canvasLocation" x="-643" y="495"/>
</customView>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="39" userLabel="More Info View">
<rect key="frame" x="0.0" y="0.0" width="360" height="193"/>
<arrayController editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" id="24" userLabel="Array Controller">
<declaredKeys>
<string>visibleKey</string>
<string>visibleValue</string>
<string>displayValue</string>
<string>displayKey</string>
</declaredKeys>
<connections>
<binding destination="-2" name="contentArray" keyPath="systemProfileInformationArray" id="25"/>
</connections>
</arrayController>
<userDefaultsController id="49" userLabel="User Defaults Controller">
<declaredKeys>
<string>SUIncludeProfile</string>
<string>SUSendProfileInfo</string>
</declaredKeys>
</userDefaultsController>
<view id="Yrl-Dt-Qvb" userLabel="Prompt View">
<rect key="frame" x="0.0" y="0.0" width="437" height="78"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="System Profile Info">
<rect key="frame" x="18" y="123" width="324" height="70"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="183">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8">
<rect key="frame" x="104" y="42" width="315" height="16"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="J49-m7-iIa"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Check for updates automatically?" id="gmh-T4-BO0">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia">
<rect key="frame" x="104" y="0.0" width="315" height="34"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="HfG-Lg-91D"/>
<constraint firstAttribute="width" constant="311" id="lNZ-C1-ceR"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="DO NOT LOCALIZE" id="cfa-j0-Ya4">
<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="promptDescription" id="dvR-Lp-2jl"/>
</connections>
</textField>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="NBn-FN-XAx">
<rect key="frame" x="23" y="-4" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="KbC-i0-ZyN"/>
<constraint firstAttribute="height" constant="64" id="Osy-kb-JTR"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="NSApplicationIcon" id="clc-hq-1NY"/>
<connections>
<binding destination="-2" name="value" keyPath="icon" id="JD9-MU-vwB"/>
</connections>
</imageView>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="tgW-Jp-Aia" secondAttribute="trailing" constant="20" symbolic="YES" id="Fwc-c2-DDZ"/>
<constraint firstAttribute="trailing" secondItem="IgD-Pj-pc8" secondAttribute="trailing" constant="20" symbolic="YES" id="HXU-lh-GWa"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="Wl8-N0-skJ"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="23" id="Xku-5M-xMC"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="fPB-MW-Oc2"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="18" id="fad-TA-xIj"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="top" secondItem="IgD-Pj-pc8" secondAttribute="bottom" constant="8" id="nN4-jN-Fdn"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="s7w-Aw-JQY"/>
<constraint firstAttribute="bottom" secondItem="tgW-Jp-Aia" secondAttribute="bottom" id="uS1-FX-kSX"/>
</constraints>
<point key="canvasLocation" x="-241" y="-37"/>
</view>
<customView hidden="YES" id="39" userLabel="MoreInfoView">
<rect key="frame" x="0.0" y="0.0" width="434" height="205"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="SystemProfileInfo">
<rect key="frame" x="104" y="123" width="312" height="70"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="70" id="Csk-S6-dh4"/>
<constraint firstAttribute="width" constant="308" id="iAG-SY-yVp"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="183">
<font key="font" metaFont="smallSystem"/>
<string key="title">Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.
@@ -268,20 +145,20 @@ This is the information that would be sent:</string>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
<rect key="frame" x="20" y="0.0" width="320" height="115"/>
<scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
<rect key="frame" x="103" y="0.0" width="314" height="115"/>
<clipView key="contentView" id="sbp-rk-wxX">
<rect key="frame" x="1" y="1" width="318" height="113"/>
<rect key="frame" x="1" y="1" width="312" height="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="16" id="41">
<rect key="frame" x="0.0" y="0.0" width="318" height="113"/>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" id="41">
<rect key="frame" x="0.0" y="0.0" width="312" height="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn editable="NO" width="125" minWidth="40" maxWidth="1000" id="42">
<tableColumn editable="NO" width="128" minWidth="40" maxWidth="1000" id="42">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -296,7 +173,7 @@ This is the information that would be sent:</string>
<binding destination="24" name="value" keyPath="arrangedObjects.displayKey" id="174"/>
</connections>
</tableColumn>
<tableColumn editable="NO" width="126" minWidth="40" maxWidth="1000" id="44">
<tableColumn editable="NO" width="137" minWidth="40" maxWidth="1000" id="44">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -332,33 +209,186 @@ This is the information that would be sent:</string>
</scrollView>
</subviews>
<constraints>
<constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" id="0rj-EA-SIj"/>
<constraint firstAttribute="trailing" secondItem="40" secondAttribute="trailing" constant="20" symbolic="YES" id="5Ze-wu-AsK"/>
<constraint firstItem="40" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="20" symbolic="YES" id="Qg9-kp-Lzl"/>
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="20" symbolic="YES" id="TMg-61-Tbj"/>
<constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" symbolic="YES" id="fYg-If-EVL"/>
<constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" constant="12" id="0rj-EA-SIj"/>
<constraint firstItem="40" firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="3" id="5Ze-wu-AsK"/>
<constraint firstItem="40" firstAttribute="leading" secondItem="46" secondAttribute="leading" constant="-3" id="Qg9-kp-Lzl"/>
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="106" id="TMg-61-Tbj"/>
<constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" id="fYg-If-EVL"/>
<constraint firstAttribute="bottom" secondItem="40" secondAttribute="bottom" id="o4Y-3j-NmQ"/>
<constraint firstItem="40" firstAttribute="top" secondItem="46" secondAttribute="bottom" constant="8" symbolic="YES" id="seb-Gl-jtw"/>
</constraints>
<point key="canvasLocation" x="-621" y="194"/>
</customView>
<arrayController editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" id="24" userLabel="Array Controller">
<declaredKeys>
<string>visibleKey</string>
<string>visibleValue</string>
<string>displayValue</string>
<string>displayKey</string>
</declaredKeys>
<connections>
<binding destination="-2" name="contentArray" keyPath="systemProfileInformationArray" id="25"/>
</connections>
</arrayController>
<userDefaultsController id="49" userLabel="User Defaults Controller">
<declaredKeys>
<string>SUIncludeProfile</string>
<string>SUSendProfileInfo</string>
</declaredKeys>
</userDefaultsController>
<customView id="0CP-x7-YFK" userLabel="Response View">
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ilj-QP-33p" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
<subviews>
<button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
<rect key="frame" x="260" y="13" width="164" height="32"/>
<buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="gon-Nu-M8r"/>
</constraints>
<connections>
<action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
<rect key="frame" x="145" y="13" width="115" height="32"/>
<buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="Fta-eR-U3P"/>
</constraints>
<connections>
<action selector="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="cFC-wV-H3j" secondAttribute="bottom" constant="20" id="B76-mf-2m9"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="top" secondItem="ilj-QP-33p" secondAttribute="top" constant="15" id="Fyr-gv-3TM"/>
<constraint firstItem="sMh-ha-r7R" firstAttribute="leading" secondItem="cFC-wV-H3j" secondAttribute="trailing" constant="14" id="Gse-h5-ctH"/>
<constraint firstAttribute="width" constant="437" id="KXc-Kv-G8j"/>
<constraint firstAttribute="trailing" secondItem="sMh-ha-r7R" secondAttribute="trailing" constant="20" symbolic="YES" id="PWc-tb-dWV"/>
<constraint firstItem="sMh-ha-r7R" firstAttribute="centerY" secondItem="cFC-wV-H3j" secondAttribute="centerY" id="dmL-eu-rzf"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ilj-QP-33p" secondAttribute="leading" constant="20" symbolic="YES" id="l3J-Va-WaM"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="ilj-QP-33p" firstAttribute="top" secondItem="0CP-x7-YFK" secondAttribute="top" id="5In-8H-mUY"/>
<constraint firstAttribute="bottom" secondItem="ilj-QP-33p" secondAttribute="bottom" id="XNF-yO-yBl"/>
<constraint firstItem="ilj-QP-33p" firstAttribute="leading" secondItem="0CP-x7-YFK" secondAttribute="leading" id="d3g-7o-f52"/>
<constraint firstAttribute="trailing" secondItem="ilj-QP-33p" secondAttribute="trailing" id="jzr-jk-sQQ"/>
</constraints>
<point key="canvasLocation" x="-291" y="554"/>
</customView>
<customView id="ov1-yV-Uol" userLabel="Anonymous Info View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="a0k-dW-Jhx" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<subviews>
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="IncludeInfoButton">
<rect key="frame" x="104" y="-1" width="200" height="16"/>
<buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="14" id="STF-87-eYy"/>
</constraints>
<connections>
<binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
<dictionary key="options">
<integer key="NSNullPlaceholder" value="1"/>
<bool key="NSValidatesImmediately" value="YES"/>
</dictionary>
</binding>
</connections>
</button>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3">
<rect key="frame" x="85" y="-1" width="16" height="16"/>
<buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
<behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
</constraints>
<connections>
<action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
<binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="leading" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="85" id="6Y1-s7-g6r"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="centerY" secondItem="JW6-0z-Ud3" secondAttribute="centerY" id="BNJ-xV-faQ"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="105" id="ILg-Qu-R6M"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="top" secondItem="a0k-dW-Jhx" secondAttribute="top" constant="6" id="Mh6-5L-xqM"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="a90-Iq-FgS" secondAttribute="trailing" constant="20" id="U4G-Eh-HPu"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="JW6-0z-Ud3" secondAttribute="trailing" constant="4" id="axA-s0-uGg"/>
<constraint firstAttribute="width" constant="437" id="iUc-Zs-h9S"/>
<constraint firstAttribute="bottom" secondItem="a90-Iq-FgS" secondAttribute="bottom" id="qij-uH-6Yl"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="a0k-dW-Jhx" firstAttribute="leading" secondItem="ov1-yV-Uol" secondAttribute="leading" id="dE2-R0-ENa"/>
<constraint firstItem="a0k-dW-Jhx" firstAttribute="top" secondItem="ov1-yV-Uol" secondAttribute="top" id="ibf-cg-DNR"/>
<constraint firstAttribute="trailing" secondItem="a0k-dW-Jhx" secondAttribute="trailing" id="rAn-bJ-Mp6"/>
<constraint firstAttribute="bottom" secondItem="a0k-dW-Jhx" secondAttribute="bottom" id="xw5-bj-VOd"/>
</constraints>
<point key="canvasLocation" x="-135.5" y="242.5"/>
</customView>
<customView id="37T-Ef-DtX" userLabel="Automatic Download View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="MEW-2n-kJE" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<subviews>
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kb-eYW" userLabel="automaticallyDownloadUpdatesButton">
<rect key="frame" x="104" y="-1" width="248" height="16"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" focusRingType="none" inset="2" id="AUc-33-qGN">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="14" id="kJy-g7-0Un"/>
</constraints>
<connections>
<binding destination="-2" name="value" keyPath="automaticallyDownloadUpdates" id="5Me-7t-mMu"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="BId-kb-eYW" firstAttribute="leading" secondItem="MEW-2n-kJE" secondAttribute="leading" constant="105" id="MnW-AM-QzP"/>
<constraint firstAttribute="bottom" secondItem="BId-kb-eYW" secondAttribute="bottom" id="QXK-90-kUJ"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="BId-kb-eYW" secondAttribute="trailing" constant="20" id="Vk3-CH-cXd"/>
<constraint firstItem="BId-kb-eYW" firstAttribute="top" secondItem="MEW-2n-kJE" secondAttribute="top" constant="6" id="YrX-aL-LAq"/>
<constraint firstAttribute="width" constant="437" id="n4W-Z4-w9i"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="MEW-2n-kJE" secondAttribute="bottom" id="4iq-ZN-n9x"/>
<constraint firstItem="MEW-2n-kJE" firstAttribute="top" secondItem="37T-Ef-DtX" secondAttribute="top" id="FCe-KY-rHW"/>
<constraint firstItem="MEW-2n-kJE" firstAttribute="leading" secondItem="37T-Ef-DtX" secondAttribute="leading" id="dsv-fP-ffg"/>
<constraint firstAttribute="trailing" secondItem="MEW-2n-kJE" secondAttribute="trailing" id="puT-Df-xgH"/>
</constraints>
<point key="canvasLocation" x="-136" y="181"/>
</customView>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGr-V0-0al" userLabel="Placeholder View">
<rect key="frame" x="0.0" y="0.0" width="437" height="205"/>
<constraints>
<constraint firstAttribute="width" constant="437" id="4p7-cJ-U8Z"/>
<constraint firstAttribute="height" constant="205" id="yis-HR-OIe"/>
</constraints>
<point key="canvasLocation" x="-643" y="495"/>
</customView>
</objects>
<resources>
<image name="NSApplicationIcon" width="32" height="32"/>
+3 -1
View File
@@ -104,7 +104,9 @@
}
if (underlyingErrors.count > 1) {
userInfo[NSMultipleUnderlyingErrorsKey] = [underlyingErrors copy];
if (@available(macOS 11.3, *)) {
userInfo[NSMultipleUnderlyingErrorsKey] = [underlyingErrors copy];
}
}
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:[userInfo copy]];
+2 -2
View File
@@ -31,7 +31,7 @@
/* No comment provided by engineer. */
"Cancel" = "إلغاء";
/* Run generate_progress_tool_localizations.py after updating. */
/* No comment provided by engineer. */
"Cancel Update" = "إلغاء التحديث";
/* No comment provided by engineer. */
@@ -49,7 +49,7 @@
/* No comment provided by engineer. */
"Update Error!" = "حدث خطأ أثناء التحديث";
/* Run generate_progress_tool_localizations.py after updating. */
/* No comment provided by engineer. */
"Updating %@" = "تحديث %@";
/* No comment provided by engineer. */
Loaded 100 of 179 files, more files were not shown because too many files have changed in this diff. Show more