move flatpak portal management code entirely to it, other small fixes

Signed-off-by: Andrew Bernal <[email protected]>

Author: Zinkelburger

app/main.js

@@ -348,6 +348,7 @@ async function initialize (isAppStart = true) {
     } catch (error) {
       log.error('Stretchly: error creating images directory', error)
     }
+  }
   // Initialize portal early for Flatpak so it's ready when user opens preferences
   if (process.platform === 'linux' && insideFlatpak()) {
     autostartManager.flatpakPortalManager.initialize().catch(err => {

app/utils/autostartManager.js

@@ -13,50 +13,23 @@ class AutostartManager {
     this.platform = platform
     this.windowsStore = windowsStore
     this.app = app
-    this.settings = settings
-    this.flatpakPortalManager = new FlatpakPortalManager()
 
-    // Decide the Linux autostart strategy once during construction
-    if (this.platform === 'linux') {
-      if (insideFlatpak()) {
-        this._linuxAutoLaunch = this._createFlatpakAutostarter()
-      } else {
-        this._linuxAutoLaunch = new AutoLaunch({ name: 'stretchly' })
-      }
-    }
-  }
+    this.isFlatpak = this.platform === 'linux' && insideFlatpak()
 
-  _createFlatpakAutostarter () {
-    return {
-      enable: async () => {
-        try {
-          await this.flatpakPortalManager.initialize()
-          await this.flatpakPortalManager.setAutostart(true)
-          this.settings.set('flatpakAutostart', true)
-        } catch (error) {
-          log.error('Stretchly: Failed to set autostart (enable) via XDG Portal', error)
-        }
-      },
-      disable: async () => {
-        try {
-          await this.flatpakPortalManager.initialize()
-          await this.flatpakPortalManager.setAutostart(false)
-          this.settings.set('flatpakAutostart', false)
-        } catch (error) {
-          log.error('Stretchly: Failed to set autostart (disable) via XDG Portal', error)
-        }
-      },
-      isEnabled: async () => {
-        // XDG portals don't provide a reliable query method, so we read from our cache
-        return Promise.resolve(this.settings.get('flatpakAutostart', false))
-      }
+    if (this.isFlatpak) {
+      this.flatpakPortalManager = new FlatpakPortalManager(settings)
+    } else if (this.platform === 'linux') {
+      this.nativeAutoLauncher = new AutoLaunch({ name: 'stretchly' })
     }
   }
 
   async setAutostartEnabled (value) {
-    log.info(`Stretchly: setting autostart to ${value} on ${this.platform}${this.platform === 'win32' && this.windowsStore ? ' (Windows Store)' : ''}${insideFlatpak() && this.platform === 'linux' ? ' (Flatpak)' : ''}`)
-    if (this.platform === 'linux') {
-      await (value ? this._linuxAutoLaunch.enable() : this._linuxAutoLaunch.disable())
+    log.info(`Stretchly: setting autostart to ${value} on ${this.platform}${this.platform === 'win32' && this.windowsStore ? ' (Windows Store)' : ''}${this.isFlatpak ? ' (Flatpak)' : ''}`)
+
+    if (this.isFlatpak) {
+      await (value ? this.flatpakPortalManager.enableAutostart() : this.flatpakPortalManager.disableAutostart())
+    } else if (this.platform === 'linux') {
+      await (value ? this.nativeAutoLauncher.enable() : this.nativeAutoLauncher.disable())
     } else if (this.platform === 'win32' && this.windowsStore) {
       await (value ? this._windowsStoreAutoLaunch.enable() : this._windowsStoreAutoLaunch.disable())
     } else {
@@ -65,8 +38,10 @@ class AutostartManager {
   }
 
   async autoLaunchStatus () {
-    if (this.platform === 'linux') {
-      return await this._linuxAutoLaunch.isEnabled()
+    if (this.isFlatpak) {
+      return await this.flatpakPortalManager.isAutostartEnabled()
+    } else if (this.platform === 'linux') {
+      return await this.nativeAutoLauncher.isEnabled()
     } else if (this.platform === 'win32' && this.windowsStore) {
       return await this._windowsStoreAutoLaunch.isEnabled()
     } else {

app/utils/defaultSettings.js

@@ -80,5 +80,6 @@ export default {
   hidePreferencesFileLocation: false,
   hideStrictModePreferences: false,
   miniBreakManualFinish: false,
-  longBreakManualFinish: false
+  longBreakManualFinish: false,
+  flatpakAutostart: false
 }

app/utils/flatpakPortalManager.js

@@ -4,7 +4,8 @@ import log from 'electron-log/main.js'
 const { Variant } = dbus
 
 class FlatpakPortalManager {
-  constructor () {
+  constructor (settings) {
+    this.settings = settings
     this.bus = null
     this.portal = null
     this.initialized = false
@@ -34,7 +35,6 @@ class FlatpakPortalManager {
     } catch (error) {
       log.error('Stretchly: Failed to initialize XDG Background Portal:', error)
       this.initialized = false
-      throw error
     }
   }
 
@@ -46,6 +46,11 @@ class FlatpakPortalManager {
   async setAutostart (enabled) {
     await this.initialize()
 
+    if (!this.initialized) {
+      log.error('Stretchly: Cannot set autostart - portal not initialized')
+      return false
+    }
+
     try {
       const background = this.portal.getInterface('org.freedesktop.portal.Background')
       const handleToken = `stretchly_autostart_${Date.now()}_${Math.random().toString(36).substring(7)}`
@@ -131,10 +136,33 @@ class FlatpakPortalManager {
       })
     } catch (error) {
       log.error(`Stretchly: Failed to set autostart=${enabled} via XDG Portal:`, error)
-      throw error
+      return false
+    }
+  }
+
+  async enableAutostart () {
+    try {
+      await this.setAutostart(true)
+      this.settings.set('flatpakAutostart', true)
+    } catch (error) {
+      log.error('Stretchly: Failed to set autostart (enable) via XDG Portal', error)
     }
   }
 
+  async disableAutostart () {
+    try {
+      await this.setAutostart(false)
+      this.settings.set('flatpakAutostart', false)
+    } catch (error) {
+      log.error('Stretchly: Failed to set autostart (disable) via XDG Portal', error)
+    }
+  }
+
+  async isAutostartEnabled () {
+    // XDG portals don't provide a reliable query method, so we read from our cache
+    return this.settings.get('flatpakAutostart')
+  }
+
   disconnect () {
     if (this.bus) {
       this.bus.disconnect()