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) {
-        flutterApi?.cancel {
-          complete(Result.failure())
-        }
+      api.cancel {
+        complete(Result.failure())
       }
     }
 

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
-import android.net.Uri
+import androidx.exifinterface.media.ExifInterface
 import android.os.Build
 import android.os.Bundle
 import android.os.ext.SdkExtensions
@@ -30,7 +30,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import java.io.File
-import java.io.InputStream
 import java.security.MessageDigest
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -53,7 +52,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
     private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
     private val hashSemaphore = Semaphore(MAX_CONCURRENT_HASH_OPERATIONS)
     private const val HASHING_CANCELLED_CODE = "HASH_CANCELLED"
-    private const val HASH_ORIGINAL_UNAVAILABLE_CODE = "HASH_ORIGINAL_UNAVAILABLE"
     private const val SYNC_CANCELLED_CODE = "SYNC_CANCELLED"
 
     // MediaStore.Files.FileColumns.SPECIAL_FORMAT — S Extensions 21+
@@ -277,7 +275,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
       } catch (e: Exception) {
         Log.w(TAG, "Failed to parse image header for asset $assetId", e)
       }
-      // if mimeType is webp but not animated, it's just an image.
+      // if mimeType is webp but not animated, its just an image.
       return PlatformAssetPlaybackStyle.IMAGE
     }
 
@@ -379,11 +377,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
     )?.use { cursor -> cursor.count.toLong() } ?: 0L
 
 
-  fun getAssetsForAlbum(
-    albumId: String,
-    updatedTimeCond: Long?,
-    callback: (Result<List<PlatformAsset>>) -> Unit
-  ) {
+  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?, callback: (Result<List<PlatformAsset>>) -> Unit) {
     runSync(callback) { getAssetsForAlbum(albumId, updatedTimeCond) }
   }
 
@@ -425,7 +419,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
         }.awaitAll()
 
         completeWhenActive(callback, Result.success(results))
-      } catch (_: CancellationException) {
+      } catch (e: CancellationException) {
         completeWhenActive(
           callback, Result.failure(
             FlutterError(
@@ -442,63 +436,31 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
   }
 
   private suspend fun hashAsset(assetId: String): HashResult {
-    val digest = MessageDigest.getInstance("SHA-1")
-    openOriginalStream(assetId).use { inputStream ->
-      var bytesRead: Int
-      val buffer = ByteArray(HASH_BUFFER_SIZE)
-      while (inputStream.read(buffer).also { bytesRead = it } > 0) {
-        currentCoroutineContext().ensureActive()
-        digest.update(buffer, 0, bytesRead)
-      }
-    }
-
-    val hashString = Base64.encodeToString(digest.digest(), Base64.NO_WRAP)
-    return HashResult(assetId, null, hashString)
-  }
-
-  private fun openOriginalStream(assetId: String): InputStream {
-    val id = assetId.toLong()
-    val collection = when (getMediaType(id)) {
-      MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-      else -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-    }
-    var uri: Uri = ContentUris.withAppendedId(collection, id)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      uri = MediaStore.setRequireOriginal(uri)
-    }
-
     return try {
-      ctx.contentResolver.openInputStream(uri)
-        ?: throw FlutterError(
-          HASH_ORIGINAL_UNAVAILABLE_CODE,
-          "Cannot open original stream for asset $assetId",
-          null
-        )
-    } catch (e: FlutterError) {
-      throw e
-    } catch (e: Exception) {
-      throw FlutterError(
-        HASH_ORIGINAL_UNAVAILABLE_CODE,
-        "Failed to open original stream for asset $assetId: ${e.message}",
-        e.stackTraceToString()
+      val assetUri = ContentUris.withAppendedId(
+        MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL),
+        assetId.toLong()
       )
+
+      val digest = MessageDigest.getInstance("SHA-1")
+      ctx.contentResolver.openInputStream(assetUri)?.use { inputStream ->
+        var bytesRead: Int
+        val buffer = ByteArray(HASH_BUFFER_SIZE)
+        while (inputStream.read(buffer).also { bytesRead = it } > 0) {
+          currentCoroutineContext().ensureActive()
+          digest.update(buffer, 0, bytesRead)
+        }
+      } ?: return HashResult(assetId, "Cannot open input stream for asset", null)
+
+      val hashString = Base64.encodeToString(digest.digest(), Base64.NO_WRAP)
+      HashResult(assetId, null, hashString)
+    } catch (e: SecurityException) {
+      HashResult(assetId, "Permission denied accessing asset: ${e.message}", null)
+    } catch (e: Exception) {
+      HashResult(assetId, "Failed to hash asset: ${e.message}", null)
     }
   }
 
-  private fun getMediaType(id: Long): Int =
-    getCursor(
-      MediaStore.VOLUME_EXTERNAL,
-      "${MediaStore.MediaColumns._ID} = ?",
-      arrayOf(id.toString()),
-      arrayOf(MediaStore.Files.FileColumns.MEDIA_TYPE)
-    )?.use { cursor ->
-      if (cursor.moveToFirst()) {
-        cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.MEDIA_TYPE))
-      } else {
-        MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE
-      }
-    } ?: MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE
-
   fun cancelHashing() {
     hashTask?.cancel()
     hashTask = null
@@ -514,11 +476,8 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
     syncJob = CoroutineScope(Dispatchers.IO).launch {
       try {
         completeWhenActive(callback, Result.success(work()))
-      } catch (_: CancellationException) {
-        completeWhenActive(
-          callback,
-          Result.failure(FlutterError(SYNC_CANCELLED_CODE, "Sync cancelled", null))
-        )
+      } catch (e: CancellationException) {
+        completeWhenActive(callback, Result.failure(FlutterError(SYNC_CANCELLED_CODE, "Sync cancelled", null)))
       } catch (e: Exception) {
         completeWhenActive(callback, Result.failure(e))
       }

mobile/lib/domain/services/hash.service.dart

@@ -66,12 +66,11 @@ class HashService {
           await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
         }
       }
-    } on PlatformException catch (e, s) {
+    } on PlatformException catch (e) {
       if (e.code == _kHashCancelledCode) {
         _log.warning("Hashing cancelled by platform");
         return;
       }
-      _log.severe("Native hashing failed: ${e.code}", e, s);
     } catch (e, s) {
       _log.severe("Error during hashing", e, s);
     }