Auto-reenable login item after upgrade

Author: warkcod

README.md

@@ -85,7 +85,7 @@ The active development builds are produced on macOS 15 (Sequoia) and officially
 
 ### Upgrading
 
-Each DMG bundles an `Upgrade SlowQuitApps.app` helper. Double-click it to stop the running helper, copy the bundled build into `/Applications` (macOS may prompt for your password), and relaunch SlowQuitApps so you can re-enable auto-start. You can still upgrade manually by disabling SlowQuitAppsLauncher under System Settings → General → Login Items, quitting the app, dragging the new `.app` into `/Applications`, and turning the login item back on afterward.
+Each DMG bundles an `Upgrade SlowQuitApps.app` helper. Double-click it to stop the running helper, copy the bundled build into `/Applications` (macOS may prompt for your password), and relaunch SlowQuitApps with auto-start automatically re-enabled. You can still upgrade manually by disabling SlowQuitAppsLauncher under System Settings → General → Login Items, quitting the app, dragging the new `.app` into `/Applications`, and turning the login item back on afterward.
 
 ## Customization
 

SlowQuitApps/SQAAppDelegate.m

@@ -49,6 +49,10 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     if ([SQAPreferences disableAutostart]) {
         [SQAAutostart disable];
         [dialogs informAutoStartDisabled];
+    } else if ([SQAPreferences pendingAutoEnable]) {
+        if (![SQAAutostart enable]) {
+            [dialogs informLoginItemRegistrationFailure];
+        }
     } else if (![SQAAutostart isEnabled]) {
         [dialogs askAboutAutoStart];
     }

SlowQuitApps/SQAAutostart.m

@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import "SQAPreferences.h"
 @import ServiceManagement;
 #import "SQAAutostart.h"
 
@@ -66,11 +67,20 @@ + (BOOL)shouldRegisterLoginItem:(BOOL)enabled {
 
 
 + (BOOL)enable {
-    return [self shouldRegisterLoginItem:YES];
+    BOOL result = [self shouldRegisterLoginItem:YES];
+    if (result) {
+        [SQAPreferences setDisableAutostart:NO];
+        [SQAPreferences setPendingAutoEnable:NO];
+    }
+    return result;
 }
 
 + (BOOL)disable {
-    return [self shouldRegisterLoginItem:NO];
+    BOOL result = [self shouldRegisterLoginItem:NO];
+    if (result) {
+        [SQAPreferences setDisableAutostart:YES];
+    }
+    return result;
 }
 
 + (BOOL)isRunningFromReadOnlyLocation {

SlowQuitApps/SQADialogs.h

@@ -6,6 +6,7 @@
 - (void)informHotkeyRegistrationFailure;
 - (void)informAccessibilityRequirement;
 - (void)informMoveToApplicationsRequirement;
+- (void)informLoginItemRegistrationFailure;
 - (void)informAutoStartDisabled;
 - (void)promptToReEnableAutoStart;
 

SlowQuitApps/SQAPreferences.h

@@ -7,5 +7,8 @@
 + (BOOL)invertList;
 + (BOOL)displayOverlay;
 + (BOOL)disableAutostart;
++ (void)setDisableAutostart:(BOOL)value;
++ (BOOL)pendingAutoEnable;
++ (void)setPendingAutoEnable:(BOOL)value;
 
 @end

SlowQuitApps/SQAPreferences.m

@@ -11,7 +11,8 @@ + (NSUserDefaults *)defaults {
                                  @"whitelist": @[],
                                  @"invertList": @NO,
                                  @"displayOverlay": @YES,
-                                 @"disableAutostart": @NO
+                                 @"disableAutostart": @NO,
+                                 @"pendingAutoEnable": @NO
                                  };
       [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
         defaultsRegistered = YES;
@@ -58,4 +59,16 @@ + (BOOL)disableAutostart {
     return [[self defaults] boolForKey:@"disableAutostart"];
 }
 
++ (void)setDisableAutostart:(BOOL)value {
+    [[self defaults] setBool:value forKey:@"disableAutostart"];
+}
+
++ (BOOL)pendingAutoEnable {
+    return [[self defaults] boolForKey:@"pendingAutoEnable"];
+}
+
++ (void)setPendingAutoEnable:(BOOL)value {
+    [[self defaults] setBool:value forKey:@"pendingAutoEnable"];
+}
+
 @end

build-dmg.sh

@@ -127,7 +127,6 @@ CONSOLE_UID=$(id -u "$CONSOLE_USER")
 echo "== SlowQuitApps Upgrade Assistant =="
 echo ""
 echo "Stopping running instances..."
-sudo -u "$CONSOLE_USER" defaults write com.dteoh.SlowQuitApps disableAutostart -bool YES >/dev/null 2>&1 || true
 pkill -x SlowQuitApps >/dev/null 2>&1 || true
 pkill -x SlowQuitAppsLauncher >/dev/null 2>&1 || true
 launchctl bootout gui/${CONSOLE_UID}/com.dteoh.SlowQuitAppsLauncher >/dev/null 2>&1 || true
@@ -137,12 +136,18 @@ echo "Copying new version to /Applications (password might be required)..."
 rm -rf "$DST_PATH"
 ditto "$SRC_PATH" "$DST_PATH"
 
+echo ""
+echo "Requesting auto-start re-enable on next launch..."
+sudo -u "$CONSOLE_USER" defaults delete com.dteoh.SlowQuitApps disableAutostart >/dev/null 2>&1 || true
+sudo -u "$CONSOLE_USER" defaults write com.dteoh.SlowQuitApps disableAutostart -bool NO >/dev/null 2>&1
+sudo -u "$CONSOLE_USER" defaults write com.dteoh.SlowQuitApps pendingAutoEnable -bool YES >/dev/null 2>&1
+
 echo ""
 echo "Relaunching SlowQuitApps..."
 sudo -u "$CONSOLE_USER" open "$DST_PATH"
 
 echo ""
-echo "Upgrade complete. You can re-enable auto-start from SlowQuitApps if needed."
+echo "Upgrade complete. Auto-start will be re-enabled automatically on next launch."
 SCRIPT
 chmod +x "${UPGRADE_APP}/Contents/Resources/upgrade-helper.sh"
 
@@ -156,7 +161,7 @@ Install:
 2. Launch the app, grant Accessibility permissions, and enable auto-start if desired.
 
 Upgrade:
-1. Double-click "Upgrade SlowQuitApps.app". It stops running helpers, copies this build into /Applications (macOS may prompt for your password), and relaunches the updated app.
+1. Double-click "Upgrade SlowQuitApps.app". It stops running helpers, copies this build into /Applications (macOS may prompt for your password), and relaunches the updated app with auto-start queued to re-enable automatically.
 2. Alternatively, disable SlowQuitAppsLauncher in System Settings → General → Login Items, quit SlowQuitApps, replace the .app manually, then re-enable auto-start.
 DOC