Disable the keyboard shortcut for the install button for scheduled up…

…dates to avoid accidental installs.
sparkle-project · Feb 14, 2017 · 40347c0 · 40347c0
1 parent e1f67cf
commit 40347c0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Sparkle/SUScheduledUpdateDriver.m b/Sparkle/SUScheduledUpdateDriver.m
@@ -56,4 +56,8 @@ - (void)abortUpdateWithError:(NSError *)error
     }
 }
 
+- (BOOL)shouldDisableKeyboardShortcutForInstallButton {
+    return YES;
+}
+
 @end
diff --git a/Sparkle/SUUIBasedUpdateDriver.m b/Sparkle/SUUIBasedUpdateDriver.m
@@ -85,12 +85,20 @@ - (void)didFindValidUpdate
     }
 
     // Only show the update alert if the app is active; otherwise, we'll wait until it is.
-    if ([NSApp isActive])
-        [[self.updateAlert window] makeKeyAndOrderFront:self];
-    else
+    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 {
+    return NO;
+}
+
 - (void)didNotFindUpdate
 {
     id<SUUpdaterPrivate> updater = self.updater;

diff --git a/Sparkle/SUUpdateAlert.h b/Sparkle/SUUpdateAlert.h
@@ -31,6 +31,7 @@ typedef NS_ENUM(NSInteger, SUUpdateAlertChoice) {
 - (IBAction)installUpdate:sender;
 - (IBAction)skipThisVersion:sender;
 - (IBAction)remindMeLater:sender;
+- (void)disableKeyboardShortcutForInstallButton;
 
 @end
 

diff --git a/Sparkle/SUUpdateAlert.m b/Sparkle/SUUpdateAlert.m
@@ -93,6 +93,9 @@ - (instancetype)initWithAppcastItem:(SUAppcastItem *)item host:(SUHost *)aHost c
 
 - (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], [self.host bundlePath]]; }
 
+- (void)disableKeyboardShortcutForInstallButton {
+    self.installButton.keyEquivalent = @"";
+}
 
 - (void)endWithSelection:(SUUpdateAlertChoice)choice
 {