refactor: gracefully stop during engine startup

mobile/android/app/src/main/kotlin/app/alextran/immich/ImmichApp.kt

@@ -23,6 +23,6 @@ class ImmichApp : Application() {
       // as the previous start might have been killed without unlocking.
       if (BackgroundEngineLock.connectEngines > 0) return@postDelayed
       BackgroundWorkerApiImpl.enqueueBackgroundWorker(this)
-    }, 5000)
+    }, 15000)
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.kt

@@ -15,6 +15,7 @@ import androidx.work.ListenableWorker
 import androidx.work.WorkerParameters
 import app.alextran.immich.MainActivity
 import app.alextran.immich.R
+import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
 import io.flutter.FlutterInjector
@@ -61,6 +62,11 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
   }
 
   override fun startWork(): ListenableFuture<Result> {
+    if (BackgroundWorkerPreferences(ctx).isLocked() && BackgroundEngineLock.connectEngines > 0) {
+      Log.i(TAG, "Foreground engine active, skipping background worker")
+      return Futures.immediateFuture(Result.success())
+    }
+
     Log.i(TAG, "Starting background upload worker")
 
     if (!loader.initialized()) {
@@ -77,6 +83,10 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
     showNotification(notificationConfig.first, notificationConfig.second)
 
     loader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
+      if (isStopped || isComplete) {
+        return@ensureInitializationCompleteAsync
+      }
+
       engine = FlutterEngine(ctx)
       FlutterEngineCache.getInstance().put(BackgroundWorkerApiImpl.ENGINE_CACHE_KEY, engine!!)
 
@@ -143,11 +153,17 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
       return
     }
 
+    val api = flutterApi
+    if (api == null) {
+      Handler(Looper.getMainLooper()).postAtFrontOfQueue {
+        complete(Result.failure())
+      }
+      return
+    }
+
     Handler(Looper.getMainLooper()).postAtFrontOfQueue {
-      if (flutterApi != null) {
+      api.cancel {
-        flutterApi?.cancel {
+        complete(Result.failure())
-          complete(Result.failure())
-        }
       }
     }
 

web/src/lib/components/assets/thumbnail/Thumbnail.svelte

@@ -44,7 +44,7 @@
     brokenAssetClass?: ClassValue;
     dimmed?: boolean;
     albumUsers?: UserResponseDto[];
-    onClick?: (asset: TimelineAsset) => void;
+    onClick?: (asset: TimelineAsset, event?: MouseEvent) => void;
     onPreview?: (asset: TimelineAsset) => void;
     onSelect?: (asset: TimelineAsset) => void;
     onMouseEvent?: (event: { isMouseOver: boolean; selectedGroupIndex: number }) => void;
@@ -93,12 +93,12 @@
     }
   };
 
-  const callClickHandlers = () => {
+  const callClickHandlers = (e?: MouseEvent) => {
     if (selected) {
-      onIconClickedHandler();
+      onIconClickedHandler(e);
       return;
     }
-    onClick?.($state.snapshot(asset));
+    onClick?.($state.snapshot(asset), e);
   };
 
   const handleClick = (e: MouseEvent) => {
@@ -109,7 +109,7 @@
 
     e.stopPropagation();
     e.preventDefault();
-    callClickHandlers();
+    callClickHandlers(e);
   };
 
   const onMouseEnter = () => {

web/src/lib/components/timeline/Timeline.svelte

@@ -59,6 +59,7 @@
         groupTitle: string,
         asset: TimelineAsset,
       ) => void,
+      event?: MouseEvent,
     ) => void;
   }
 
@@ -685,9 +686,9 @@
                 {asset}
                 {albumUsers}
                 {groupIndex}
-                onClick={(asset) => {
+                onClick={(asset, event) => {
                   if (typeof onThumbnailClick === 'function') {
-                    onThumbnailClick(asset, timelineManager, timelineDay, _onClick);
+                    onThumbnailClick(asset, timelineManager, timelineDay, _onClick, event);
                   } else {
                     _onClick(timelineManager, timelineDay.getAssets(), timelineDay.groupTitle, asset);
                   }

web/src/routes/(user)/utilities/geolocation/+page.svelte

@@ -118,7 +118,12 @@
       groupTitle: string,
       asset: TimelineAsset,
     ) => void,
+    event?: MouseEvent,
   ) => {
+    if (event?.shiftKey) {
+      onClick(timelineManager, timelineDay.getAssets(), timelineDay.groupTitle, asset);
+      return;
+    }
     if (hasGps(asset)) {
       locationUpdated = true;
       setTimeout(() => {

web/svelte.config.js

@@ -16,7 +16,7 @@ const config = {
   preprocess: vitePreprocess(),
   kit: {
     version: {
-      name: process.env.IMMICH_BUILD || Date.now().toString(),
+      name: process.env.IMMICH_BUILD || process.env.npm_package_version || 'local',
     },
     paths: {
       relative: false,