Add optional updaterDidRelaunchApplication: method on SUUpdaterDelega…

…te (sparkle-project#1115) * Added updaterDidRelaunchApplication: delegate method. * Removed isUpdaterRelaunching property. * Revert SUHost.
DevMate · Aug 7, 2017 · 7c8ff2b · 7c8ff2b
1 parent 43b4472
commit 7c8ff2b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 0 deletions.
diff --git a/Sparkle/SUBasicUpdateDriver.m b/Sparkle/SUBasicUpdateDriver.m
@@ -577,6 +577,9 @@ - (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)
         }
     }
 
+    //Set relaunching flag.
+    [self.host setBool:YES forUserDefaultsKey:SUUpdateRelaunchingMarkerKey];
+
     [NSTask launchedTaskWithLaunchPath:relaunchToolPath arguments:@[[self.host bundlePath],
                                                                     pathToRelaunch,
                                                                     [NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]],

diff --git a/Sparkle/SUConstants.h b/Sparkle/SUConstants.h
@@ -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;

diff --git a/Sparkle/SUConstants.m b/Sparkle/SUConstants.m
@@ -26,6 +26,7 @@
 NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
 
 NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore";
+NSString *const SUUpdateRelaunchingMarkerKey = @"SUUpdateRelaunchingMarker";
 NSString *const SUFeedURLKey = @"SUFeedURL";
 NSString *const SUShowReleaseNotesKey = @"SUShowReleaseNotes";
 NSString *const SUSkippedVersionKey = @"SUSkippedVersion";

diff --git a/Sparkle/SUHost.h b/Sparkle/SUHost.h
diff --git a/Sparkle/SUHost.m b/Sparkle/SUHost.m
diff --git a/Sparkle/SUUpdater.m b/Sparkle/SUUpdater.m
@@ -208,6 +208,14 @@ - (void)startUpdateCycle
     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];

diff --git a/Sparkle/SUUpdaterDelegate.h b/Sparkle/SUUpdaterDelegate.h
@@ -192,6 +192,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.