Compare commits

...
26 Commits
Author SHA1 Message Date
Marcus Ososbase d982f441d7 Release 1.18.2TB 2018-04-05 20:38:15 -04:00
Marcus Osobase f1858b9bed Merge pull request #9 from TunnelBear/macos-helper-update-II
Macos helper update ii
2018-04-05 20:26:20 -04:00
Marcus Ososbase 258ad4948b Disabled Sparkle insecure update warning 2018-04-04 16:59:10 -04:00
Marcus Ososbase 47c94db727 Don't quit host if target app is not running 2018-04-04 16:58:31 -04:00
Marcus Ososbase 763ecf65de Sparkle cleanup 2018-04-04 16:58:08 -04:00
Marcus Osobase 5230c12aed Merge pull request #8 from TunnelBear/release-1.18.1TB
Re-append TB identifier
2018-02-23 13:31:16 -05:00
Marcus Ososbase 8d1fd18bbe Re-append TB identifier 2018-02-23 12:25:30 -05:00
Marcus Osobase e8f3022d5d Merge pull request #7 from TunnelBear/1.18.1-upstream-update
1.18.1 upstream update
2018-02-23 12:10:45 -05:00
Marcus Ososbase e0873a02aa 1.18.1 upstream update 2018-02-22 06:21:30 -05:00
Marcus Osobase a2fa47ad9f Merge pull request #6 from TunnelBear/macos-helper-update
Modified Sparkle to accomodate helper-parent update
2018-02-22 06:01:59 -05:00
Marcus Ososbase 680d66378d Modified Sparkle to accomodate helper-parent update 2018-02-22 06:00:46 -05:00
Marcus Ososbase 612120a933 1.18.0TB 2017-06-22 18:19:49 -04:00
Marcus Ososbase adebd9f18e Cleanup 2017-06-22 17:58:44 -04:00
Marcus Ososbase 4f2c269e80 Allow auto updates for standard accounts 2017-06-22 17:28:28 -04:00
Marcus Ososbase f5d3cb4500 Allow check for updates even though download not possible 2017-06-22 17:28:28 -04:00
Marcus Ososbase ece2b2e642 Rebased fork on upstream 2017-06-22 17:28:26 -04:00
Marcus Ososbase 744d67c6ed Patched loophole that allowed Sparkle to present UI even though it was suppressed
Added some log statements for future debugging if necessary
2017-06-22 17:27:05 -04:00
Marcus Osobase 094b242f97 Automatically download update and wait until restart to install 2017-06-22 17:27:05 -04:00
Marcus Osobase b3afccee9d Allow delegate to decide how to proceed with new update 2017-06-22 17:26:33 -04:00
Marcus Osobase cd57836ca5 Dont show update window 2017-06-22 17:25:50 -04:00
Justin Simpson 3f2d37486f Added swift friendly function 2017-06-22 17:24:35 -04:00
Marcus Ososbase e308867767 1.14.2 2017-06-22 17:24:13 -04:00
Marcus Ososbase 9715e82a82 Patched loophole that allowed Sparkle to present UI even though it was suppressed
Added some log statements for future debugging if necessary
2017-06-22 17:23:04 -04:00
Marcus Osobase cc75f340e8 Automatically download update and wait until restart to install 2017-06-22 17:22:49 -04:00
Marcus Osobase 17c51da8af Allow delegate to decide how to proceed with new update 2017-06-22 17:22:30 -04:00
Marcus Osobase 48e3a4277e Dont show update window 2017-06-22 17:20:19 -04:00
33 changed files with 355 additions and 170 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.2
osx_image: xcode9
before_install:
- brew update
script: make ci
+13 -1
View File
@@ -1,4 +1,16 @@
# 1.18.0
# 1.18.1
* Add optional updaterDidRelaunchApplication: method on SUUpdaterDelegate (#1115) (App Tyrant)
* Implemented sparkle:os attribute as documented (Memphiz)
* Additional termination detection in case kpoll fails. (fujisoft)
* Included bin files in CocoaPods installation (Keith Smiley)
* Updated Dutch localization (Eitot)
* Updated German localization (Eitot)
* Updated Japanese translation (1024jp)
* Updated Portuguese translation (Victor)
* Updated to Xcode 9/Swift 4
# 1.18.0
* Name of the host app is used in authorization prompt (the `SPARKLE_RELAUNCH_TOOL_NAME` setting is now obsolete)
* More detailed progress bar for package installers (Kornel Lesiński)
+3 -2
View File
@@ -17,8 +17,9 @@ SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME = 0
SPARKLE_VERSION_MAJOR = 1
SPARKLE_VERSION_MINOR = 18
SPARKLE_VERSION_PATCH = 0
SPARKLE_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)
SPARKLE_VERSION_PATCH = 2
TUNNELBEAR_ID = TB
SPARKLE_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(TUNNELBEAR_ID)
CURRENT_PROJECT_VERSION = $(SPARKLE_VERSION)
ALWAYS_SEARCH_USER_PATHS = NO
+2 -1
View File
@@ -1 +1,2 @@
SWIFT_VERSION = 3.0
SWIFT_VERSION = 4.0
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "1.18.0"
s.version = "1.18.2TB"
s.summary = "A software update framework for macOS"
s.description = "Sparkle is an easy-to-use software update framework for Cocoa developers."
s.homepage = "http://sparkle-project.org"
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
}
s.platform = :osx, '10.7'
s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.bz2" }
s.source = { :http => "https://s3.amazonaws.com/tunnelbear/sparkle/Sparkle-#{s.version}.tar.bz2" }
s.source_files = 'Sparkle.framework/Versions/A/Headers/*.h'
s.preserve_paths = 'bin/*'
+6 -6
View File
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 47;
objects = {
/* Begin PBXAggregateTarget section */
@@ -1047,7 +1047,6 @@
1495006D195FBBBD00BC5B5B /* Sparkle */ = {
isa = PBXGroup;
children = (
720767D01E2E3DD300F9A850 /* AppKitPrevention.h */,
61299B3909CB055000B7442F /* Appcast Support */,
55C14BD5136EEFD000649790 /* Autoupdate */,
089C1665FE841158C02AAC07 /* Framework Resources */,
@@ -1056,6 +1055,7 @@
6101354A0DD25B7F0049ACDF /* Unarchiving */,
61F83F6E0DBFE07A006FDD30 /* Update Control */,
61299B3A09CB056100B7442F /* User Interface */,
720767D01E2E3DD300F9A850 /* AppKitPrevention.h */,
);
path = Sparkle;
sourceTree = "<group>";
@@ -1633,11 +1633,11 @@
TargetAttributes = {
5AA96C541E0AE0DB00CA4346 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
612279D80DB5470200AB99EA = {
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
TestTargetID = 8DC2EF4F0486A6940098B216;
};
722954B31D04ADAF00ECF9CA = {
@@ -1651,7 +1651,7 @@
};
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */;
compatibilityVersion = "Xcode 3.2";
compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -1879,8 +1879,8 @@
55C14F22136EF86000649790 /* SUStandardVersionComparator.m in Sources */,
55C14F20136EF84300649790 /* SUStatusController.m in Sources */,
55C14F23136EF86700649790 /* SUSystemProfiler.m in Sources */,
720767CF1E2DC37400F9A850 /* TerminationListener.m in Sources */,
E1EC2A301E21667000245715 /* SUTouchBarButtonGroup.m in Sources */,
720767CF1E2DC37400F9A850 /* TerminationListener.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
@@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
@@ -10,6 +10,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -30,6 +31,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
+5
View File
@@ -116,6 +116,11 @@
if ([self terminated]) {
[self invokeCompletionWithSuccess:YES];
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if ([self terminated]) {
[self invokeCompletionWithSuccess:YES];
}
});
}
static void noteExitKQueueCallback(CFFileDescriptorRef file, CFOptionFlags __unused callBackTypes, void *info)
+25
View File
@@ -46,6 +46,15 @@ static const NSTimeInterval SUAutomaticUpdatePromptImpatienceTimer = 60 * 60 * 2
- (void)showUpdateAlert
{
id<SUUpdaterPrivate> updater = self.updater;
id<SUUpdaterDelegate> updaterDelegate = [updater delegate];
if ([updaterDelegate suppressSparkleUI])
{
[self automaticUpdateAlertFinishedWithChoice:SUInstallLaterChoice];
return;
}
// NSLog(@"[Sparkle showUpdateAlert]");
self.interruptible = NO;
[self invalidateShowUpdateAlertTimer];
@@ -96,10 +105,26 @@ static const NSTimeInterval SUAutomaticUpdatePromptImpatienceTimer = 60 * 60 * 2
[updaterDelegate updater:self.updater willInstallUpdateOnQuit:self.updateItem immediateInstallationInvocation:invocation];
}
//For Swift
else if ([updaterDelegate respondsToSelector:@selector(updater: willInstallUpdateOnQuit:immediateInstallationBlock:)])
{
BOOL relaunch = YES;
BOOL showUI = NO;
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[self class] instanceMethodSignatureForSelector:@selector(installWithToolAndRelaunch:displayingUserInterface:)]];
[invocation setSelector:@selector(installWithToolAndRelaunch:displayingUserInterface:)];
[invocation setArgument:&relaunch atIndex:2];
[invocation setArgument:&showUI atIndex:3];
[invocation setTarget:self];
[updaterDelegate updater:self.updater willInstallUpdateOnQuit:self.updateItem immediateInstallationBlock:^{
[invocation invoke];
}];
}
// If this is marked as a critical update, we'll prompt the user to install it right away.
if ([self.updateItem isCriticalUpdate])
{
// NSLog(@"[Sparkle update deemed critical]");
[self showUpdateAlert];
}
else
+29 -2
View File
@@ -212,7 +212,11 @@
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFindValidUpdateNotification
object:self.updater
userInfo:@{ SUUpdaterAppcastItemNotificationKey: self.updateItem }];
[self downloadUpdate];
// TB: Always download update.
// Stadard accounts will recieve an auth prompt before installation
[self downloadUpdate];
}
- (void)didNotFindUpdate
@@ -577,6 +581,9 @@
}
}
//Set relaunching flag.
[self.host setBool:YES forUserDefaultsKey:SUUpdateRelaunchingMarkerKey];
[NSTask launchedTaskWithLaunchPath:relaunchToolPath arguments:@[[self.host bundlePath],
pathToRelaunch,
[NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]],
@@ -589,7 +596,27 @@
// Note: this is overridden by the automatic update driver to not terminate in some cases
- (void)terminateApp
{
[NSApp terminate:self];
BOOL isMainBundle = [self.host.bundle isEqualTo:[NSBundle mainBundle]];
if (isMainBundle) {
[NSApp terminate:self];
}
else {
NSString *bundleID = self.host.bundle.bundleIdentifier;
if (bundleID.length > 0) {
NSArray *apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:bundleID];
for (NSRunningApplication *app in apps) {
[app terminate];
}
}
// Notify the mainBundle host the target has been terminated
id<SUUpdaterPrivate> updater = self.updater;
id<SUUpdaterDelegate> updaterDelegate = [updater delegate];
if ([updaterDelegate respondsToSelector:@selector(updater:didTerminateTarget:)]) {
[updaterDelegate updater:self.updater didTerminateTarget:bundleID];
}
}
}
- (void)cleanUpDownload
+1
View File
@@ -35,6 +35,7 @@ extern NSString *const SUTechnicalErrorInformationKey;
extern NSString *const SUFeedURLKey;
extern NSString *const SUHasLaunchedBeforeKey;
extern NSString *const SUUpdateRelaunchingMarkerKey;
extern NSString *const SUShowReleaseNotesKey;
extern NSString *const SUSkippedVersionKey;
extern NSString *const SUScheduledCheckIntervalKey;
+1
View File
@@ -26,6 +26,7 @@ NSString *const SUAppcastAttributeValueMacOS = @"macos";
NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore";
NSString *const SUUpdateRelaunchingMarkerKey = @"SUUpdateRelaunchingMarker";
NSString *const SUFeedURLKey = @"SUFeedURL";
NSString *const SUShowReleaseNotesKey = @"SUShowReleaseNotes";
NSString *const SUSkippedVersionKey = @"SUSkippedVersion";
+1
View File
@@ -31,6 +31,7 @@ typedef NS_ENUM(OSStatus, SUError) {
// Download phase errors.
SUTemporaryDirectoryError = 2000,
SUDownloadError = 2001,
SUHostDirectoryNotWritable = 2002,
// Extraction phase errors.
SUUnarchivingError = 3000,
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.
+25 -47
View File
@@ -59,42 +59,16 @@
- (void)didFindValidUpdate
{
id<SUUpdaterPrivate> updater = self.updater;
if ([[updater delegate] respondsToSelector:@selector(updater:didFindValidUpdate:)]) {
[[updater delegate] updater:self.updater didFindValidUpdate:self.updateItem];
if ([[updater delegate] respondsToSelector:@selector(updater:didFindValidUpdate:respondWithChoice:)]) {
[[updater delegate] updater:self.updater didFindValidUpdate:self.updateItem respondWithChoice:^(SUDUpdateAlertChoice choice) {
[self updateAlertFinishedWithChoice:(SUUpdateAlertChoice)choice];
}];
return;
}
if (self.automaticallyInstallUpdates) {
[self updateAlertFinishedWithChoice:SUInstallUpdateChoice];
return;
else if ([[updater delegate] respondsToSelector:@selector(updater:didFindValidUpdate:)]) {
[[updater delegate] updater:self.updater didFindValidUpdate:self.updateItem];
}
self.updateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:self.updateItem host:self.host completionBlock:^(SUUpdateAlertChoice choice) {
[self updateAlertFinishedWithChoice:choice];
}];
id<SUVersionDisplay> versDisp = nil;
if ([[updater delegate] respondsToSelector:@selector(versionDisplayerForUpdater:)]) {
versDisp = [[updater delegate] versionDisplayerForUpdater:self.updater];
}
[self.updateAlert setVersionDisplayer:versDisp];
// If the app is a menubar app or the like, we need to focus it first and alter the
// update prompt to behave like a normal window. Otherwise if the window were hidden
// there may be no way for the application to be activated to make it visible again.
if ([SUApplicationInfo isBackgroundApplication:[NSApplication sharedApplication]]) {
[[self.updateAlert window] setHidesOnDeactivate:NO];
[NSApp activateIgnoringOtherApps:YES];
}
// Only show the update alert if the app is active; otherwise, we'll wait until it is.
if ([NSApp isActive]) {
NSWindow *window = [self.updateAlert window];
if ([self shouldDisableKeyboardShortcutForInstallButton]) {
[self.updateAlert disableKeyboardShortcutForInstallButton];
}
[window makeKeyAndOrderFront:self];
} else
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:NSApp];
}
- (BOOL)shouldDisableKeyboardShortcutForInstallButton {
@@ -135,7 +109,7 @@
break;
case SUOpenInfoURLChoice:
[[NSWorkspace sharedWorkspace] openURL:[self.updateItem infoURL]];
[[NSWorkspace sharedWorkspace] openURL:[self.updateItem releaseNotesURL]];
[self abortUpdate];
break;
@@ -152,18 +126,22 @@
- (void)downloadUpdate
{
BOOL createdStatusController = NO;
if (self.statusController == nil) {
self.statusController = [[SUStatusController alloc] initWithHost:self.host];
createdStatusController = YES;
}
[self.statusController beginActionWithTitle:SULocalizedString(@"Downloading update...", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil];
[self.statusController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelDownload:) isDefault:NO];
[self.statusController setButtonEnabled:YES];
if (createdStatusController) {
[self.statusController showWindow:self];
id<SUUpdaterPrivate> updater = self.updater;
if(![[updater delegate] suppressSparkleUI])
{
BOOL createdStatusController = NO;
if (self.statusController == nil) {
self.statusController = [[SUStatusController alloc] initWithHost:self.host];
createdStatusController = YES;
}
[self.statusController beginActionWithTitle:SULocalizedString(@"Downloading update...", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil];
[self.statusController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelDownload:) isDefault:NO];
[self.statusController setButtonEnabled:YES];
if (createdStatusController) {
[self.statusController showWindow:self];
}
}
[super downloadUpdate];
+6
View File
@@ -53,6 +53,12 @@ SU_EXPORT @interface SUUpdater : NSObject
*/
- (instancetype)initForBundle:(NSBundle *)bundle;
/*!
Suppress sparkle UI. This should prevent any Sparkle UI from popping up.
Updates should be handled by the host.
*/
-(BOOL)suppressSparkleUI;
/*!
Explicitly checks for updates and displays a progress dialog while doing so.
+30 -5
View File
@@ -10,6 +10,7 @@
#import "SUUpdaterDelegate.h"
#import "SUUpdaterPrivate.h"
#import "SUErrors.h"
#import "SUHost.h"
#import "SUUpdatePermissionResponse.h"
#import "SUUpdatePermissionPrompt.h"
@@ -149,8 +150,9 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
informativeText:[NSString stringWithFormat:SULocalizedString(@"For security reasons, the file (%@) indicated by the '%@' key needs to exist in the bundle's Resources.", nil), publicDSAKeyFileKey, SUPublicDSAKeyFileKey]];
} else {
if (!isMainBundle) {
[self showAlertText:SULocalizedString(@"Insecure update error!", nil)
informativeText:SULocalizedString(@"For security reasons, you need to sign your updates with a DSA key. See Sparkle's documentation for more information.", nil)];
// Sparkle documentation doesn't explain why this is a requirement. We won't be using DSA keys for now. Codesigning will suffice.
// [self showAlertText:SULocalizedString(@"Insecure update error!", nil)
// informativeText:SULocalizedString(@"For security reasons, you need to sign your updates with a DSA key. See Sparkle's documentation for more information.", nil)];
} else {
if (!hostIsCodeSigned) {
[self showAlertText:SULocalizedString(@"Insecure update error!", nil)
@@ -208,6 +210,14 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
if (!hasLaunchedBefore) {
[self.host setBool:YES forUserDefaultsKey:SUHasLaunchedBeforeKey];
}
// Relanching from app update?
else if ([self.host boolForUserDefaultsKey:SUUpdateRelaunchingMarkerKey]) {
if ([self.delegate respondsToSelector:@selector(updaterDidRelaunchApplication:)]) {
[self.delegate updaterDidRelaunchApplication:self];
}
//Reset flag back to NO.
[self.host setBool:NO forUserDefaultsKey:SUUpdateRelaunchingMarkerKey];
}
if (shouldPrompt) {
NSArray<NSDictionary<NSString *, NSString *> *> *profileInfo = [SUSystemProfiler systemProfileArrayForHost:self.host];
@@ -283,7 +293,17 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
- (void)checkForUpdatesInBackground
{
// Do not use reachability for a preflight check. This can be deceptive and a bad idea. Apple does not recommend doing it.
SUUpdateDriver *theUpdateDriver = [[([self automaticallyDownloadsUpdates] ? [SUAutomaticUpdateDriver class] : [SUScheduledUpdateDriver class])alloc] initWithUpdater:self];
SUUpdateDriver *theUpdateDriver;
if ([self.delegate suppressSparkleUI])
{
theUpdateDriver = [[SUAutomaticUpdateDriver alloc] initWithUpdater:self];
}
else {
theUpdateDriver = [[SUScheduledUpdateDriver alloc] initWithUpdater:self];
}
[self checkForUpdatesWithDriver:theUpdateDriver];
}
@@ -307,6 +327,8 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
- (void)installUpdatesIfAvailable
{
// NSLog(@"[Sparkle installUpdatesIfAvailable]");
if (self.driver && [self.driver isInterruptible]) {
if ([self.driver resumeUpdateInteractively]) {
return;
@@ -425,9 +447,12 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
if (![SUSystemUpdateInfo systemAllowsAutomaticUpdatesForHost:self.host]) {
return NO;
}
// Otherwise, automatically downloading updates is allowed. Does the user want it?
return [self.host boolForUserDefaultsKey:SUAutomaticallyUpdateKey];
BOOL automatic = [self.host boolForUserDefaultsKey:SUAutomaticallyUpdateKey];
// NSLog(@"Automatic updates %@", automatic ? @"enabled" : @"disabled");
return automatic;
}
- (void)setFeedURL:(NSURL *)feedURL
+48
View File
@@ -14,6 +14,13 @@
#import "SUExport.h"
typedef NS_ENUM(NSInteger, SUDUpdateAlertChoice) {
SUDInstallUpdateChoice,
SUDRemindMeLaterChoice,
SUDSkipThisVersionChoice,
SUDOpenInfoURLChoice
};
@protocol SUVersionComparison, SUVersionDisplay;
@class SUUpdater, SUAppcast, SUAppcastItem;
@@ -45,6 +52,12 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
@protocol SUUpdaterDelegate <NSObject>
@optional
/*!
Suppress sparkle UI. This should prevent any Sparkle UI from popping up.
Updates should be handled by the host.
*/
-(BOOL)suppressSparkleUI;
/*!
Returns whether to allow Sparkle to pop up.
@@ -121,6 +134,16 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
*/
- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
/*!
Called when a valid update is found by the update driver and provides delegate ability to respond.
\param updater The SUUpdater instance.
\param item The appcast item corresponding to the update that is proposed to be installed.
\param responseBlock The block carrying the users response to update.
*/
- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item respondWithChoice:(void (^)(SUDUpdateAlertChoice))responseBlock;
/*!
Called when a valid update is not found.
@@ -192,6 +215,13 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
*/
- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
/*!
Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
\param updater The SUUpdater instance.
*/
- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
/*!
Returns an object that compares version numbers to determine their arithmetic relation to each other.
@@ -253,6 +283,24 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
*/
- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
/*!
Called when an update is scheduled to be silently installed on quit. Swift compatible.
\param updater the SUUpdater instance.
\param item The appcast item corresponding to the udpate that is proposed to be installed.
\param restartBlock Can be used to trigger an immediate silent install and relaunch.
*/
- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)()) restartBlock;
/*!
Called when the update target which is not from the host mainBundle has been terminated.
For example, a helper app updating its parent.
\param updater the SUUpdater instance.
\param targetBundleID the bundle ID of the terminated parent app
*/
- (void)updater:(SUUpdater *)updater didTerminateTarget: (NSString *)targetBundleID;
/*!
Calls after an update that was scheduled to be silently installed on quit has been canceled.
+2
View File
@@ -20,4 +20,6 @@
@property (strong, readonly) NSBundle *sparkleBundle;
@property BOOL automaticallyDownloadsUpdates;
@end
+6 -6
View File
@@ -57,9 +57,9 @@
</connections>
</textField>
<button verticalHuggingPriority="750" id="15">
<rect key="frame" x="462" y="12" width="215" height="32"/>
<rect key="frame" x="472" y="13" width="205" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Installieren und erneut starten" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="41">
<buttonCell key="cell" type="push" title="Installieren und neu starten" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="41">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
@@ -71,7 +71,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" id="30">
<rect key="frame" x="102" y="12" width="132" height="32"/>
<rect key="frame" x="101" y="13" width="142" height="32"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="push" title="Nicht installieren" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="44">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -82,9 +82,9 @@ DQ
</connections>
</button>
<button id="17">
<rect key="frame" x="105" y="58" width="619" height="18"/>
<rect key="frame" x="104" y="58" width="569" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Aktualisierungen in Zukunft automatisch herunterladen und installieren" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="43">
<buttonCell key="cell" type="check" title="Updates in Zukunft automatisch laden und installieren" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="43">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
@@ -93,7 +93,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" id="16">
<rect key="frame" x="265" y="12" width="197" height="32"/>
<rect key="frame" x="275" y="13" width="197" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Beim Beenden installieren" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="42">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+2 -2
View File
@@ -22,7 +22,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window identifier="SUUpdateAlert" title="Software-Aktualisierung" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="SUUpdateAlert" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
<window identifier="SUUpdateAlert" title="Softwareupdate" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="SUUpdateAlert" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="746" y="229" width="620" height="370"/>
@@ -190,7 +190,7 @@ DQ
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
</constraints>
<buttonCell key="cell" type="check" title="Aktualisierungen in Zukunft automatisch herunterladen und installieren" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
<buttonCell key="cell" type="check" title="Updates in Zukunft automatisch laden und installieren" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
+6 -6
View File
@@ -59,7 +59,7 @@ Gw
<textField verticalHuggingPriority="750" id="32">
<rect key="frame" x="104" y="131" width="316" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Automatisch nach Aktualisierungen suchen?" id="178">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Automatisch nach Updates suchen?" id="178">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -137,17 +137,17 @@ Gw
</connections>
</arrayController>
<customView id="39" userLabel="MoreInfoView">
<rect key="frame" x="0.0" y="0.0" width="362" height="205"/>
<rect key="frame" x="0.0" y="0.0" width="362" height="191"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" id="46">
<rect key="frame" x="1" y="128" width="358" height="70"/>
<rect key="frame" x="1" y="128" width="358" height="56"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="183">
<font key="font" metaFont="smallSystem"/>
<string key="title">Das anonymisierte Systemprofil unterstützt uns bei der zukünftigen Entwicklung. Bitte kontaktieren Sie uns, wenn Sie Fragen hierzu haben.
<string key="title">Das anonymisierte Systemprofil unterstützt uns bei der zukünftigen Entwicklung. Bitte kontaktiere uns, wenn du Fragen hierzu hast.
Diese Informationen würden an uns gesendet:</string>
Diese Informationen würden an uns gesendet werden:</string>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -160,7 +160,7 @@ Diese Informationen würden an uns gesendet:</string>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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="353" height="16"/>
<rect key="frame" x="0.0" y="0.0" width="353" height="113"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+24 -24
View File
@@ -1,38 +1,38 @@
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde heruntergeladen und steht zur Verwendung bereit! Dies ist eine wichtige Aktualisierung. Möchten Sie %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Dies ist ein wichtiges Update. Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde heruntergeladen und steht zur Verwendung bereit! Möchten Sie %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ kann nicht aktualisiert werden, wenn es von einem Volumen ohne Schreibzugriff (z.B. Disk Image oder CD/DVD) gestartet wurde. Kopieren Sie %1$@ in den Programme Ordner, aktualisieren Sie es von dort.";
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ kann nicht aktualisiert werden, weil es von einem Ort ohne Schreibzugriff oder temporären Ort aus gestartet wurde. Kopiere %1$@ in den Programmeordner, starte es von dort aus und versuche es erneut zu aktualisieren.";
"%@ %@ is currently the newest version available." = "%1$@ %2$@ ist zur Zeit die neueste verfügbare Version.";
"%@ %@ is currently the newest version available." = "%1$@ %2$@ ist zurzeit die neueste verfügbare Version.";
/* Description text for SUUpdateAlert when the update is downloadable. */
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar (Sie verwenden Version %3$@). Möchten Sie die neue Version jetzt herunterladen?";
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du die neue Version jetzt laden?";
/* Description text for SUUpdateAlert when the update informational with no download. */
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ist verfügbar (Sie verwenden Version %3$@). Möchten Sie mehr über diese Aktualisierung erfahren?";
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du mehr über dieses Update erfahren?";
"%@ downloaded" = "%@ heruntergeladen";
"%@ downloaded" = "%@ geladen";
"%@ of %@" = "%1$@ von %2$@";
"A new version of %@ is available!" = "Eine neue Version von %@ ist verfügbar!";
"A new version of %@ is ready to install!" = "Eine neue Version von %@ ist zur Installation bereit!";
"A new version of %@ is ready to install!" = "Eine neue Version von %@ steht zur Installation bereit!";
"An error occurred in retrieving update information. Please try again later." = "Bei der Aktualisierung trat ein Fehler auf. Bitte versuchen Sie es später erneut.";
"An error occurred in retrieving update information. Please try again later." = "Beim Laden der Updateinformationen trat ein Fehler auf. Bitte versuche es später erneut.";
"An error occurred while downloading the update. Please try again later." = "Beim Herunterladen ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.";
"An error occurred while downloading the update. Please try again later." = "Beim Laden des Updates ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
"An error occurred while extracting the archive. Please try again later." = "Beim Entpacken der Daten ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.";
"An error occurred while extracting the archive. Please try again later." = "Beim Entpacken des Archivs ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
"An error occurred while installing the update. Please try again later." = "Bei der Installation der Aktualisierung ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.";
"An error occurred while installing the update. Please try again later." = "Beim Installieren des Updates ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
"An error occurred while parsing the update feed." = "Beim Lesen der Aktualisierungsinformationen ist ein Fehler aufgetreten.";
"An error occurred while parsing the update feed." = "Beim Lesen der Updateinformationen ist ein Fehler aufgetreten.";
"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Beim erneuten Starten von %1$@ ist ein Fehler aufgetreten. Die neue Version von %1$@ steht beim nächsten Programmstart zur Verfügung.";
"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Beim Neustart von %1$@ ist ein Fehler aufgetreten. Die neue Version von %1$@ steht beim nächsten Programmstart zur Verfügung.";
"An important update to %@ is ready to install" = "Eine wichtige Aktualisierung von %@ steht zur Installation bereit";
"An important update to %@ is ready to install" = "Ein wichtiges Update von %@ steht zur Installation bereit";
/* the unit for bytes */
"B" = "B";
@@ -41,21 +41,21 @@
"Cancel Update" = "Aktualisierung abbrechen";
"Checking for updates..." = "Suche nach Aktualisierungen …";
"Checking for updates..." = "Nach Updates suchen …";
/* Take care not to overflow the status window. */
"Downloading update..." = "Aktualisierung wird heruntergeladen …";
"Downloading update..." = "Update laden …";
/* Take care not to overflow the status window. */
"Extracting update..." = "Aktualisierung entpacken …";
"Extracting update..." = "Update entpacken …";
/* the unit for gigabytes */
"GB" = "GB";
"Install and Relaunch" = "Installieren und erneut starten";
"Install and Relaunch" = "Installieren und neu starten";
/* Take care not to overflow the status window. */
"Installing update..." = "Aktualisierung installieren …";
"Installing update..." = "Update installieren …";
/* the unit for kilobytes */
"KB" = "KB";
@@ -67,17 +67,17 @@
"Ready to Install" = "Bereit zum Installieren";
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Soll %1$@ automatisch nach Aktualisierungen suchen? Sie können im %1$@-Menü auch manuell nach Aktualisierungen suchen.";
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Soll %1$@ automatisch nach Updates suchen? Du kannst im %1$@-Menü auch manuell nach Updates suchen.";
"The update is improperly signed." = "Die Aktualisierung ist nicht ordnungsgemäß signiert.";
"The update is improperly signed." = "Das Update ist nicht ordnungsgemäß signiert.";
"Update Error!" = "Fehler beim Aktualisieren!";
"Updating %@" = "Aktualisierung von %@";
"You already have the newest version of %@." = "Sie haben bereits die neueste Version von %@.";
"You already have the newest version of %@." = "Du hast bereits die neueste Version von %@.";
"You're up-to-date!" = "Sie sind auf dem neuesten Stand!";
"You're up-to-date!" = "Du bist auf dem neuesten Stand!";
/* Alternative name for "Install" button if we have a paid update or other update
without a download but with a URL. */
+60 -14
View File
@@ -1,89 +1,135 @@
/* No comment provided by engineer. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?";
/* No comment provided by engineer. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?";
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ can’t be updated when it’s running from a read-only volume like a disk image or an optical drive. Move %1$@ to Applications folder using Finder, relaunch it from there, and try again.";
/* No comment provided by engineer. */
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available.";
/* Description text for SUUpdateAlert when the update is downloadable. */
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is now available—you have %3$@. Would you like to download it now?";
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is now available--you have %3$@. Would you like to download it now?";
/* Description text for SUUpdateAlert when the update informational with no download. */
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is now available—you have %3$@. Would you like to learn more about this update on the web?";
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is now available--you have %3$@. Would you like to learn more about this update on the web?";
/* No comment provided by engineer. */
"%@ downloaded" = "%@ downloaded";
/* No comment provided by engineer. */
"%@ of %@" = "%1$@ of %2$@";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "A new version of %@ is available!";
/* No comment provided by engineer. */
"A new version of %@ is ready to install!" = "A new version of %@ is ready to install!";
/* No comment provided by engineer. */
"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later.";
/* No comment provided by engineer. */
"An error occurred while downloading the update. Please try again later." = "An error occurred while downloading the update. Please try again later.";
/* No comment provided by engineer. */
"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later.";
/* No comment provided by engineer. */
"An error occurred while installing the update. Please try again later." = "An error occurred while installing the update. Please try again later.";
/* No comment provided by engineer. */
"An error occurred while parsing the update feed." = "An error occurred while parsing the update feed.";
/* No comment provided by engineer. */
"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@.";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = "An important update to %@ is ready to install";
/* the unit for bytes */
"B" = "B";
/* No comment provided by engineer. */
"Cancel" = "Cancel";
/* No comment provided by engineer. */
"Cancel Update" = "Cancel Update";
"Checking for updates..." = "Checking for updates…";
/* No comment provided by engineer. */
"Checking for updates..." = "Checking for updates...";
/* Take care not to overflow the status window. */
"Downloading update..." = "Downloading update…";
"Downloading update..." = "Downloading update...";
/* Take care not to overflow the status window. */
"Extracting update..." = "Extracting update…";
"Extracting update..." = "Extracting update...";
/* No comment provided by engineer. */
"For security reasons, the file (%@) indicated by the '%@' key needs to exist in the bundle's Resources." = "For security reasons, the file (%1$@) indicated by the '%2$@' key needs to exist in the bundle's Resources.";
/* No comment provided by engineer. */
"For security reasons, you need to code sign your application or sign your updates with a DSA key. See https://sparkle-project.org/documentation/ for more information." = "For security reasons, you need to code sign your application or sign your updates with a DSA key. See https://sparkle-project.org/documentation/ for more information.";
/* No comment provided by engineer. */
"For security reasons, you need to serve your updates over HTTPS and/or sign your updates with a DSA key. See https://sparkle-project.org/documentation/ for more information." = "For security reasons, you need to serve your updates over HTTPS and/or sign your updates with a DSA key. See https://sparkle-project.org/documentation/ for more information.";
/* No comment provided by engineer. */
"For security reasons, you need to sign your updates with a DSA key. See Sparkle's documentation for more information." = "For security reasons, you need to sign your updates with a DSA key. See Sparkle's documentation for more information.";
/* the unit for gigabytes */
"GB" = "GB";
/* No comment provided by engineer. */
"Insecure feed URL is blocked in macOS 10.11" = "Insecure feed URL is blocked in macOS 10.11";
/* No comment provided by engineer. */
"Insecure update error!" = "Insecure update error!";
/* No comment provided by engineer. */
"Install and Relaunch" = "Install and Relaunch";
/* Take care not to overflow the status window. */
"Installing update..." = "Installing update…";
"Installing update..." = "Installing update...";
/* the unit for kilobytes */
"KB" = "KB";
/* Alternative name for "Install" button if we have a paid update or other update
without a download but with a URL. */
"Learn More..." = "Learn More…";
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
"Learn More..." = "Learn More...";
/* the unit for megabytes */
"MB" = "MB";
/* OK button. */
/* No comment provided by engineer. */
"OK" = "OK";
/* Status message on progress window once download has finished. */
/* No comment provided by engineer. */
"Ready to Install" = "Ready to Install";
/* Message that is optionally shown at startup to allow users to turn on/off update checks. */
/* No comment provided by engineer. */
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu.";
/* No comment provided by engineer. */
"The update is improperly signed." = "The update is improperly signed.";
/* No comment provided by engineer. */
"The update will not be installed because the user requested for the system to power off" = "The update will not be installed because the user requested for the system to power off";
/* No comment provided by engineer. */
"Update Error!" = "Update Error!";
/* No comment provided by engineer. */
"Updating %@" = "Updating %@";
/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */
"You already have the newest version of %@." = "You already have the newest version of %@.";
/* No comment provided by engineer. */
"You must change the feed URL (%@) to use HTTPS or disable App Transport Security.\n\nFor more information:\nhttps://sparkle-project.org/documentation/app-transport-security/" = "You must change the feed URL (%@) to use HTTPS or disable App Transport Security.\n\nFor more information:\nhttps://sparkle-project.org/documentation/app-transport-security/";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You're up-to-date!" = "You’re up-to-date!";
"You're up-to-date!" = "You're up-to-date!";
+3 -3
View File
@@ -57,7 +57,7 @@
</connections>
</textField>
<button verticalHuggingPriority="750" id="15">
<rect key="frame" x="435" y="12" width="167" height="32"/>
<rect key="frame" x="436" y="12" width="166" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Installeer en herstart" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="41">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -71,9 +71,9 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" id="16">
<rect key="frame" x="306" y="12" width="129" height="32"/>
<rect key="frame" x="246" y="12" width="190" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Installeer bij Stop" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="42">
<buttonCell key="cell" type="push" title="Installeer bij het stoppen" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="42">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
+3 -3
View File
@@ -143,11 +143,11 @@
</constraints>
</customView>
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="22">
<rect key="frame" x="269" y="12" width="186" height="32"/>
<rect key="frame" x="319" y="12" width="145" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="90" id="2Zy-5G-GBj"/>
</constraints>
<buttonCell key="cell" type="push" title="Herinner mij er later aan" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
<buttonCell key="cell" type="push" title="Herinner mij later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
@@ -169,7 +169,7 @@ Gw
</connections>
</button>
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="76">
<rect key="frame" x="455" y="12" width="151" height="32"/>
<rect key="frame" x="464" y="12" width="142" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="N94-uf-6oP"/>
</constraints>
+8 -8
View File
@@ -29,9 +29,9 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" tag="1" id="13">
<rect key="frame" x="241" y="12" width="183" height="32"/>
<rect key="frame" x="274" y="12" width="149" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Controleer automatisch" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="176">
<buttonCell key="cell" type="push" title="Zoek automatisch" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="176">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
@@ -43,9 +43,9 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" id="14">
<rect key="frame" x="110" y="12" width="131" height="32"/>
<rect key="frame" x="177" y="12" width="97" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<buttonCell key="cell" type="push" title="Controleer niet" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="177">
<buttonCell key="cell" type="push" title="Zoek niet" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="177">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
@@ -59,7 +59,7 @@ Gw
<textField verticalHuggingPriority="750" id="32">
<rect key="frame" x="104" y="114" width="289" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Automatisch controleren op updates?" id="178">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Automatisch zoeken naar updates?" id="178">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -80,7 +80,7 @@ Gw
<button focusRingType="none" id="34">
<rect key="frame" x="104" y="53" width="278" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Inclusief anoniem systeemprofiel" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="180">
<buttonCell key="cell" type="check" title="Voeg anoniem systeemprofiel bij" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="180">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
@@ -145,7 +145,7 @@ Gw
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="183">
<font key="font" metaFont="smallSystem"/>
<string key="title">Aan de hand van anonieme informatie over het systeemprofiel kunnen wij toekomstige ontwikkelingswerkzaamheden beter plannen. Neem contact met ons op als u hierover vragen hebt.
<string key="title">Aan de hand van anonieme informatie over het systeemprofiel kunnen wij toekomstige ontwikkelingswerkzaamheden beter plannen. Neem contact met ons op als je hierover vragen hebt.
Dit is de informatie die wordt verzonden:</string>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -160,7 +160,7 @@ Dit is de informatie die wordt verzonden:</string>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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="353" height="16"/>
<rect key="frame" x="0.0" y="0.0" width="353" height="113"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+23 -23
View File
@@ -1,14 +1,14 @@
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ is gedownload en is klaar voor gebruik! Wilt u %1$@ nu installeren en herstarten?";
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ is gedownload en klaar om te installeren! Wil je %1$@ nu installeren en herstarten?";
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ kan niet worden geupdate als het van een alleen-lezen volume, zoals een schijfkopie of CD, geopend is. Verplaats %1$@ naar de Map ’Programma’s’, herstart van daar, en probeer opnieuw.";
"%1$@ can't be updated, because it was opened from a read-only or a temporary location. Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ kan niet worden geüpdatet, omdat het vanuit een alleen-lezen- of tijdelijke locatie geopend is. Verplaats %1$@ naar de map ’Programma’s’, herstart vandaar en probeer opnieuw.";
"%@ %@ is currently the newest version available." = "%1$@ %2$@ is momenteel de recentste versie.";
"%@ %@ is currently the newest version available." = "%1$@ %2$@ is momenteel de nieuwste versie.";
/* Description text for SUUpdateAlert when the update is downloadable. */
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is nu beschikbaar—u heeft %3$@. Wilt u het nu downloaden?";
"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is nu beschikbaar – je hebt %3$@. Wil je de update nu downloaden?";
/* Description text for SUUpdateAlert when the update informational with no download. */
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is now available--you have %3$@. Would you like to learn more about this update on the web?";
"%@ %@ is now available--you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is nu beschikbaar – je hebt %3$@. Wil je een webpagina openen met meer informatie?";
"%@ downloaded" = "%@ gedownload";
@@ -18,32 +18,32 @@
"A new version of %@ is ready to install!" = "Een nieuwe versie van %@ is klaar om te installeren!";
"An error occurred in retrieving update information. Please try again later." = "Bij het ophalen van update-informatie deed zich een fout voor. Probeer alstublieft later opnieuw.";
"An error occurred in retrieving update information. Please try again later." = "Bij het ophalen van update-informatie deed zich een fout voor. Probeer het later opnieuw.";
"An error occurred while downloading the update. Please try again later." = "Bij het downloaden deed zich een fout voor. Probeer alstublieft later opnieuw.";
"An error occurred while downloading the update. Please try again later." = "Bij het downloaden van de update deed zich een fout voor. Probeer het later opnieuw";
"An error occurred while extracting the archive. Please try again later." = "Bij het uitpakken van het archief deed zich een fout voor. Probeer alstublieft later opnieuw.";
"An error occurred while extracting the archive. Please try again later." = "Bij het uitpakken van het archief deed zich een fout voor. Probeer het later opnieuw.";
"An error occurred while installing the update. Please try again later." = "Bij het installeren van de update deed zich een fout voor. Probeer alstublieft later opnieuw.";
"An error occurred while installing the update. Please try again later." = "Bij het installeren van de update deed zich een fout voor. Probeer het later opnieuw.";
"An error occurred while parsing the update feed." = "Bij het afhandelen van de update feed deed zich een fout voor.";
"An error occurred while parsing the update feed." = "Bij het verwerken van de update-informatie deed zich een fout voor.";
"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Bij het herstarten van %1$@ deed zich een fout voor. Maar de nieuwe versie is beschikbaar de volgende keer u %1$@ opstart.";
"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Bij het herstarten van %1$@ deed zich een fout voor. De nieuwe versie is beschikbaar wanneer je %1$@ de volgende keer opent.";
/* the unit for bytes */
"B" = "B";
"Cancel" = "Annuleren";
"Cancel" = "Annuleer";
"Cancel Update" = "Updaten annuleren";
"Cancel Update" = "Annuleer update";
"Checking for updates..." = "Controleren op updates …";
"Checking for updates..." = "Naar updates zoeken…";
/* Take care not to overflow the status window. */
"Downloading update..." = "Downloaden update …";
"Downloading update..." = "Update downloaden…";
/* Take care not to overflow the status window. */
"Extracting update..." = "Bezig met uitpakken van de update …";
"Extracting update..." = "Update uitpakken…";
/* the unit for gigabytes */
"GB" = "GB";
@@ -51,7 +51,7 @@
"Install and Relaunch" = "Installeer en herstart";
/* Take care not to overflow the status window. */
"Installing update..." = "Update installeren …";
"Installing update..." = "Update installeren…";
/* the unit for kilobytes */
"KB" = "KB";
@@ -66,19 +66,19 @@
"Ready to Install" = "Klaar om te installeren";
/* Message that is optionally shown at startup to allow users to turn on/off update checks. */
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Zou %1$@ automatisch op updates moeten controleren? U kunt altijd nog handmatig controleren op updates via het %1$@ menu.";
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Wil je dat %1$@ automatisch naar updates zoekt? Je kunt altijd nog handmatig zoeken naar updates via het %1$@-menu.";
"Update Error!" = "Update-fout!";
"Update Error!" = "Fout bij het bijwerken!";
"Updating %@" = "%@ updaten";
"Updating %@" = "%@ bijwerken…";
/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */
"You already have the newest version of %@." = "U heeft al de nieuwste versie van %@.";
"You already have the newest version of %@." = "Je hebt al de nieuwste versie van %@.";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You're up-to-date!" = "U heeft de nieuwste versie!";
"You're up-to-date!" = "Je hebt de nieuwste versie!";
/* Alternative name for "Install" button if we have a paid update or other update
without a download but with a URL. */
"Learn More..." = "Meer informatie …";
"Learn More..." = "Meer informatie…";
+11 -11
View File
@@ -7,48 +7,48 @@ import Foundation
func loadPrivateKey(privateKeyPath: URL) throws -> SecKey {
let data = try Data(contentsOf: privateKeyPath);
var cfitems: CFArray? = nil;
var format = SecExternalFormat.formatOpenSSL;
var type = SecExternalItemType.itemTypePrivateKey;
let status = SecItemImport(data as CFData, nil, &format, &type, SecItemImportExportFlags(rawValue: UInt32(0)), nil, nil, &cfitems);
if (status != errSecSuccess || cfitems == nil) {
print("Private DSA key could not be imported", status);
print("Private DSA key file", privateKeyPath, "exists, but it could not be read. SecItemImport error", status);
throw NSError(domain: SUSparkleErrorDomain, code: Int(OSStatus(SUError.signatureError.rawValue)), userInfo: nil);
}
if (format != SecExternalFormat.formatOpenSSL || type != SecExternalItemType.itemTypePrivateKey) {
throw makeError(code: .signatureError, "Not an OpensSSL private key \(format) \(type)");
}
return (cfitems as! NSArray)[0] as! SecKey;
return (cfitems! as NSArray)[0] as! SecKey;
}
func dsaSignature(path: URL, privateKey: SecKey) throws -> String {
var error: Unmanaged<CFError>?;
let stream = InputStream(fileAtPath:path.path)!;
let dataReadTransform = SecTransformCreateReadTransformWithReadStream(stream);
let dataDigestTransform = SecDigestTransformCreate(kSecDigestSHA1, 20, nil);
guard let dataSignTransform = SecSignTransformCreate(privateKey, &error) else {
print("can't use the key");
throw error!.takeRetainedValue();
}
let group = SecTransformCreateGroupTransform();
SecTransformConnectTransforms(dataReadTransform, kSecTransformOutputAttributeName, dataDigestTransform, kSecTransformInputAttributeName, group, &error);
if (error != nil) {
throw error!.takeRetainedValue();
}
SecTransformConnectTransforms(dataDigestTransform, kSecTransformOutputAttributeName, dataSignTransform, kSecTransformInputAttributeName, group, &error);
if (error != nil) {
throw error!.takeRetainedValue();
}
let result = SecTransformExecute(group, &error) as! Data;
return result.base64EncodedString();
}
+3 -3
View File
@@ -49,7 +49,7 @@ func writeAppcast(appcastDestPath: URL, updates: [ArchiveItem]) throws {
XMLNode.Options.nodePreserveCDATA,
XMLNode.Options.nodePreserveWhitespace,
];
doc = try XMLDocument(contentsOf: appcastDestPath, options: Int(options.rawValue));
doc = try XMLDocument(contentsOf: appcastDestPath, options: options);
} catch {
let root = XMLElement(name: "rss");
root.addAttribute(XMLNode.attribute(withName: "xmlns:sparkle", stringValue: sparkleNS) as! XMLNode);
@@ -184,7 +184,7 @@ func writeAppcast(appcastDestPath: URL, updates: [ArchiveItem]) throws {
}
let options = XMLNode.Options.nodeCompactEmptyElement;
let docData = doc.xmlData(withOptions:Int(options.rawValue));
let _ = try XMLDocument(data: docData, options:0); // Verify that it was generated correctly, which does not always happen!
let docData = doc.xmlData(options:options);
let _ = try XMLDocument(data: docData, options:XMLNode.Options()); // Verify that it was generated correctly, which does not always happen!
try docData.write(to: appcastDestPath);
}