Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-22 15:07:33 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-09-26 22:04:24 (GMT) |
| commit | 05fbe78f5c3b30517f7152b37c157a99120682dc (patch) | |
| tree | 865ffa3fdcf73d8044c3478ef8e52b159c3fc738 /SwifTools/AutoUpdater/SparkleAutoUpdater.mm | |
| parent | 82d4ca00958d6d097aee830ac300ecfd9014d2b3 (diff) | |
| download | swift-05fbe78f5c3b30517f7152b37c157a99120682dc.zip swift-05fbe78f5c3b30517f7152b37c157a99120682dc.tar.bz2 | |
Update and tidy up Sparkle software update support
Sparkle is configured to do silent automatic background
updates based on the provide appcast feed. When a new update
was downloaded and is ready to be installed Swift notifies
the user that they can restart to take advantage of the newly
available version.
Test-Information:
Setup a custom appcast feed with a newer Swift dev release.
Tested updating with Sparkle 1.14.0 binary release using DSA
keys and signatures. Did not test Sparkle update with code
signed Swift builds. Tested on macOS 10.12.
Change-Id: Idad461ec53963c80990e51a502cb6e28bc7b6b4e
Diffstat (limited to 'SwifTools/AutoUpdater/SparkleAutoUpdater.mm')
| -rw-r--r-- | SwifTools/AutoUpdater/SparkleAutoUpdater.mm | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm index bcd1388..7e06b2f 100644 --- a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm +++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm @@ -1,13 +1,24 @@ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #include <SwifTools/AutoUpdater/SparkleAutoUpdater.h> #include <Cocoa/Cocoa.h> #include <Sparkle/Sparkle.h> +#include <SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h> +#include <SwifTools/Cocoa/CocoaUtil.h> + namespace Swift { class SparkleAutoUpdater::Private { public: SUUpdater* updater; + boost::intrusive_ptr<SparkleAutoUpdaterDelegate> delegate; + bool restartToUpdate = false; }; SparkleAutoUpdater::SparkleAutoUpdater(const std::string& url) { @@ -15,20 +26,36 @@ SparkleAutoUpdater::SparkleAutoUpdater(const std::string& url) { d->updater = [SUUpdater sharedUpdater]; [d->updater retain]; + + d->delegate = boost::intrusive_ptr<SparkleAutoUpdaterDelegate>([[SparkleAutoUpdaterDelegate alloc] init], false); + [d->delegate.get() setUpdateDownloadFinished: [&](){ + d->restartToUpdate = true; + onSuggestRestartToUserToUpdate(); + }]; + [d->updater setDelegate: d->delegate.get()]; + [d->updater setAutomaticallyChecksForUpdates: true]; + // Automatically check for an update after a day. + [d->updater setUpdateCheckInterval: 86400]; + [d->updater setAutomaticallyDownloadsUpdates: true]; - NSURL* nsurl = [NSURL URLWithString: - [NSString stringWithUTF8String: url.c_str()]]; + NSURL* nsurl = [NSURL URLWithString: std2NSString(url)]; [d->updater setFeedURL: nsurl]; } SparkleAutoUpdater::~SparkleAutoUpdater() { [d->updater release]; delete d; + SWIFT_LOG(warning) << std::endl; } void SparkleAutoUpdater::checkForUpdates() { + //[d->updater resetUpdateCycle]; // This is useful for testing to force a check ot start. [d->updater checkForUpdatesInBackground]; } +bool SparkleAutoUpdater::recommendRestartToUpdate() { + return d->restartToUpdate; +} + } |