7 files changed, 186 insertions, 42 deletions
diff --git a/SwifTools/AutoUpdater/AutoUpdater.h b/SwifTools/AutoUpdater/AutoUpdater.h
index 12abc22..274bf50 100644
--- a/SwifTools/AutoUpdater/AutoUpdater.h
+++ b/SwifTools/AutoUpdater/AutoUpdater.h
@@ -1,16 +1,30 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <string>
+
+#include <boost/signals2.hpp>
+
 namespace Swift {
-	class AutoUpdater {
-		public:
-			virtual ~AutoUpdater();
+    class AutoUpdater {
+        public:
+            virtual ~AutoUpdater();
+
+            virtual void setAppcastFeed(const std::string& appcastFeed) = 0;
+            virtual void checkForUpdates() = 0;
+            virtual bool recommendRestartToUpdate() = 0;
 
-			virtual void checkForUpdates() = 0;
-	};
+        public:
+            /**
+             * Emit this signal if a new version of the software has been downloaded
+             * and the user needs to be notified so they can quit the app and start
+             * the newer version.
+             */
+            boost::signals2::signal<void()> onSuggestRestartToUserToUpdate;
+    };
 }
diff --git a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
index 424c6e0..9ae8c09 100644
--- a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
+++ b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -16,18 +16,18 @@ namespace Swift {
 
 bool PlatformAutoUpdaterFactory::isSupported() const {
 #ifdef HAVE_SPARKLE
-	return true;
+    return true;
 #else
-	return false;
+    return false;
 #endif
 }
 
 AutoUpdater* PlatformAutoUpdaterFactory::createAutoUpdater(const std::string& appcastURL) {
 #ifdef HAVE_SPARKLE
-	return new SparkleAutoUpdater(appcastURL);
+    return new SparkleAutoUpdater(appcastURL);
 #else
-	(void) appcastURL;
-	return NULL;
+    (void) appcastURL;
+    return nullptr;
 #endif
 }
 
diff --git a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
index 24a2f21..9942d6a 100644
--- a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
+++ b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
@@ -7,12 +7,12 @@
 #include <string>
 
 namespace Swift {
-	class AutoUpdater;
+    class AutoUpdater;
 
-	class PlatformAutoUpdaterFactory {
-		public:
-			bool isSupported() const;
+    class PlatformAutoUpdaterFactory {
+        public:
+            bool isSupported() const;
 
-			AutoUpdater* createAutoUpdater(const std::string& appcastURL);
-	};
+            AutoUpdater* createAutoUpdater(const std::string& appcastURL);
+    };
 }
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.h b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
index 4951342..dd22e73 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.h
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
@@ -1,24 +1,34 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <memory>
 #include <string>
+
 #include <SwifTools/AutoUpdater/AutoUpdater.h>
 
 namespace Swift {
-	class SparkleAutoUpdater : public AutoUpdater {
-		public:
-			SparkleAutoUpdater(const std::string& url);
-			~SparkleAutoUpdater();
+    /**
+     * @brief The SparkleAutoUpdater class provides integration with Sparkle.
+     * This enables automatic silent background updates. If using this in Qt you
+     * need to emit a NSApplicationWillTerminateNotification before you quit
+     * the application.
+     */
+    class SparkleAutoUpdater : public AutoUpdater {
+        public:
+            SparkleAutoUpdater(const std::string& appcastFeed);
+            ~SparkleAutoUpdater();
+
+            void setAppcastFeed(const std::string& appcastFeed);
+            void checkForUpdates();
+            bool recommendRestartToUpdate();
 
-			void checkForUpdates();
-		
-		private:
-			class Private;
-			Private* d;
-	};
+        private:
+            class Private;
+            const std::unique_ptr<Private> d;
+    };
 }
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
index c35abc8..0c296ee 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
@@ -1,34 +1,62 @@
+/*
+ * 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;
+    public:
+        SUUpdater* updater;
+        boost::intrusive_ptr<SparkleAutoUpdaterDelegate> delegate;
+        bool restartToUpdate = false;
 };
 
-SparkleAutoUpdater::SparkleAutoUpdater(const std::string& url) {
-	d = new Private;
+SparkleAutoUpdater::SparkleAutoUpdater(const std::string& appcastFeed) : d(new Private()) {
+    d->updater = [SUUpdater sharedUpdater];
+    [d->updater retain];
 
-	d->updater = [SUUpdater sharedUpdater];
-	[d->updater retain];
-	[d->updater setAutomaticallyChecksForUpdates: true];
+    d->delegate = boost::intrusive_ptr<SparkleAutoUpdaterDelegate>([[SparkleAutoUpdaterDelegate alloc] init], false);
+    [d->delegate.get() setUpdateDownloadFinished: [&](){
+        d->restartToUpdate = true;
+        onSuggestRestartToUserToUpdate();
+    }];
+    [d->updater setDelegate: d->delegate.get()];
 
-	NSURL* nsurl = [NSURL URLWithString:
-			[NSString stringWithUTF8String: url.c_str()]];
-	[d->updater setFeedURL: nsurl];
+    [d->updater setAutomaticallyChecksForUpdates: true];
+    // Automatically check for an update after a day.
+    [d->updater setUpdateCheckInterval: 86400];
+    [d->updater setAutomaticallyDownloadsUpdates: true];
+
+    NSURL* nsurl = [NSURL URLWithString: std2NSString(appcastFeed)];
+    [d->updater setFeedURL: nsurl];
 }
 
 SparkleAutoUpdater::~SparkleAutoUpdater() {
-	[d->updater release];
-	delete d;
+    [d->updater release];
+}
+
+void SparkleAutoUpdater::setAppcastFeed(const std::string& appcastFeed) {
+    NSURL* nsurl = [NSURL URLWithString: std2NSString(appcastFeed)];
+    [d->updater setFeedURL: nsurl];
 }
 
 void SparkleAutoUpdater::checkForUpdates() {
-	[d->updater checkForUpdatesInBackground];
+    [d->updater resetUpdateCycle];
+    [d->updater checkForUpdatesInBackground];
+}
+
+bool SparkleAutoUpdater::recommendRestartToUpdate() {
+    return d->restartToUpdate;
 }
 
 }
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h
new file mode 100644
index 0000000..8f408de
--- /dev/null
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <functional>
+
+#import <Cocoa/Cocoa.h>
+
+#import <Sparkle/Sparkle.h>
+
+namespace Swift {
+    class SparkleAutoUpdater;
+}
+
+@interface SparkleAutoUpdaterDelegate : NSObject<SUUpdaterDelegate>
+@property (atomic)  std::function< void ()> updateDownloadFinished;
+
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update;
+
+- (id <SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+- (void)updaterDidNotFindUpdate:(SUUpdater *)update;
+
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
+
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+@end
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
new file mode 100644
index 0000000..6e832ba
--- /dev/null
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#import "SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h"
+
+#include <string>
+
+#include <Swiften/Base/Log.h>
+
+#include <SwifTools/Cocoa/CocoaUtil.h>
+
+using namespace Swift;
+
+@implementation SparkleAutoUpdaterDelegate
+
+@synthesize updateDownloadFinished;
+
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast {
+    (void)updater;
+    (void)appcast;
+}
+
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update {
+    (void)updater;
+    (void)update;
+}
+
+- (id <SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater {
+    (void)updater;
+    return nil;
+}
+
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater {
+    (void)updater;
+}
+
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {
+    (void)updater;
+    (void)update;
+}
+
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation {
+    (void)updater;
+    (void)item;
+    (void)invocation;
+    updateDownloadFinished();
+}
+
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error {
+    (void)updater;
+    SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl;
+}
+
+@end