fix: prevent image to change size when interacting

cli/package.json

@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

docs/docs/install/requirements.md

@@ -17,17 +17,12 @@ Hardware and software requirements for Immich:
   - Immich runs well in a virtualized environment when running in a full virtual machine.
     The use of Docker in LXC containers is [not recommended](https://pve.proxmox.com/wiki/Linux_Container), but may be possible for advanced users.
     If you have issues, we recommend that you switch to a supported VM deployment.
-- **RAM**: Minimum 6GB, recommended 8GB.
+- **RAM**: Minimum 4GB, recommended 6GB.
 - **CPU**: Minimum 2 cores, recommended 4 cores.
 - **Storage**: Recommended Unix-compatible filesystem (EXT4, ZFS, APFS, etc.) with support for user/group ownership and permissions.
   - The generation of thumbnails and transcoded video can increase the size of the photo library by 10-20% on average.
 
-:::note RAM requirements
-For a smooth experience, especially during asset upload, Immich requires at least 6GB of RAM.
-For systems with only 4GB of RAM, Immich can be run with machine learning features disabled.
-:::
-
-:::tip Postgres setup
+:::tip
 Good performance and a stable connection to the Postgres database is critical to a smooth Immich experience.
 The Postgres database files are typically between 1-3 GB in size.
 For this reason, the Postgres database (`DB_DATA_LOCATION`) should ideally use local SSD storage, and never a network share of any kind.

e2e/package.json

@@ -27,7 +27,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",

e2e/src/api/specs/database-backups.e2e-spec.ts

@@ -1,350 +0,0 @@
-import { LoginResponseDto, ManualJobName } from '@immich/sdk';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/admin/database-backups', () => {
-  let cookie: string | undefined;
-  let admin: LoginResponseDto;
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-    await utils.resetBackups(admin.accessToken);
-  });
-
-  describe('GET /', async () => {
-    it('should succeed and be empty', async () => {
-      const { status, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        backups: [],
-      });
-    });
-
-    it('should contain a created backup', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.BackupDatabase,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, 'backupDatabase');
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app)
-              .get('/admin/database-backups')
-              .set('Authorization', `Bearer ${admin.accessToken}`);
-
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            backups: [
-              expect.objectContaining({
-                filename: expect.stringMatching(/immich-db-backup-\d{8}T\d{6}-v.*-pg.*\.sql\.gz$/),
-                filesize: expect.any(Number),
-              }),
-            ],
-          }),
-        );
-    });
-  });
-
-  describe('DELETE /', async () => {
-    it('should delete backup', async () => {
-      const filename = await utils.createBackup(admin.accessToken);
-
-      const { status } = await request(app)
-        .delete(`/admin/database-backups`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ backups: [filename] });
-
-      expect(status).toBe(200);
-
-      const { status: listStatus, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(listStatus).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          backups: [],
-        }),
-      );
-    });
-  });
-
-  // => action: restore database flow
-
-  describe.sequential('POST /start-restore', () => {
-    afterAll(async () => {
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({ action: 'end' });
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-
-      admin = await utils.adminSetup();
-    });
-
-    it.sequential('should not work when the server is configured', async () => {
-      const { status, body } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('The server already has an admin'));
-    });
-
-    it.sequential('should enter maintenance mode in "database restore mode"', async () => {
-      await utils.resetDatabase(); // reset database before running this test
-
-      const { status, headers } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(201);
-
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual({
-        active: true,
-        action: 'select_database_restore',
-      });
-    });
-  });
-
-  // => action: restore database
-
-  describe.sequential('POST /backups/restore', () => {
-    beforeAll(async () => {
-      await utils.disconnectDatabase();
-    });
-
-    afterAll(async () => {
-      await utils.connectDatabase();
-    });
-
-    it.sequential('should restore a backup', { timeout: 60_000 }, async () => {
-      let filename = await utils.createBackup(admin.accessToken);
-
-      // work-around until test is running on released version
-      await utils.move(
-        `/data/backups/${filename}`,
-        '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-      );
-      filename = 'immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz';
-
-      const { status } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: filename,
-        });
-
-      expect(status).toBe(201);
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-        }),
-      );
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 60_000,
-          },
-        )
-        .toBeFalsy();
-    });
-
-    it.sequential('fail to restore a corrupted backup', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('corrupted');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-corrupted.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('IM CORRUPTED'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-
-    it.sequential('rollback to restore point if backup is missing admin', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('empty');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-empty.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 30_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('Server health check failed, no admin exists.'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-  });
-});

e2e/src/api/specs/maintenance.e2e-spec.ts

@@ -14,7 +14,6 @@ describe('/admin/maintenance', () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup();
     nonAdmin = await utils.userSetup(admin.accessToken, createUserDto.user1);
-    await utils.resetBackups(admin.accessToken);
   });
 
   // => outside of maintenance mode
@@ -27,17 +26,6 @@ describe('/admin/maintenance', () => {
     });
   });
 
-  describe('GET /status', async () => {
-    it('to always indicate we are not in maintenance mode', async () => {
-      const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        active: false,
-        action: 'end',
-      });
-    });
-  });
-
   describe('POST /login', async () => {
     it('should not work out of maintenance mode', async () => {
       const { status, body } = await request(app).post('/admin/maintenance/login').send({ token: 'token' });
@@ -51,7 +39,6 @@ describe('/admin/maintenance', () => {
   describe.sequential('POST /', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app).post('/admin/maintenance').send({
-        active: false,
         action: 'end',
       });
       expect(status).toBe(401);
@@ -82,7 +69,6 @@ describe('/admin/maintenance', () => {
         .send({
           action: 'start',
         });
-
       expect(status).toBe(201);
 
       cookie = headers['set-cookie'][0].split(';')[0];
@@ -93,13 +79,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeTruthy();
@@ -117,17 +102,6 @@ describe('/admin/maintenance', () => {
       });
     });
 
-    describe('GET /status', async () => {
-      it('to indicate we are in maintenance mode', async () => {
-        const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-        expect(status).toBe(200);
-        expect(body).toEqual({
-          active: true,
-          action: 'start',
-        });
-      });
-    });
-
     describe('POST /login', async () => {
       it('should fail without cookie or token in body', async () => {
         const { status, body } = await request(app).post('/admin/maintenance/login').send({});
@@ -184,13 +158,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeFalsy();

e2e/src/generators/timeline/rest-response.ts

@@ -348,7 +348,6 @@ export function toAssetResponseDto(asset: MockTimelineAsset, owner?: UserRespons
     checksum: asset.checksum,
     width: exifInfo.exifImageWidth ?? 1,
     height: exifInfo.exifImageHeight ?? 1,
-    isEdited: false,
   };
 }
 

e2e/src/utils.ts

@@ -6,9 +6,7 @@ import {
   CheckExistingAssetsDto,
   CreateAlbumDto,
   CreateLibraryDto,
-  JobCreateDto,
   MaintenanceAction,
-  ManualJobName,
   MetadataSearchDto,
   Permission,
   PersonCreateDto,
@@ -23,7 +21,6 @@ import {
   checkExistingAssets,
   createAlbum,
   createApiKey,
-  createJob,
   createLibrary,
   createPartner,
   createPerson,
@@ -31,12 +28,10 @@ import {
   createStack,
   createUserAdmin,
   deleteAssets,
-  deleteDatabaseBackup,
   getAssetInfo,
   getConfig,
   getConfigDefaults,
   getQueuesLegacy,
-  listDatabaseBackups,
   login,
   runQueueCommandLegacy,
   scanLibrary,
@@ -57,15 +52,11 @@ import {
 import { BrowserContext } from '@playwright/test';
 import { exec, spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { createWriteStream, existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
-import { mkdtemp } from 'node:fs/promises';
+import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { dirname, resolve } from 'node:path';
 import { setTimeout as setAsyncTimeout } from 'node:timers/promises';
 import { promisify } from 'node:util';
-import { createGzip } from 'node:zlib';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
@@ -93,9 +84,8 @@ export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer $
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
   executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
-export const dockerExec = (args: string[]) =>
-  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', args.join(' ')]);
-export const immichAdmin = (args: string[]) => dockerExec([`immich-admin ${args.join(' ')}`]);
+export const immichAdmin = (args: string[]) =>
+  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', `immich-admin ${args.join(' ')}`]);
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
 export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
@@ -159,26 +149,12 @@ const onEvent = ({ event, id }: { event: EventType; id: string }) => {
 };
 
 export const utils = {
-  connectDatabase: async () => {
-    if (!client) {
-      client = new pg.Client(dbUrl);
-      client.on('end', () => (client = null));
-      client.on('error', () => (client = null));
-      await client.connect();
-    }
-
-    return client;
-  },
-
-  disconnectDatabase: async () => {
-    if (client) {
-      await client.end();
-    }
-  },
-
   resetDatabase: async (tables?: string[]) => {
     try {
-      client = await utils.connectDatabase();
+      if (!client) {
+        client = new pg.Client(dbUrl);
+        await client.connect();
+      }
 
       tables = tables || [
         // TODO e2e test for deleting a stack, since it is quite complex
@@ -505,9 +481,6 @@ export const utils = {
   tagAssets: (accessToken: string, tagId: string, assetIds: string[]) =>
     tagAssets({ id: tagId, bulkIdsDto: { ids: assetIds } }, { headers: asBearerAuth(accessToken) }),
 
-  createJob: async (accessToken: string, jobCreateDto: JobCreateDto) =>
-    createJob({ jobCreateDto }, { headers: asBearerAuth(accessToken) }),
-
   queueCommand: async (accessToken: string, name: QueueName, queueCommandDto: QueueCommandDto) =>
     runQueueCommandLegacy({ name, queueCommandDto }, { headers: asBearerAuth(accessToken) }),
 
@@ -586,45 +559,6 @@ export const utils = {
     mkdirSync(`${testAssetDir}/temp`, { recursive: true });
   },
 
-  async move(source: string, dest: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'mv', source, dest]).promise;
-  },
-
-  createBackup: async (accessToken: string) => {
-    await utils.createJob(accessToken, {
-      name: ManualJobName.BackupDatabase,
-    });
-
-    return utils.poll(
-      () => request(app).get('/admin/database-backups').set('Authorization', `Bearer ${accessToken}`),
-      ({ status, body }) => status === 200 && body.backups.length === 1,
-      ({ body }) => body.backups[0].filename,
-    );
-  },
-
-  resetBackups: async (accessToken: string) => {
-    const { backups } = await listDatabaseBackups({ headers: asBearerAuth(accessToken) });
-
-    const backupFiles = backups.map((b) => b.filename);
-    await deleteDatabaseBackup(
-      { databaseBackupDeleteDto: { backups: backupFiles } },
-      { headers: asBearerAuth(accessToken) },
-    );
-  },
-
-  prepareTestBackup: async (generate: 'empty' | 'corrupted') => {
-    const dir = await mkdtemp(join(tmpdir(), 'test-'));
-    const fn = join(dir, 'file');
-
-    const sql = Readable.from(generate === 'corrupted' ? 'IM CORRUPTED;' : 'SELECT 1;');
-    const gzip = createGzip();
-    const writeStream = createWriteStream(fn);
-    await pipeline(sql, gzip, writeStream);
-
-    await executeCommand('docker', ['cp', fn, `immich-e2e-server:/data/backups/development-${generate}.sql.gz`])
-      .promise;
-  },
-
   resetAdminConfig: async (accessToken: string) => {
     const defaultConfig = await getConfigDefaults({ headers: asBearerAuth(accessToken) });
     await updateConfig({ systemConfigDto: defaultConfig }, { headers: asBearerAuth(accessToken) });
@@ -667,25 +601,6 @@ export const utils = {
     await utils.waitForQueueFinish(accessToken, 'sidecar');
     await utils.waitForQueueFinish(accessToken, 'metadataExtraction');
   },
-
-  async poll<T>(cb: () => Promise<T>, validate: (value: T) => boolean, map?: (value: T) => any) {
-    let timeout = 0;
-    while (true) {
-      try {
-        const data = await cb();
-        if (validate(data)) {
-          return map ? map(data) : data;
-        }
-        timeout++;
-        if (timeout >= 10) {
-          throw 'Could not clean up test.';
-        }
-        await new Promise((resolve) => setTimeout(resolve, 5e2));
-      } catch {
-        // no-op
-      }
-    }
-  },
 };
 
 utils.initSdk();

e2e/src/web/specs/database-backups.e2e-spec.ts

@@ -1,105 +0,0 @@
-import { LoginResponseDto } from '@immich/sdk';
-import { expect, test } from '@playwright/test';
-import { utils } from 'src/utils';
-
-test.describe.configure({ mode: 'serial' });
-
-test.describe('Database Backups', () => {
-  let admin: LoginResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-  });
-
-  test('restore a backup from settings', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/admin/maintenance**', { timeout: 60_000 });
-  });
-
-  test('handle backup restore failure', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('corrupted');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('IM CORRUPTED')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('rollback to restore point if backup is missing admin', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('empty');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('Server health check failed, no admin exists.')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('restore a backup from onboarding', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await utils.resetDatabase();
-
-    await page.goto('/');
-    await page.getByRole('button', { name: 'Restore from backup' }).click();
-
-    try {
-      await page.waitForURL('/maintenance**');
-    } catch {
-      // when chained with the rest of the tests
-      // this navigation may fail..? not sure why...
-      await page.goto('/maintenance');
-      await page.waitForURL('/maintenance**');
-    }
-
-    await page.getByRole('button', { name: 'Next' }).click();
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/photos', { timeout: 60_000 });
-  });
-});

e2e/src/web/specs/maintenance.e2e-spec.ts

@@ -16,12 +16,12 @@ test.describe('Maintenance', () => {
   test('enter and exit maintenance mode', async ({ context, page }) => {
     await utils.setAuthCookies(context, admin.accessToken);
 
-    await page.goto('/admin/maintenance');
-    await page.getByRole('button', { name: 'Switch to maintenance mode' }).click();
+    await page.goto('/admin/system-settings?isOpen=maintenance');
+    await page.getByRole('button', { name: 'Start maintenance mode' }).click();
 
     await expect(page.getByText('Temporarily Unavailable')).toBeVisible({ timeout: 10_000 });
     await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('**/admin/maintenance*', { timeout: 10_000 });
+    await page.waitForURL('**/admin/system-settings*', { timeout: 10_000 });
   });
 
   test('maintenance shows no options to users until they authenticate', async ({ page }) => {

i18n/en.json

@@ -188,21 +188,10 @@
     "machine_learning_smart_search_enabled": "Enable smart search",
     "machine_learning_smart_search_enabled_description": "If disabled, images will not be encoded for smart search.",
     "machine_learning_url_description": "The URL of the machine learning server. If more than one URL is provided, each server will be attempted one-at-a-time until one responds successfully, in order from first to last. Servers that don't respond will be temporarily ignored until they come back online.",
-    "maintenance_delete_backup": "Delete Backup",
-    "maintenance_delete_backup_description": "This file will be irrevocably deleted.",
-    "maintenance_delete_error": "Failed to delete backup.",
-    "maintenance_restore_backup": "Restore Backup",
-    "maintenance_restore_backup_description": "Immich will be wiped and restored from the chosen backup. A backup will be created before continuing.",
-    "maintenance_restore_backup_different_version": "This backup was created with a different version of Immich!",
-    "maintenance_restore_backup_unknown_version": "Couldn't determine backup version.",
-    "maintenance_restore_database_backup": "Restore database backup",
-    "maintenance_restore_database_backup_description": "Rollback to an earlier database state using a backup file",
     "maintenance_settings": "Maintenance",
     "maintenance_settings_description": "Put Immich into maintenance mode.",
-    "maintenance_start": "Switch to maintenance mode",
+    "maintenance_start": "Start maintenance mode",
     "maintenance_start_error": "Failed to start maintenance mode.",
-    "maintenance_upload_backup": "Upload database backup file",
-    "maintenance_upload_backup_error": "Could not upload backup, is it an .sql/.sql.gz file?",
     "manage_concurrency": "Manage Concurrency",
     "manage_concurrency_description": "Navigate to the jobs page to manage job concurrency",
     "manage_log_settings": "Manage log settings",
@@ -614,7 +603,7 @@
   "backup_album_selection_page_select_albums": "Select albums",
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
-  "backup_albums_sync": "Backup Albums Synchronization",
+  "backup_albums_sync": "Backup albums synchronization",
   "backup_all": "All",
   "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
   "backup_background_service_complete_notification": "Asset backup complete",
@@ -939,7 +928,6 @@
   "download_include_embedded_motion_videos": "Embedded videos",
   "download_include_embedded_motion_videos_description": "Include videos embedded in motion photos as a separate file",
   "download_notfound": "Download not found",
-  "download_original": "Download original",
   "download_paused": "Download paused",
   "download_settings": "Download",
   "download_settings_description": "Manage settings related to asset download",
@@ -1415,28 +1403,10 @@
   "loop_videos_description": "Enable to automatically loop a video in the detail viewer.",
   "main_branch_warning": "You're using a development version; we strongly recommend using a release version!",
   "main_menu": "Main menu",
-  "maintenance_action_restore": "Restoring Database",
   "maintenance_description": "Immich has been put into <link>maintenance mode</link>.",
   "maintenance_end": "End maintenance mode",
   "maintenance_end_error": "Failed to end maintenance mode.",
   "maintenance_logged_in_as": "Currently logged in as {user}",
-  "maintenance_restore_from_backup": "Restore From Backup",
-  "maintenance_restore_library": "Restore Your Library",
-  "maintenance_restore_library_confirm": "If this looks correct, continue to restoring a backup!",
-  "maintenance_restore_library_description": "Restoring Database",
-  "maintenance_restore_library_folder_has_files": "{folder} has {count} folder(s)",
-  "maintenance_restore_library_folder_no_files": "{folder} is missing files!",
-  "maintenance_restore_library_folder_pass": "readable and writable",
-  "maintenance_restore_library_folder_read_fail": "not readable",
-  "maintenance_restore_library_folder_write_fail": "not writable",
-  "maintenance_restore_library_hint_missing_files": "You may be missing important files",
-  "maintenance_restore_library_hint_regenerate_later": "You can regenerate these later in settings",
-  "maintenance_restore_library_hint_storage_template_missing_files": "Using storage template? You may be missing files",
-  "maintenance_restore_library_loading": "Loading integrity checks and heuristics…",
-  "maintenance_task_backup": "Creating a backup of the existing database…",
-  "maintenance_task_migrations": "Running database migrations…",
-  "maintenance_task_restore": "Restoring the chosen backup…",
-  "maintenance_task_rollback": "Restore failed, rolling back to restore point…",
   "maintenance_title": "Temporarily Unavailable",
   "make": "Make",
   "manage_geolocation": "Manage location",
@@ -2244,7 +2214,6 @@
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
   "unknown_country": "Unknown Country",
-  "unknown_date": "Unknown date",
   "unknown_year": "Unknown Year",
   "unlimited": "Unlimited",
   "unlink_motion_video": "Unlink motion video",
@@ -2287,7 +2256,7 @@
   "url": "URL",
   "usage": "Usage",
   "use_biometric": "Use biometric",
-  "use_current_connection": "Use current connection",
+  "use_current_connection": "use current connection",
   "use_custom_date_range": "Use custom date range instead",
   "user": "User",
   "user_has_been_deleted": "This user has been deleted.",

machine-learning/Dockerfile

@@ -92,14 +92,14 @@ FROM python:3.13-slim-trixie@sha256:0222b795db95bf7412cede36ab46a266cfb31f632e64
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.27.10/intel-igc-core-2_2.27.10+20617_amd64.deb && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.27.10/intel-igc-opencl-2_2.27.10+20617_amd64.deb && \
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.01.36711.4/intel-opencl-icd_26.01.36711.4-0_amd64.deb &&  \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-core-2_2.24.8+20344_amd64.deb && \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-opencl-2_2.24.8+20344_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/intel-opencl-icd_25.48.36300.8-0_amd64.deb &&  \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb && \
     # TODO: Figure out how to get renovate to manage this differently versioned libigdgmm file
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.01.36711.4/libigdgmm12_22.9.0_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/libigdgmm12_22.8.2_amd64.deb && \
     dpkg -i *.deb && \
     rm *.deb && \
     apt-get remove wget -yqq && \

mise.toml

@@ -3,7 +3,7 @@ experimental_monorepo_root = true
 [tools]
 node = "24.13.0"
 flutter = "3.35.7"
-pnpm = "10.28.0"
+pnpm = "10.27.0"
 terragrunt = "0.93.10"
 opentofu = "1.10.7"
 java = "25.0.1"

mobile/android/app/src/main/AndroidManifest.xml

@@ -117,9 +117,6 @@
         <data
           android:host="my.immich.app"
           android:pathPrefix="/memories/" />
-        <data
-          android:host="my.immich.app"
-          android:path="/memory" />
         <data
           android:host="my.immich.app"
           android:pathPrefix="/photos/" />

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -22,7 +22,6 @@ sealed class BaseAsset {
   final int? durationInSeconds;
   final bool isFavorite;
   final String? livePhotoVideoId;
-  final bool isEdited;
 
   const BaseAsset({
     required this.name,
@@ -35,7 +34,6 @@ sealed class BaseAsset {
     this.durationInSeconds,
     this.isFavorite = false,
     this.livePhotoVideoId,
-    required this.isEdited,
   });
 
   bool get isImage => type == AssetType.image;
@@ -73,7 +71,6 @@ sealed class BaseAsset {
   height: ${height ?? "<NA>"},
   durationInSeconds: ${durationInSeconds ?? "<NA>"},
   isFavorite: $isFavorite,
-  isEdited: $isEdited,
 }''';
   }
 
@@ -88,8 +85,7 @@ sealed class BaseAsset {
           width == other.width &&
           height == other.height &&
           durationInSeconds == other.durationInSeconds &&
-          isFavorite == other.isFavorite &&
-          isEdited == other.isEdited;
+          isFavorite == other.isFavorite;
     }
     return false;
   }
@@ -103,7 +99,6 @@ sealed class BaseAsset {
         width.hashCode ^
         height.hashCode ^
         durationInSeconds.hashCode ^
-        isFavorite.hashCode ^
-        isEdited.hashCode;
+        isFavorite.hashCode;
   }
 }

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -28,7 +28,6 @@ class LocalAsset extends BaseAsset {
     this.adjustmentTime,
     this.latitude,
     this.longitude,
-    required super.isEdited,
   }) : remoteAssetId = remoteId;
 
   @override
@@ -108,7 +107,6 @@ class LocalAsset extends BaseAsset {
     DateTime? adjustmentTime,
     double? latitude,
     double? longitude,
-    bool? isEdited,
   }) {
     return LocalAsset(
       id: id ?? this.id,
@@ -127,7 +125,6 @@ class LocalAsset extends BaseAsset {
       adjustmentTime: adjustmentTime ?? this.adjustmentTime,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,
-      isEdited: isEdited ?? this.isEdited,
     );
   }
 }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -28,7 +28,6 @@ class RemoteAsset extends BaseAsset {
     this.visibility = AssetVisibility.timeline,
     super.livePhotoVideoId,
     this.stackId,
-    required super.isEdited,
   }) : localAssetId = localId;
 
   @override
@@ -105,7 +104,6 @@ class RemoteAsset extends BaseAsset {
     AssetVisibility? visibility,
     String? livePhotoVideoId,
     String? stackId,
-    bool? isEdited,
   }) {
     return RemoteAsset(
       id: id ?? this.id,
@@ -124,7 +122,6 @@ class RemoteAsset extends BaseAsset {
       visibility: visibility ?? this.visibility,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       stackId: stackId ?? this.stackId,
-      isEdited: isEdited ?? this.isEdited,
     );
   }
 }

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

@@ -24,11 +24,12 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
+import 'package:immich_mobile/wm_executor.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 
@@ -92,6 +93,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       await Future.wait(
         [
           loadTranslations(),
+          workerManagerPatch.init(dynamicSpawning: true),
           _ref?.read(authServiceProvider).setOpenApiServiceEndpoint(),
           // Initialize the file downloader
           FileDownloader().configure(
@@ -190,21 +192,25 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
       final nativeSyncApi = _ref?.read(nativeSyncApiProvider);
 
-      _ref?.dispose();
-      _ref = null;
-
       await _drift.close();
       await _driftLogger.close();
 
+      _ref?.dispose();
+      _ref = null;
+
       _cancellationToken.cancel();
       _logger.info("Cleaning up background worker");
 
       final cleanupFutures = [
         nativeSyncApi?.cancelHashing(),
+        workerManagerPatch.dispose().catchError((_) async {
+          // Discard any errors on the dispose call
+          return;
+        }),
         LogService.I.dispose(),
         Store.dispose(),
+
         backgroundSyncManager?.cancel(),
-        backgroundSyncManager?.cancelLocal(),
       ];
 
       if (_isar.isOpen) {

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

@@ -436,6 +436,5 @@ extension PlatformToLocalAsset on PlatformAsset {
     adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
     latitude: latitude,
     longitude: longitude,
-    isEdited: false,
   );
 }

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

@@ -77,7 +77,6 @@ extension on AssetResponseDto {
       thumbHash: thumbhash,
       localId: null,
       type: type.toAssetType(),
-      isEdited: isEdited,
     );
   }
 }

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

@@ -247,42 +247,6 @@ class SyncStreamService {
     }
   }
 
-  Future<void> handleWsAssetEditReadyV1Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
-
-    _logger.info('Processing batch of ${batchData.length} AssetEditReadyV1 events');
-
-    final List<SyncAssetV1> assets = [];
-
-    try {
-      for (final data in batchData) {
-        if (data is! Map<String, dynamic>) {
-          continue;
-        }
-
-        final payload = data;
-        final assetData = payload['asset'];
-
-        if (assetData == null) {
-          continue;
-        }
-
-        final asset = SyncAssetV1.fromJson(assetData);
-
-        if (asset != null) {
-          assets.add(asset);
-        }
-      }
-
-      if (assets.isNotEmpty) {
-        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-edit');
-        _logger.info('Successfully processed ${assets.length} edited assets');
-      }
-    } catch (error, stackTrace) {
-      _logger.severe("Error processing AssetEditReadyV1 websocket batch events", error, stackTrace);
-    }
-  }
-
   Future<void> _handleRemoteTrashed(Iterable<String> checksums) async {
     if (checksums.isEmpty) {
       return Future.value();

mobile/lib/domain/utils/background_sync.dart

@@ -4,6 +4,7 @@ import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
+import 'package:worker_manager/worker_manager.dart';
 
 typedef SyncCallback = void Function();
 typedef SyncCallbackWithResult<T> = void Function(T result);
@@ -26,12 +27,12 @@ class BackgroundSyncManager {
   final SyncCallback? onCloudIdSyncComplete;
   final SyncErrorCallback? onCloudIdSyncError;
 
-  CancellableTask<bool>? _syncTask;
-  CancellableTask<void>? _syncWebsocketTask;
-  CancellableTask<void>? _cloudIdSyncTask;
-  CancellableTask<void>? _deviceAlbumSyncTask;
-  CancellableTask<void>? _linkedAlbumSyncTask;
-  CancellableTask<void>? _hashTask;
+  Cancelable<bool?>? _syncTask;
+  Cancelable<void>? _syncWebsocketTask;
+  Cancelable<void>? _cloudIdSyncTask;
+  Cancelable<void>? _deviceAlbumSyncTask;
+  Cancelable<void>? _linkedAlbumSyncTask;
+  Cancelable<void>? _hashTask;
 
   BackgroundSyncManager({
     this.onRemoteSyncStart,
@@ -49,42 +50,59 @@ class BackgroundSyncManager {
   });
 
   Future<void> cancel() async {
+    final futures = <Future>[];
+
+    if (_syncTask != null) {
+      futures.add(_syncTask!.future);
+    }
     _syncTask?.cancel();
+    _syncTask = null;
+
+    if (_syncWebsocketTask != null) {
+      futures.add(_syncWebsocketTask!.future);
+    }
     _syncWebsocketTask?.cancel();
+    _syncWebsocketTask = null;
+
+    if (_cloudIdSyncTask != null) {
+      futures.add(_cloudIdSyncTask!.future);
+    }
     _cloudIdSyncTask?.cancel();
+    _cloudIdSyncTask = null;
+
+    if (_linkedAlbumSyncTask != null) {
+      futures.add(_linkedAlbumSyncTask!.future);
+    }
     _linkedAlbumSyncTask?.cancel();
+    _linkedAlbumSyncTask = null;
 
     try {
-      await Future.wait(
-        [
-          _syncTask?.future,
-          _syncWebsocketTask?.future,
-          _cloudIdSyncTask?.future,
-          _linkedAlbumSyncTask?.future,
-        ].nonNulls,
-      );
-    } catch (e) {
-      // Ignore cancellation errors and cleanup timeouts
+      await Future.wait(futures);
+    } on CanceledError {
+      // Ignore cancellation errors
     }
-
-    _syncTask = null;
-    _syncWebsocketTask = null;
-    _cloudIdSyncTask = null;
-    _linkedAlbumSyncTask = null;
   }
 
   Future<void> cancelLocal() async {
+    final futures = <Future>[];
+
+    if (_hashTask != null) {
+      futures.add(_hashTask!.future);
+    }
     _hashTask?.cancel();
+    _hashTask = null;
+
+    if (_deviceAlbumSyncTask != null) {
+      futures.add(_deviceAlbumSyncTask!.future);
+    }
     _deviceAlbumSyncTask?.cancel();
+    _deviceAlbumSyncTask = null;
 
     try {
-      await Future.wait([_hashTask?.future, _deviceAlbumSyncTask?.future].nonNulls);
-    } catch (e) {
-      // Ignore cancellation errors and cleanup timeouts
+      await Future.wait(futures);
+    } on CanceledError {
+      // Ignore cancellation errors
     }
-
-    _hashTask = null;
-    _deviceAlbumSyncTask = null;
   }
 
   // No need to cancel the task, as it can also be run when the user logs out
@@ -115,8 +133,7 @@ class BackgroundSyncManager {
         .catchError((error) {
           onLocalSyncError?.call(error.toString());
           _deviceAlbumSyncTask = null;
-        })
-        .future;
+        });
   }
 
   Future<void> hashAssets() {
@@ -139,8 +156,7 @@ class BackgroundSyncManager {
         .catchError((error) {
           onHashingError?.call(error.toString());
           _hashTask = null;
-        })
-        .future;
+        });
   }
 
   Future<bool> syncRemote() {
@@ -154,7 +170,7 @@ class BackgroundSyncManager {
       computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
       debugLabel: 'remote-sync',
     );
-    return _syncTask!.future
+    return _syncTask!
         .then((result) {
           final success = result ?? false;
           onRemoteSyncComplete?.call(success);
@@ -177,17 +193,7 @@ class BackgroundSyncManager {
     _syncWebsocketTask = _handleWsAssetUploadReadyV1Batch(batchData);
     return _syncWebsocketTask!.whenComplete(() {
       _syncWebsocketTask = null;
-    }).future;
-  }
-
-  Future<void> syncWebsocketEditBatch(List<dynamic> batchData) {
-    if (_syncWebsocketTask != null) {
-      return _syncWebsocketTask!.future;
-    }
-    _syncWebsocketTask = _handleWsAssetEditReadyV1Batch(batchData);
-    return _syncWebsocketTask!.whenComplete(() {
-      _syncWebsocketTask = null;
-    }).future;
+    });
   }
 
   Future<void> syncLinkedAlbum() {
@@ -198,7 +204,7 @@ class BackgroundSyncManager {
     _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated, debugLabel: 'linked-album-sync');
     return _linkedAlbumSyncTask!.whenComplete(() {
       _linkedAlbumSyncTask = null;
-    }).future;
+    });
   }
 
   Future<void> syncCloudIds() {
@@ -208,7 +214,7 @@ class BackgroundSyncManager {
 
     onCloudIdSyncStart?.call();
 
-    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds, debugLabel: 'cloud-id-sync');
+    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds);
     return _cloudIdSyncTask!
         .whenComplete(() {
           onCloudIdSyncComplete?.call();
@@ -217,17 +223,11 @@ class BackgroundSyncManager {
         .catchError((error) {
           onCloudIdSyncError?.call(error.toString());
           _cloudIdSyncTask = null;
-        })
-        .future;
+        });
   }
 }
 
-CancellableTask<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
+Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
   computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV1Batch(batchData),
   debugLabel: 'websocket-batch',
 );
-
-CancellableTask<void> _handleWsAssetEditReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
-  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV1Batch(batchData),
-  debugLabel: 'websocket-edit',
-);

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -47,6 +47,5 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     latitude: latitude,
     longitude: longitude,
     cloudId: iCloudId,
-    isEdited: false,
   );
 }

mobile/lib/infrastructure/entities/merged_asset.drift

@@ -25,8 +25,7 @@ SELECT
 	NULL as i_cloud_id,
 	NULL as latitude,
 	NULL as longitude,
-	NULL as adjustmentTime,
-	rae.is_edited
+	NULL as adjustmentTime
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -62,8 +61,7 @@ SELECT
 	lae.i_cloud_id,
 	lae.latitude,
 	lae.longitude,
-	lae.adjustment_time,
-	0 as is_edited
+	lae.adjustment_time
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (

mobile/lib/infrastructure/entities/merged_asset.drift.dart

@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     );
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
       variables: [
         for (var $ in userIds) i0.Variable<String>($),
         ...generatedlimit.introducedVariables,
@@ -66,7 +66,6 @@ class MergedAssetDrift extends i1.ModularAccessor {
         latitude: row.readNullable<double>('latitude'),
         longitude: row.readNullable<double>('longitude'),
         adjustmentTime: row.readNullable<DateTime>('adjustmentTime'),
-        isEdited: row.read<bool>('is_edited'),
       ),
     );
   }
@@ -138,7 +137,6 @@ class MergedAssetResult {
   final double? latitude;
   final double? longitude;
   final DateTime? adjustmentTime;
-  final bool isEdited;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -160,7 +158,6 @@ class MergedAssetResult {
     this.latitude,
     this.longitude,
     this.adjustmentTime,
-    required this.isEdited,
   });
 }
 

mobile/lib/infrastructure/entities/remote_asset.entity.dart

@@ -44,8 +44,6 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin
 
   TextColumn get libraryId => text().nullable()();
 
-  BoolColumn get isEdited => boolean().withDefault(const Constant(false))();
-
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -68,6 +66,5 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
     livePhotoVideoId: livePhotoVideoId,
     localId: localId,
     stackId: stackId,
-    isEdited: isEdited,
   );
 }

mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart

@@ -31,7 +31,6 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder =
       required i2.AssetVisibility visibility,
       i0.Value<String?> stackId,
       i0.Value<String?> libraryId,
-      i0.Value<bool> isEdited,
     });
 typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
     i1.RemoteAssetEntityCompanion Function({
@@ -53,7 +52,6 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
       i0.Value<i2.AssetVisibility> visibility,
       i0.Value<String?> stackId,
       i0.Value<String?> libraryId,
-      i0.Value<bool> isEdited,
     });
 
 final class $$RemoteAssetEntityTableReferences
@@ -198,11 +196,6 @@ class $$RemoteAssetEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
-  i0.ColumnFilters<bool> get isEdited => $composableBuilder(
-    column: $table.isEdited,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
   i5.$$UserEntityTableFilterComposer get ownerId {
     final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
       composer: this,
@@ -325,11 +318,6 @@ class $$RemoteAssetEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
-  i0.ColumnOrderings<bool> get isEdited => $composableBuilder(
-    column: $table.isEdited,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
   i5.$$UserEntityTableOrderingComposer get ownerId {
     final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
       composer: this,
@@ -429,9 +417,6 @@ class $$RemoteAssetEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get libraryId =>
       $composableBuilder(column: $table.libraryId, builder: (column) => column);
 
-  i0.GeneratedColumn<bool> get isEdited =>
-      $composableBuilder(column: $table.isEdited, builder: (column) => column);
-
   i5.$$UserEntityTableAnnotationComposer get ownerId {
     final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
       composer: this,
@@ -512,7 +497,6 @@ class $$RemoteAssetEntityTableTableManager
                     const i0.Value.absent(),
                 i0.Value<String?> stackId = const i0.Value.absent(),
                 i0.Value<String?> libraryId = const i0.Value.absent(),
-                i0.Value<bool> isEdited = const i0.Value.absent(),
               }) => i1.RemoteAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -532,7 +516,6 @@ class $$RemoteAssetEntityTableTableManager
                 visibility: visibility,
                 stackId: stackId,
                 libraryId: libraryId,
-                isEdited: isEdited,
               ),
           createCompanionCallback:
               ({
@@ -554,7 +537,6 @@ class $$RemoteAssetEntityTableTableManager
                 required i2.AssetVisibility visibility,
                 i0.Value<String?> stackId = const i0.Value.absent(),
                 i0.Value<String?> libraryId = const i0.Value.absent(),
-                i0.Value<bool> isEdited = const i0.Value.absent(),
               }) => i1.RemoteAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -574,7 +556,6 @@ class $$RemoteAssetEntityTableTableManager
                 visibility: visibility,
                 stackId: stackId,
                 libraryId: libraryId,
-                isEdited: isEdited,
               ),
           withReferenceMapper: (p0) => p0
               .map(
@@ -863,21 +844,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
     type: i0.DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const i0.VerificationMeta _isEditedMeta = const i0.VerificationMeta(
-    'isEdited',
-  );
-  @override
-  late final i0.GeneratedColumn<bool> isEdited = i0.GeneratedColumn<bool>(
-    'is_edited',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.bool,
-    requiredDuringInsert: false,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-      'CHECK ("is_edited" IN (0, 1))',
-    ),
-    defaultValue: const i4.Constant(false),
-  );
   @override
   List<i0.GeneratedColumn> get $columns => [
     name,
@@ -898,7 +864,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
     visibility,
     stackId,
     libraryId,
-    isEdited,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -1022,12 +987,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         libraryId.isAcceptableOrUnknown(data['library_id']!, _libraryIdMeta),
       );
     }
-    if (data.containsKey('is_edited')) {
-      context.handle(
-        _isEditedMeta,
-        isEdited.isAcceptableOrUnknown(data['is_edited']!, _isEditedMeta),
-      );
-    }
     return context;
   }
 
@@ -1116,10 +1075,6 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         i0.DriftSqlType.string,
         data['${effectivePrefix}library_id'],
       ),
-      isEdited: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.bool,
-        data['${effectivePrefix}is_edited'],
-      )!,
     );
   }
 
@@ -1160,7 +1115,6 @@ class RemoteAssetEntityData extends i0.DataClass
   final i2.AssetVisibility visibility;
   final String? stackId;
   final String? libraryId;
-  final bool isEdited;
   const RemoteAssetEntityData({
     required this.name,
     required this.type,
@@ -1180,7 +1134,6 @@ class RemoteAssetEntityData extends i0.DataClass
     required this.visibility,
     this.stackId,
     this.libraryId,
-    required this.isEdited,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -1229,7 +1182,6 @@ class RemoteAssetEntityData extends i0.DataClass
     if (!nullToAbsent || libraryId != null) {
       map['library_id'] = i0.Variable<String>(libraryId);
     }
-    map['is_edited'] = i0.Variable<bool>(isEdited);
     return map;
   }
 
@@ -1261,7 +1213,6 @@ class RemoteAssetEntityData extends i0.DataClass
       ),
       stackId: serializer.fromJson<String?>(json['stackId']),
       libraryId: serializer.fromJson<String?>(json['libraryId']),
-      isEdited: serializer.fromJson<bool>(json['isEdited']),
     );
   }
   @override
@@ -1290,7 +1241,6 @@ class RemoteAssetEntityData extends i0.DataClass
       ),
       'stackId': serializer.toJson<String?>(stackId),
       'libraryId': serializer.toJson<String?>(libraryId),
-      'isEdited': serializer.toJson<bool>(isEdited),
     };
   }
 
@@ -1313,7 +1263,6 @@ class RemoteAssetEntityData extends i0.DataClass
     i2.AssetVisibility? visibility,
     i0.Value<String?> stackId = const i0.Value.absent(),
     i0.Value<String?> libraryId = const i0.Value.absent(),
-    bool? isEdited,
   }) => i1.RemoteAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -1339,7 +1288,6 @@ class RemoteAssetEntityData extends i0.DataClass
     visibility: visibility ?? this.visibility,
     stackId: stackId.present ? stackId.value : this.stackId,
     libraryId: libraryId.present ? libraryId.value : this.libraryId,
-    isEdited: isEdited ?? this.isEdited,
   );
   RemoteAssetEntityData copyWithCompanion(i1.RemoteAssetEntityCompanion data) {
     return RemoteAssetEntityData(
@@ -1371,7 +1319,6 @@ class RemoteAssetEntityData extends i0.DataClass
           : this.visibility,
       stackId: data.stackId.present ? data.stackId.value : this.stackId,
       libraryId: data.libraryId.present ? data.libraryId.value : this.libraryId,
-      isEdited: data.isEdited.present ? data.isEdited.value : this.isEdited,
     );
   }
 
@@ -1395,8 +1342,7 @@ class RemoteAssetEntityData extends i0.DataClass
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility, ')
           ..write('stackId: $stackId, ')
-          ..write('libraryId: $libraryId, ')
-          ..write('isEdited: $isEdited')
+          ..write('libraryId: $libraryId')
           ..write(')'))
         .toString();
   }
@@ -1421,7 +1367,6 @@ class RemoteAssetEntityData extends i0.DataClass
     visibility,
     stackId,
     libraryId,
-    isEdited,
   );
   @override
   bool operator ==(Object other) =>
@@ -1444,8 +1389,7 @@ class RemoteAssetEntityData extends i0.DataClass
           other.livePhotoVideoId == this.livePhotoVideoId &&
           other.visibility == this.visibility &&
           other.stackId == this.stackId &&
-          other.libraryId == this.libraryId &&
-          other.isEdited == this.isEdited);
+          other.libraryId == this.libraryId);
 }
 
 class RemoteAssetEntityCompanion
@@ -1468,7 +1412,6 @@ class RemoteAssetEntityCompanion
   final i0.Value<i2.AssetVisibility> visibility;
   final i0.Value<String?> stackId;
   final i0.Value<String?> libraryId;
-  final i0.Value<bool> isEdited;
   const RemoteAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -1488,7 +1431,6 @@ class RemoteAssetEntityCompanion
     this.visibility = const i0.Value.absent(),
     this.stackId = const i0.Value.absent(),
     this.libraryId = const i0.Value.absent(),
-    this.isEdited = const i0.Value.absent(),
   });
   RemoteAssetEntityCompanion.insert({
     required String name,
@@ -1509,7 +1451,6 @@ class RemoteAssetEntityCompanion
     required i2.AssetVisibility visibility,
     this.stackId = const i0.Value.absent(),
     this.libraryId = const i0.Value.absent(),
-    this.isEdited = const i0.Value.absent(),
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id),
@@ -1535,7 +1476,6 @@ class RemoteAssetEntityCompanion
     i0.Expression<int>? visibility,
     i0.Expression<String>? stackId,
     i0.Expression<String>? libraryId,
-    i0.Expression<bool>? isEdited,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -1556,7 +1496,6 @@ class RemoteAssetEntityCompanion
       if (visibility != null) 'visibility': visibility,
       if (stackId != null) 'stack_id': stackId,
       if (libraryId != null) 'library_id': libraryId,
-      if (isEdited != null) 'is_edited': isEdited,
     });
   }
 
@@ -1579,7 +1518,6 @@ class RemoteAssetEntityCompanion
     i0.Value<i2.AssetVisibility>? visibility,
     i0.Value<String?>? stackId,
     i0.Value<String?>? libraryId,
-    i0.Value<bool>? isEdited,
   }) {
     return i1.RemoteAssetEntityCompanion(
       name: name ?? this.name,
@@ -1600,7 +1538,6 @@ class RemoteAssetEntityCompanion
       visibility: visibility ?? this.visibility,
       stackId: stackId ?? this.stackId,
       libraryId: libraryId ?? this.libraryId,
-      isEdited: isEdited ?? this.isEdited,
     );
   }
 
@@ -1665,9 +1602,6 @@ class RemoteAssetEntityCompanion
     if (libraryId.present) {
       map['library_id'] = i0.Variable<String>(libraryId.value);
     }
-    if (isEdited.present) {
-      map['is_edited'] = i0.Variable<bool>(isEdited.value);
-    }
     return map;
   }
 
@@ -1691,8 +1625,7 @@ class RemoteAssetEntityCompanion
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility, ')
           ..write('stackId: $stackId, ')
-          ..write('libraryId: $libraryId, ')
-          ..write('isEdited: $isEdited')
+          ..write('libraryId: $libraryId')
           ..write(')'))
         .toString();
   }

mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart

@@ -45,6 +45,5 @@ extension TrashedLocalAssetEntityDataDomainExtension on TrashedLocalAssetEntityD
     height: height,
     width: width,
     orientation: orientation,
-    isEdited: false,
   );
 }

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -97,7 +97,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 17;
+  int get schemaVersion => 16;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -201,9 +201,6 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.createIndex(v16.idxLocalAssetCloudId);
             await m.createTable(v16.remoteAssetCloudIdEntity);
           },
-          from16To17: (m, v17) async {
-            await m.addColumn(v17.remoteAssetEntity, v17.remoteAssetEntity.isEdited);
-          },
         ),
       );
 

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -6911,503 +6911,6 @@ i1.GeneratedColumn<DateTime> _column_100(String aliasedName) =>
       true,
       type: i1.DriftSqlType.dateTime,
     );
-
-final class Schema17 extends i0.VersionedSchema {
-  Schema17({required super.database}) : super(version: 17);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    idxLatLng,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape28 remoteAssetEntity = Shape28(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-        _column_101,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape26 localAssetEntity = Shape26(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_98,
-        _column_96,
-        _column_46,
-        _column_47,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAlbumAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35, _column_33],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_36, _column_60],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape27 remoteAssetCloudIdEntity = Shape27(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_99,
-        _column_100,
-        _column_96,
-        _column_46,
-        _column_47,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape25 trashedLocalAssetEntity = Shape25(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_95,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_97,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-}
-
-class Shape28 extends i0.VersionedTable {
-  Shape28({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get type =>
-      columnsByName['type']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<DateTime> get createdAt =>
-      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<int> get width =>
-      columnsByName['width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get height =>
-      columnsByName['height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get durationInSeconds =>
-      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get localDateTime =>
-      columnsByName['local_date_time']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<String> get thumbHash =>
-      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get deletedAt =>
-      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<String> get livePhotoVideoId =>
-      columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get visibility =>
-      columnsByName['visibility']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get stackId =>
-      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get libraryId =>
-      columnsByName['library_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isEdited =>
-      columnsByName['is_edited']! as i1.GeneratedColumn<bool>;
-}
-
-i1.GeneratedColumn<bool> _column_101(String aliasedName) =>
-    i1.GeneratedColumn<bool>(
-      'is_edited',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.bool,
-      defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-        'CHECK ("is_edited" IN (0, 1))',
-      ),
-      defaultValue: const CustomExpression('0'),
-    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -7424,7 +6927,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
-  required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -7503,11 +7005,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from15To16(migrator, schema);
         return 16;
-      case 16:
-        final schema = Schema17(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from16To17(migrator, schema);
-        return 17;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -7530,7 +7027,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
-  required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -7548,6 +7044,5 @@ i1.OnUpgrade stepByStep({
     from13To14: from13To14,
     from14To15: from14To15,
     from15To16: from15To16,
-    from16To17: from16To17,
   ),
 );

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -200,7 +200,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             libraryId: Value(asset.libraryId),
             width: Value(asset.width),
             height: Value(asset.height),
-            isEdited: Value(asset.isEdited),
           );
 
           batch.insert(

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -70,7 +70,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   durationInSeconds: row.durationInSeconds,
                   livePhotoVideoId: row.livePhotoVideoId,
                   stackId: row.stackId,
-                  isEdited: row.isEdited,
                 )
               : LocalAsset(
                   id: row.localId!,
@@ -89,7 +88,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   latitude: row.latitude,
                   longitude: row.longitude,
                   adjustmentTime: row.adjustmentTime,
-                  isEdited: row.isEdited,
                 ),
         )
         .get();

mobile/lib/main.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:math';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
@@ -40,6 +41,7 @@ import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
+import 'package:immich_mobile/wm_executor.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
@@ -51,6 +53,8 @@ void main() async {
   final (isar, drift, logDb) = await Bootstrap.initDB();
   await Bootstrap.initDomain(isar, drift, logDb);
   await initApp();
+  // Warm-up isolate pool for worker manager
+  await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
   await migrateDatabaseIfNeeded(isar, drift);
   HttpSSLOptions.apply();
 

mobile/lib/pages/common/settings.page.dart

@@ -92,7 +92,7 @@ class _MobileLayout extends StatelessWidget {
                 ],
         )
         .toList();
-    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 60), children: [...settings]);
+    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 16), children: [...settings]);
   }
 }
 
@@ -142,7 +142,7 @@ class SettingsSubPage extends StatelessWidget {
     context.locale;
     return Scaffold(
       appBar: AppBar(centerTitle: false, title: Text(section.title).tr()),
-      body: Padding(padding: const EdgeInsets.only(bottom: 60.0), child: section.widget),
+      body: section.widget,
     );
   }
 }

mobile/lib/pages/settings/sync_status.page.dart

@@ -18,7 +18,6 @@ class SyncStatusPage extends StatelessWidget {
           splashRadius: 24,
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
-        centerTitle: false,
       ),
       body: const SyncStatusAndActions(),
     );

mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart

@@ -118,7 +118,6 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
       ),
       _PropertyItem(label: 'Is Favorite', value: asset.isFavorite.toString()),
       _PropertyItem(label: 'Live Photo Video ID', value: asset.livePhotoVideoId),
-      _PropertyItem(label: 'Is Edited', value: asset.isEdited.toString()),
     ]);
   }
 

mobile/lib/presentation/pages/drift_place.page.dart

@@ -167,7 +167,7 @@ class _PlaceTile extends StatelessWidget {
         child: SizedBox(
           width: 80,
           height: 80,
-          child: Thumbnail.remote(remoteId: place.$2, fit: BoxFit.cover, thumbhash: ""),
+          child: Thumbnail.remote(remoteId: place.$2, fit: BoxFit.cover),
         ),
       ),
     );

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -14,15 +14,14 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/album_filter.utils.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -311,17 +310,18 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                   : const Icon(Icons.abc, color: Colors.transparent),
               onPressed: () => onMenuTapped(sortMode),
               style: ButtonStyle(
-                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(12, 12, 24, 12)),
+                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(16, 16, 32, 16)),
                 backgroundColor: WidgetStateProperty.all(
                   albumSortOption == sortMode ? context.colorScheme.primary : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
-                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
+                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(24))),
                 ),
               ),
               child: Text(
                 sortMode.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
                   color: albumSortOption == sortMode
                       ? context.colorScheme.onPrimary
                       : context.colorScheme.onSurface.withAlpha(185),
@@ -344,12 +344,15 @@ class _SortButtonState extends ConsumerState<_SortButton> {
               Padding(
                 padding: const EdgeInsets.only(right: 5),
                 child: albumSortIsReverse
-                    ? Icon(Icons.keyboard_arrow_down, color: context.colorScheme.onSurface)
-                    : Icon(Icons.keyboard_arrow_up_rounded, color: context.colorScheme.onSurface),
+                    ? const Icon(Icons.keyboard_arrow_down)
+                    : const Icon(Icons.keyboard_arrow_up_rounded),
               ),
               Text(
                 albumSortOption.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(225)),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
               ),
               isSorting
                   ? SizedBox(
@@ -539,11 +542,7 @@ class _QuickSortAndViewMode extends StatelessWidget {
               initialIsReverse: currentIsReverse,
             ),
             IconButton(
-              icon: Icon(
-                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
-                size: 24,
-                color: context.colorScheme.onSurface,
-              ),
+              icon: Icon(isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined, size: 24),
               onPressed: onToggleViewMode,
             ),
           ],
@@ -663,8 +662,6 @@ class _GridAlbumCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final albumThumbnailAsset = ref.read(assetServiceProvider).getRemoteAsset(album.thumbnailAssetId ?? "");
-
     return GestureDetector(
       onTap: () => onAlbumSelected(album),
       child: Card(
@@ -683,22 +680,12 @@ class _GridAlbumCard extends ConsumerWidget {
                 borderRadius: const BorderRadius.vertical(top: Radius.circular(15)),
                 child: SizedBox(
                   width: double.infinity,
-                  child: FutureBuilder(
-                    future: albumThumbnailAsset,
-                    builder: (context, snapshot) {
-                      if (snapshot.hasData && snapshot.data != null) {
-                        return Thumbnail.remote(
-                          remoteId: album.thumbnailAssetId!,
-                          thumbhash: snapshot.data!.thumbHash ?? "",
-                        );
-                      }
-
-                      return Container(
-                        color: context.colorScheme.surfaceContainerHighest,
-                        child: const Icon(Icons.photo_album_rounded, size: 40, color: Colors.grey),
-                      );
-                    },
-                  ),
+                  child: album.thumbnailAssetId != null
+                      ? Thumbnail.remote(remoteId: album.thumbnailAssetId!)
+                      : Container(
+                          color: context.colorScheme.surfaceContainerHighest,
+                          child: const Icon(Icons.photo_album_rounded, size: 40, color: Colors.grey),
+                        ),
                 ),
               ),
             ),

mobile/lib/presentation/widgets/album/album_tile.dart

@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-class AlbumTile extends ConsumerWidget {
+class AlbumTile extends StatelessWidget {
   const AlbumTile({super.key, required this.album, required this.isOwner, this.onAlbumSelected});
 
   final RemoteAlbum album;
@@ -16,9 +14,7 @@ class AlbumTile extends ConsumerWidget {
   final Function(RemoteAlbum)? onAlbumSelected;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final albumThumbnailAsset = ref.read(assetServiceProvider).getRemoteAsset(album.thumbnailAssetId ?? "");
-
+  Widget build(BuildContext context) {
     return LargeLeadingTile(
       title: Text(
         album.name,
@@ -33,35 +29,23 @@ class AlbumTile extends ConsumerWidget {
       ),
       onTap: () => onAlbumSelected?.call(album),
       leadingPadding: const EdgeInsets.only(right: 16),
-      leading: FutureBuilder(
-        future: albumThumbnailAsset,
-        builder: (context, snapshot) {
-          return snapshot.hasData && snapshot.data != null
-              ? ClipRRect(
-                  borderRadius: const BorderRadius.all(Radius.circular(15)),
-                  child: SizedBox(
-                    width: 80,
-                    height: 80,
-                    child: Thumbnail.remote(
-                      remoteId: album.thumbnailAssetId!,
-                      thumbhash: snapshot.data!.thumbHash ?? "",
-                    ),
-                  ),
-                )
-              : SizedBox(
-                  width: 80,
-                  height: 80,
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: context.colorScheme.surfaceContainer,
-                      borderRadius: const BorderRadius.all(Radius.circular(16)),
-                      border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
-                    ),
-                    child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
-                  ),
-                );
-        },
-      ),
+      leading: album.thumbnailAssetId != null
+          ? ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(15)),
+              child: SizedBox(width: 80, height: 80, child: Thumbnail.remote(remoteId: album.thumbnailAssetId!)),
+            )
+          : SizedBox(
+              width: 80,
+              height: 80,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: context.colorScheme.surfaceContainer,
+                  borderRadius: const BorderRadius.all(Radius.circular(16)),
+                  border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
+                ),
+                child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
+              ),
+            ),
     );
   }
 }

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -165,8 +164,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
           children: [
             if (albums.isNotEmpty)
               SheetTile(
-                title: 'appears_in'.t(context: context),
-                titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                title: 'appears_in'.t(context: context).toUpperCase(),
+                titleStyle: context.textTheme.labelMedium?.copyWith(
+                  color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                  fontWeight: FontWeight.w600,
+                ),
               ),
             Padding(
               padding: const EdgeInsets.only(left: 24),
@@ -222,7 +224,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
                 color: context.textTheme.labelLarge?.color,
               ),
               subtitle: _getFileInfo(asset, exifInfo),
-              subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+              subtitleStyle: context.textTheme.labelMedium?.copyWith(
+                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              ),
             );
           },
         );
@@ -237,7 +241,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             color: context.textTheme.labelLarge?.color,
           ),
           subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          subtitleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+          ),
         );
       }
     }
@@ -256,8 +262,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         const SheetLocationDetails(),
         // Details header
         SheetTile(
-          title: 'details'.t(context: context),
-          titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          title: 'details'.t(context: context).toUpperCase(),
+          titleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            fontWeight: FontWeight.w600,
+          ),
         ),
         // File info
         buildFileInfoTile(),
@@ -269,7 +278,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            ),
           ),
         ],
         // Lens info
@@ -280,13 +291,15 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getLensInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            ),
           ),
         ],
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off
-        const SizedBox(height: 60),
+        const SizedBox(height: 30),
       ],
     );
   }

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -78,8 +77,11 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SheetTile(
-            title: 'location'.t(context: context),
-            titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            title: 'location'.t(context: context).toUpperCase(),
+            titleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              fontWeight: FontWeight.w600,
+            ),
             trailing: hasCoordinates ? const Icon(Icons.edit_location_alt, size: 20) : null,
             onTap: editLocation,
           ),
@@ -103,7 +105,9 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
                     ),
                   Text(
                     coordinates,
-                    style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                    style: context.textTheme.labelMedium?.copyWith(
+                      color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    ),
                   ),
                 ],
               ),

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_edit_name_modal.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -54,8 +53,11 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
               Padding(
                 padding: const EdgeInsets.only(left: 16, top: 16, bottom: 16),
                 child: Text(
-                  "people".t(context: context),
-                  style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                  "people".t(context: context).toUpperCase(),
+                  style: context.textTheme.labelMedium?.copyWith(
+                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
               ),
               SizedBox(

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -112,17 +112,14 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
     provider = LocalFullImageProvider(id: id, size: size, assetType: asset.type);
   } else {
     final String assetId;
-    final String thumbhash;
     if (asset is LocalAsset && asset.hasRemote) {
       assetId = asset.remoteId!;
-      thumbhash = "";
     } else if (asset is RemoteAsset) {
       assetId = asset.id;
-      thumbhash = asset.thumbHash ?? "";
     } else {
       throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
     }
-    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash);
+    provider = RemoteFullImageProvider(assetId: assetId);
   }
 
   return provider;
@@ -135,9 +132,8 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
   }
 
   final assetId = asset is RemoteAsset ? asset.id : (asset as LocalAsset).remoteId;
-  final thumbhash = asset is RemoteAsset ? asset.thumbHash ?? "" : "";
-  return assetId != null ? RemoteThumbProvider(assetId: assetId, thumbhash: thumbhash) : null;
+  return assetId != null ? RemoteThumbProvider(assetId: assetId) : null;
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
-    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage)) && !asset.isEdited;
+    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -16,9 +16,8 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
   static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
-  final String thumbhash;
 
-  RemoteThumbProvider({required this.assetId, required this.thumbhash});
+  RemoteThumbProvider({required this.assetId});
 
   @override
   Future<RemoteThumbProvider> obtainKey(ImageConfiguration configuration) {
@@ -39,7 +38,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
 
   Stream<ImageInfo> _codec(RemoteThumbProvider key, ImageDecoderCallback decode) {
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash),
+      uri: getThumbnailUrlForRemoteId(key.assetId),
       headers: ApiService.getRequestHeaders(),
       cacheManager: cacheManager,
     );
@@ -50,23 +49,22 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteThumbProvider) {
-      return assetId == other.assetId && thumbhash == other.thumbhash;
+      return assetId == other.assetId;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
+  int get hashCode => assetId.hashCode;
 }
 
 class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
     with CancellableImageProviderMixin<RemoteFullImageProvider> {
   static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
-  final String thumbhash;
 
-  RemoteFullImageProvider({required this.assetId, required this.thumbhash});
+  RemoteFullImageProvider({required this.assetId});
 
   @override
   Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -77,7 +75,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
     return OneFramePlaceholderImageStreamCompleter(
       _codec(key, decode),
-      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId, thumbhash: key.thumbhash)),
+      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId)),
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Asset Id', key.assetId),
@@ -96,7 +94,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
 
     final headers = ApiService.getRequestHeaders();
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
+      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview),
       headers: headers,
       cacheManager: cacheManager,
     );
@@ -117,12 +115,12 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteFullImageProvider) {
-      return assetId == other.assetId && thumbhash == other.thumbhash;
+      return assetId == other.assetId;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
+  int get hashCode => assetId.hashCode;
 }

mobile/lib/presentation/widgets/images/thumbnail.widget.dart

@@ -21,14 +21,9 @@ class Thumbnail extends StatefulWidget {
 
   const Thumbnail({this.imageProvider, this.fit = BoxFit.cover, this.thumbhashProvider, super.key});
 
-  Thumbnail.remote({
-    required String remoteId,
-    required String thumbhash,
-    this.fit = BoxFit.cover,
-    Size size = kThumbnailResolution,
-    super.key,
-  }) : imageProvider = RemoteThumbProvider(assetId: remoteId, thumbhash: thumbhash),
-       thumbhashProvider = null;
+  Thumbnail.remote({required String remoteId, this.fit = BoxFit.cover, Size size = kThumbnailResolution, super.key})
+    : imageProvider = RemoteThumbProvider(assetId: remoteId),
+      thumbhashProvider = null;
 
   Thumbnail.fromAsset({
     required BaseAsset? asset,

mobile/lib/presentation/widgets/memory/memory_lane.widget.dart

@@ -60,11 +60,7 @@ class DriftMemoryCard extends ConsumerWidget {
             child: SizedBox(
               width: 205,
               height: 200,
-              child: Thumbnail.remote(
-                remoteId: memory.assets[0].id,
-                thumbhash: memory.assets[0].thumbHash ?? "",
-                fit: BoxFit.cover,
-              ),
+              child: Thumbnail.remote(remoteId: memory.assets[0].id, fit: BoxFit.cover),
             ),
           ),
           Positioned(

mobile/lib/providers/app_life_cycle.provider.dart

@@ -160,7 +160,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
             _resumeBackup();
           }),
           _resumeBackup(),
-          _safeRun(backgroundManager.syncCloudIds(), "syncCloudIds"),
+          backgroundManager.syncCloudIds(),
         ]);
       } else {
         await _safeRun(backgroundManager.hashAssets(), "hashAssets");
@@ -218,14 +218,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
 
     try {
       if (Store.isBetaTimelineEnabled) {
-        unawaited(
-          Future.wait([
-            _ref.read(backgroundWorkerLockServiceProvider).unlock(),
-            _ref.read(nativeSyncApiProvider).cancelHashing(),
-            _ref.read(backgroundSyncProvider).cancel(),
-            _ref.read(backgroundSyncProvider).cancelLocal(),
-          ]),
-        );
+        unawaited(_ref.read(backgroundWorkerLockServiceProvider).unlock());
       }
       await _performPause();
     } catch (e, stackTrace) {

mobile/lib/providers/background_sync.provider.dart

@@ -21,13 +21,7 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
         backupProvider.updateError(isSuccess == true ? BackupError.none : BackupError.syncFailed);
       }
     },
-    onRemoteSyncError: (error) {
-      syncStatusNotifier.errorRemoteSync(error);
-      final backupProvider = ref.read(driftBackupProvider.notifier);
-      if (backupProvider.mounted) {
-        backupProvider.updateError(BackupError.syncFailed);
-      }
-    },
+    onRemoteSyncError: syncStatusNotifier.errorRemoteSync,
     onLocalSyncStart: syncStatusNotifier.startLocalSync,
     onLocalSyncComplete: syncStatusNotifier.completeLocalSync,
     onLocalSyncError: syncStatusNotifier.errorLocalSync,

mobile/lib/providers/cast.provider.dart

@@ -69,7 +69,6 @@ class CastNotifier extends StateNotifier<CastManagerState> {
           : AssetType.other,
       createdAt: asset.fileCreatedAt,
       updatedAt: asset.updatedAt,
-      isEdited: false,
     );
 
     _gCastService.loadMedia(remoteAsset, reload);

mobile/lib/providers/websocket.provider.dart

@@ -144,7 +144,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
           socket.on('on_asset_hidden', _handleOnAssetHidden);
         } else {
           socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
-          socket.on('AssetEditReadyV1', _handleSyncAssetEditReady);
         }
 
         socket.on('on_config_update', _handleOnConfigUpdate);
@@ -193,12 +192,10 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
   void stopListeningToBetaEvents() {
     state.socket?.off('AssetUploadReadyV1');
-    state.socket?.off('AssetEditReadyV1');
   }
 
   void startListeningToBetaEvents() {
     state.socket?.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
-    state.socket?.on('AssetEditReadyV1', _handleSyncAssetEditReady);
   }
 
   void listenUploadEvent() {
@@ -318,10 +315,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _batchDebouncer.run(_processBatchedAssetUploadReady);
   }
 
-  void _handleSyncAssetEditReady(dynamic data) {
-    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditBatch([data]));
-  }
-
   void _processBatchedAssetUploadReady() {
     if (_batchedAssetUploadReady.isEmpty) {
       return;

mobile/lib/repositories/file_media.repository.dart

@@ -25,7 +25,6 @@ class FileMediaRepository {
       type: AssetType.image,
       createdAt: entity.createDateTime,
       updatedAt: entity.modifiedDateTime,
-      isEdited: false,
     );
   }
 

mobile/lib/theme/theme_data.dart

@@ -61,12 +61,7 @@ ThemeData getThemeData({required ColorScheme colorScheme, required Locale locale
       ),
     ),
     chipTheme: const ChipThemeData(side: BorderSide.none),
-    sliderTheme: const SliderThemeData(
-      thumbShape: RoundSliderThumbShape(enabledThumbRadius: 7),
-      trackHeight: 2.0,
-      // ignore: deprecated_member_use
-      year2023: false,
-    ),
+    sliderTheme: const SliderThemeData(thumbShape: RoundSliderThumbShape(enabledThumbRadius: 7), trackHeight: 2.0),
     bottomNavigationBarTheme: const BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed),
     popupMenuTheme: const PopupMenuThemeData(
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),

mobile/lib/utils/image_url_builder.dart

@@ -50,10 +50,8 @@ String getThumbnailUrlForRemoteId(
   final String id, {
   AssetMediaSize type = AssetMediaSize.thumbnail,
   bool edited = true,
-  String? thumbhash,
 }) {
-  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
-  return thumbhash != null ? '$url&c=${Uri.encodeComponent(thumbhash)}' : url;
+  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
 }
 
 String getPlaybackUrlForRemoteId(final String id) {

mobile/lib/utils/isolate.dart

@@ -1,307 +1,95 @@
 import 'dart:async';
-import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/wm_executor.dart';
 import 'package:logging/logging.dart';
+import 'package:worker_manager/worker_manager.dart';
 
-class CancellableTask<T> {
-  final Future<T?> future;
-  final void Function() cancel;
+class InvalidIsolateUsageException implements Exception {
+  const InvalidIsolateUsageException();
 
-  const CancellableTask({required this.future, required this.cancel});
+  @override
+  String toString() => "IsolateHelper should only be used from the root isolate";
+}
 
-  CancellableTask<T> whenComplete(void Function() action) {
-    return CancellableTask(future: future.whenComplete(action), cancel: cancel);
+// !! Should be used only from the root isolate
+Cancelable<T?> runInIsolateGentle<T>({
+  required Future<T> Function(ProviderContainer ref) computation,
+  String? debugLabel,
+}) {
+  final token = RootIsolateToken.instance;
+  if (token == null) {
+    throw const InvalidIsolateUsageException();
   }
 
-  CancellableTask<T> catchError(Function onError) {
-    return CancellableTask(future: future.catchError(onError), cancel: cancel);
-  }
+  return workerManagerPatch.executeGentle((cancelledChecker) async {
+    T? result;
+    await runZonedGuarded(
+      () async {
+        BackgroundIsolateBinaryMessenger.ensureInitialized(token);
+        DartPluginRegistrant.ensureInitialized();
 
-  CancellableTask<R> then<R>(FutureOr<R> Function(T?) onValue) {
-    return CancellableTask(future: future.then(onValue), cancel: cancel);
-  }
-}
-
-sealed class _IsolateMessage {
-  const _IsolateMessage();
-}
-
-class _InitMessage extends _IsolateMessage {
-  final SendPort sendPort;
-  const _InitMessage(this.sendPort);
-}
-
-class _CancelMessage extends _IsolateMessage {
-  const _CancelMessage();
-}
-
-class _ResultMessage extends _IsolateMessage {
-  final dynamic data;
-  const _ResultMessage(this.data);
-}
-
-class _ErrorMessage extends _IsolateMessage {
-  final Object? error;
-  final StackTrace? stackTrace;
-  const _ErrorMessage(this.error, [this.stackTrace]);
-}
-
-class _DoneMessage extends _IsolateMessage {
-  const _DoneMessage();
-}
-
-class _IsolateTaskConfig<T> {
-  final Future<T> Function(ProviderContainer ref) computation;
-  final SendPort mainSendPort;
-  final RootIsolateToken rootToken;
-  final String debugLabel;
-
-  const _IsolateTaskConfig({
-    required this.computation,
-    required this.mainSendPort,
-    required this.rootToken,
-    required this.debugLabel,
-  });
-}
-
-class _IsolateTaskRunner<T> {
-  final Completer<T?> _completer = Completer<T?>();
-  final ReceivePort _receivePort = ReceivePort();
-  final String debugLabel;
-
-  Isolate? _isolate;
-  SendPort? _isolateSendPort;
-  bool _isCancelled = false;
-  bool _isCleanedUp = false;
-  Timer? _cleanupTimeoutTimer;
-
-  _IsolateTaskRunner({required this.debugLabel});
-
-  Future<void> start(Future<T> Function(ProviderContainer ref) computation) async {
-    final token = RootIsolateToken.instance;
-    if (token == null) {
-      _completer.completeError(Exception("RootIsolateToken is not available. Isolate cannot be started."));
-      return;
-    }
-
-    _receivePort.listen(_handleMessage);
-
-    final config = _IsolateTaskConfig<T>(
-      computation: computation,
-      mainSendPort: _receivePort.sendPort,
-      rootToken: token,
-      debugLabel: debugLabel,
-    );
-
-    try {
-      _isolate = await Isolate.spawn(_isolateEntryPoint<T>, config, debugName: debugLabel);
-    } catch (error, stack) {
-      _completer.completeError(error, stack);
-      _cleanup();
-    }
-  }
-
-  void cancel() {
-    if (_isCancelled || _isCleanedUp) return;
-
-    _isCancelled = true;
-    dPrint(() => "[$debugLabel] Cancellation requested");
-
-    _isolateSendPort?.send(const _CancelMessage());
-    _cleanupTimeoutTimer = Timer(const Duration(seconds: 4), () {
-      if (!_isCleanedUp) {
-        dPrint(() => "[$debugLabel] Cleanup timeout - force killing isolate");
-        _isolate?.kill(priority: Isolate.immediate);
-        if (!_completer.isCompleted) {
-          _completer.completeError(Exception("Isolate cleanup timed out for task: $debugLabel"));
-        }
-        _cleanup();
-      }
-    });
-  }
-
-  void _handleMessage(dynamic message) {
-    if (message is! _IsolateMessage) return;
-
-    switch (message) {
-      case _InitMessage(:var sendPort):
-        _isolateSendPort = sendPort;
-        dPrint(() => "[$debugLabel] Isolate initialized");
-        break;
-
-      case _ResultMessage(:var data):
-        _cleanup();
-        if (!_completer.isCompleted) {
-          _completer.complete(data as T?);
-          dPrint(() => "[$debugLabel] Isolate task completed with result - $data");
-        }
-        break;
-
-      case _ErrorMessage(:var error, :var stackTrace):
-        _cleanup();
-        if (!_completer.isCompleted) {
-          dPrint(() => "[$debugLabel] Isolate task completed with error - $error");
-          _completer.completeError(error ?? Exception("Unknown error in isolate"), stackTrace ?? StackTrace.current);
-        }
-        break;
-
-      case _DoneMessage():
-        dPrint(() => "[$debugLabel] Isolate cleanup completed");
-        _cleanup();
-        break;
-
-      case _CancelMessage():
-        // Not expected to receive cancel from isolate
-        break;
-    }
-  }
-
-  void _cleanup() {
-    if (_isCleanedUp) return;
-    _isCleanedUp = true;
-
-    _cleanupTimeoutTimer?.cancel();
-    _receivePort.close();
-    _isolate?.kill(priority: Isolate.immediate);
-    _isolate = null;
-    _isolateSendPort = null;
-
-    dPrint(() => "[$debugLabel] Isolate cleaned up");
-  }
-
-  Future<T?> get future => _completer.future;
-}
-
-Future<void> _cleanupResources<T>(ProviderContainer? ref, Isar isar, Drift drift, DriftLogger logDb) async {
-  try {
-    final cleanupFutures = <Future>[
-      Store.dispose(),
-      LogService.I.dispose(),
-      logDb.close(),
-      drift.close(),
-      if (isar.isOpen) isar.close().catchError((_) => false),
-    ];
-
-    ref?.dispose();
-
-    await Future.wait(cleanupFutures).timeout(
-      const Duration(seconds: 2),
-      onTimeout: () {
-        dPrint(() => "Cleanup timeout - some resources may not be closed");
-        return [];
-      },
-    );
-  } catch (error, stack) {
-    dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
-  }
-}
-
-Future<void> _isolateEntryPoint<T>(_IsolateTaskConfig<T> config) async {
-  final receivePort = ReceivePort();
-  config.mainSendPort.send(_InitMessage(receivePort.sendPort));
-
-  bool isCancelled = false;
-  ProviderContainer? ref;
-  final Isar isar;
-  final Drift drift;
-  final DriftLogger logDb;
-
-  try {
-    BackgroundIsolateBinaryMessenger.ensureInitialized(config.rootToken);
-    DartPluginRegistrant.ensureInitialized();
-    final (bootIsar, bootDrift, bootLogDb) = await Bootstrap.initDB();
-    await Bootstrap.initDomain(bootIsar, bootDrift, bootLogDb, shouldBufferLogs: false, listenStoreUpdates: false);
-    isar = bootIsar;
-    drift = bootDrift;
-    logDb = bootLogDb;
-  } catch (error, stack) {
-    dPrint(() => "[$config.debugLabel] Error during isolate bootstrap: $error");
-    config.mainSendPort.send(_ErrorMessage(error, stack));
-    return;
-  }
-
-  final subscription = receivePort.listen((message) async {
-    if (message is _CancelMessage) {
-      isCancelled = true;
-      try {
-        receivePort.close();
-        await _cleanupResources(ref, isar, drift, logDb);
-      } catch (error, stack) {
-        dPrint(() => "Error during isolate cancellation cleanup: $error with stack: $stack");
-      } finally {
-        config.mainSendPort.send(const _ErrorMessage("Isolate task cancelled"));
-      }
-    }
-  });
-
-  final log = Logger("IsolateWorker[${config.debugLabel}]");
-  await runZonedGuarded(
-    () async {
-      try {
-        ref = ProviderContainer(
+        final (isar, drift, logDb) = await Bootstrap.initDB();
+        await Bootstrap.initDomain(isar, drift, logDb, shouldBufferLogs: false, listenStoreUpdates: false);
+        final ref = ProviderContainer(
           overrides: [
+            // TODO: Remove once isar is removed
             dbProvider.overrideWithValue(isar),
             isarProvider.overrideWithValue(isar),
-            cancellationProvider.overrideWithValue(() => isCancelled),
+            cancellationProvider.overrideWithValue(cancelledChecker),
             driftProvider.overrideWith(driftOverride(drift)),
           ],
         );
 
-        HttpSSLOptions.apply(applyNative: false);
-        final result = await config.computation(ref!);
+        Logger log = Logger("IsolateLogger");
 
-        if (!isCancelled) {
-          config.mainSendPort.send(_ResultMessage(result));
-        } else {
-          log.fine("Task completed but was cancelled - not sending result");
-        }
-      } catch (error, stack) {
-        log.severe("Error in isolate execution", error, stack);
-        config.mainSendPort.send(_ErrorMessage(error, stack));
-      } finally {
         try {
-          receivePort.close();
-          unawaited(subscription.cancel());
-          await _cleanupResources(ref, isar, drift, logDb);
+          HttpSSLOptions.apply(applyNative: false);
+          result = await computation(ref);
+        } on CanceledError {
+          log.warning("Computation cancelled ${debugLabel == null ? '' : ' for $debugLabel'}");
         } catch (error, stack) {
-          dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
+          log.severe("Error in runInIsolateGentle ${debugLabel == null ? '' : ' for $debugLabel'}", error, stack);
         } finally {
-          unawaited(subscription.cancel());
-          config.mainSendPort.send(const _DoneMessage());
+          try {
+            ref.dispose();
+
+            await Store.dispose();
+            await LogService.I.dispose();
+            await logDb.close();
+            await drift.close();
+
+            // Close Isar safely
+            try {
+              if (isar.isOpen) {
+                await isar.close();
+              }
+            } catch (e) {
+              dPrint(() => "Error closing Isar: $e");
+            }
+          } catch (error, stack) {
+            dPrint(() => "Error closing resources in isolate: $error, $stack");
+          } finally {
+            ref.dispose();
+            // Delay to ensure all resources are released
+            await Future.delayed(const Duration(seconds: 2));
+          }
         }
-      }
-    },
-    (error, stack) async {
-      dPrint(() => "Uncaught error in isolate zone: $error, $stack");
-      receivePort.close();
-      unawaited(subscription.cancel());
-      await _cleanupResources(ref, isar, drift, logDb);
-      config.mainSendPort.send(_ErrorMessage(error, stack));
-    },
-  );
-}
-
-CancellableTask<T> runInIsolateGentle<T>({
-  required Future<T> Function(ProviderContainer ref) computation,
-  String? debugLabel,
-}) {
-  final runner = _IsolateTaskRunner<T>(
-    debugLabel: debugLabel ?? 'isolate-task-${DateTime.now().millisecondsSinceEpoch}',
-  )..start(computation);
-
-  return CancellableTask<T>(future: runner.future, cancel: runner.cancel);
+      },
+      (error, stack) {
+        dPrint(() => "Error in isolate $debugLabel zone: $error, $stack");
+      },
+    );
+    return result;
+  });
 }

mobile/lib/utils/openapi_patching.dart

@@ -29,7 +29,6 @@ dynamic upgradeDto(dynamic value, String targetType) {
       if (value is Map) {
         addDefault(value, 'visibility', 'timeline');
         addDefault(value, 'createdAt', DateTime.now().toIso8601String());
-        addDefault(value, 'isEdited', false);
       }
       break;
     case 'UserAdminResponseDto':
@@ -47,10 +46,6 @@ dynamic upgradeDto(dynamic value, String targetType) {
         addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
         addDefault(value, 'hasProfileImage', false);
       }
-    case 'SyncAssetV1':
-      if (value is Map) {
-        addDefault(value, 'isEdited', false);
-      }
     case 'ServerFeaturesDto':
       if (value is Map) {
         addDefault(value, 'ocr', false);

mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart

@@ -65,7 +65,9 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
 
   double get scale {
     // for figuring out initial scale
-    final needsRecalc = markNeedsScaleRecalc && !scaleStateController.scaleState.isScaleStateZooming;
+    final isZooming = scaleStateController.scaleState.isScaleStateZooming;
+    final isUserInteracting = controller.position != Offset.zero;
+    final needsRecalc = markNeedsScaleRecalc && !isZooming && !isUserInteracting;
 
     final scaleExistsOnController = controller.scale != null;
     if (needsRecalc || !scaleExistsOnController) {

mobile/lib/widgets/search/person_name_edit_form.dart

@@ -33,7 +33,7 @@ class PersonNameEditForm extends HookConsumerWidget {
           decoration: InputDecoration(
             hintText: 'name'.tr(),
             border: const OutlineInputBorder(),
-            errorText: isError.value ? 'Error occurred' : null,
+            errorText: isError.value ? 'Error occured' : null,
           ),
         ),
       ),

mobile/lib/widgets/settings/asset_list_settings/asset_list_group_settings.dart

@@ -1,14 +1,14 @@
 import 'dart:async';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 
 class GroupSettings extends HookConsumerWidget {
   const GroupSettings({super.key});
@@ -33,24 +33,12 @@ class GroupSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "asset_list_group_by_sub_title".t(context: context),
-          icon: Icons.group_work_outlined,
-        ),
+        SettingsSubTitle(title: "asset_list_group_by_sub_title".tr()),
         SettingsRadioListTile(
           groups: [
-            SettingsRadioGroup(
-              title: 'asset_list_layout_settings_group_by_month_day'.t(context: context),
-              value: GroupAssetsBy.day,
-            ),
-            SettingsRadioGroup(
-              title: 'month'.t(context: context),
-              value: GroupAssetsBy.month,
-            ),
-            SettingsRadioGroup(
-              title: 'asset_list_layout_settings_group_automatically'.t(context: context),
-              value: GroupAssetsBy.auto,
-            ),
+            SettingsRadioGroup(title: 'asset_list_layout_settings_group_by_month_day'.tr(), value: GroupAssetsBy.day),
+            SettingsRadioGroup(title: 'month'.tr(), value: GroupAssetsBy.month),
+            SettingsRadioGroup(title: 'asset_list_layout_settings_group_automatically'.tr(), value: GroupAssetsBy.auto),
           ],
           groupBy: groupBy,
           onRadioChanged: changeGroupValue,

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -1,12 +1,11 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
 class LayoutSettings extends HookConsumerWidget {
@@ -20,13 +19,10 @@ class LayoutSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "asset_list_layout_sub_title".t(context: context),
-          icon: Icons.view_module_outlined,
-        ),
+        SettingsSubTitle(title: "asset_list_layout_sub_title".tr()),
         SettingsSwitchListTile(
           valueNotifier: useDynamicLayout,
-          title: "asset_list_layout_settings_dynamic_layout_title".t(context: context),
+          title: "asset_list_layout_settings_dynamic_layout_title".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSliderListTile(

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -1,9 +1,10 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -18,21 +19,21 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "photos".t(context: context),
-          icon: Icons.image_outlined,
-          subtitle: "setting_image_viewer_help".t(context: context),
+        SettingsSubTitle(title: "setting_image_viewer_title".tr()),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20),
+          title: Text('setting_image_viewer_help', style: context.textTheme.bodyMedium).tr(),
         ),
         SettingsSwitchListTile(
           valueNotifier: isPreview,
-          title: "setting_image_viewer_preview_title".t(context: context),
-          subtitle: "setting_image_viewer_preview_subtitle".t(context: context),
+          title: "setting_image_viewer_preview_title".tr(),
+          subtitle: "setting_image_viewer_preview_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: isOriginal,
-          title: "setting_image_viewer_original_title".t(context: context),
-          subtitle: "setting_image_viewer_original_subtitle".t(context: context),
+          title: "setting_image_viewer_original_title".tr(),
+          subtitle: "setting_image_viewer_original_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
       ],

mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart

@@ -1,9 +1,9 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -19,26 +19,23 @@ class VideoViewerSettings extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "videos".t(context: context),
-          icon: Icons.video_camera_back_outlined,
-        ),
+        SettingsSubTitle(title: "videos".tr()),
         SettingsSwitchListTile(
           valueNotifier: useAutoPlayVideo,
-          title: "setting_video_viewer_auto_play_title".t(context: context),
-          subtitle: "setting_video_viewer_auto_play_subtitle".t(context: context),
+          title: "setting_video_viewer_auto_play_title".tr(),
+          subtitle: "setting_video_viewer_auto_play_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: useLoopVideo,
-          title: "setting_video_viewer_looping_title".t(context: context),
-          subtitle: "loop_videos_description".t(context: context),
+          title: "setting_video_viewer_looping_title".tr(),
+          subtitle: "loop_videos_description".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
         SettingsSwitchListTile(
           valueNotifier: useOriginalVideo,
-          title: "setting_video_viewer_original_video_title".t(context: context),
-          subtitle: "setting_video_viewer_original_video_subtitle".t(context: context),
+          title: "setting_video_viewer_original_video_title".tr(),
+          subtitle: "setting_video_viewer_original_video_subtitle".tr(),
           onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
         ),
       ],

mobile/lib/widgets/settings/backup_settings/drift_backup_settings.dart

@@ -16,8 +16,6 @@ import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 
 class DriftBackupSettings extends ConsumerWidget {
@@ -27,25 +25,36 @@ class DriftBackupSettings extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return SettingsSubPageScaffold(
       settings: [
-        SettingGroupTitle(
-          title: "network_requirements".t(context: context),
-          icon: Icons.cell_tower,
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: Text(
+            "network_requirements".t(context: context).toUpperCase(),
+            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
+          ),
         ),
         const _UseWifiForUploadVideosButton(),
         const _UseWifiForUploadPhotosButton(),
         if (CurrentPlatform.isAndroid) ...[
           const Divider(),
-          SettingGroupTitle(
-            title: "background_options".t(context: context),
-            icon: Icons.charging_station_rounded,
+          Padding(
+            padding: const EdgeInsets.only(left: 16.0),
+            child: Text(
+              "background_options".t(context: context).toUpperCase(),
+              style: context.textTheme.labelSmall?.copyWith(
+                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+              ),
+            ),
           ),
           const _BackupOnlyWhenChargingButton(),
           const _BackupDelaySlider(),
         ],
         const Divider(),
-        SettingGroupTitle(
-          title: "backup_albums_sync".t(context: context),
-          icon: Icons.sync,
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: Text(
+            "backup_albums_sync".t(context: context).toUpperCase(),
+            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
+          ),
         ),
         const _AlbumSyncActionButton(),
       ],
@@ -96,67 +105,81 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0),
-      child: ListView(
-        shrinkWrap: true,
-        children: [
-          StreamBuilder(
-            stream: Store.watch(StoreKey.syncAlbums),
-            initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
-            builder: (context, snapshot) {
-              final albumSyncEnable = snapshot.data ?? false;
-              return Column(
-                children: [
-                  SettingListTile(
-                    title: "sync_albums".t(context: context),
-                    subtitle: "sync_upload_album_setting_subtitle".t(context: context),
-                    trailing: Switch(
-                      value: albumSyncEnable,
-                      onChanged: (bool newValue) async {
-                        await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
+    return ListView(
+      shrinkWrap: true,
+      children: [
+        StreamBuilder(
+          stream: Store.watch(StoreKey.syncAlbums),
+          initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
+          builder: (context, snapshot) {
+            final albumSyncEnable = snapshot.data ?? false;
+            return Column(
+              children: [
+                ListTile(
+                  title: Text(
+                    "sync_albums".t(context: context),
+                    style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+                  ),
+                  subtitle: Text(
+                    "sync_upload_album_setting_subtitle".t(context: context),
+                    style: context.textTheme.labelLarge,
+                  ),
+                  trailing: Switch(
+                    value: albumSyncEnable,
+                    onChanged: (bool newValue) async {
+                      await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
 
-                        if (newValue == true) {
-                          await _manageLinkedAlbums();
-                        }
-                      },
-                    ),
+                      if (newValue == true) {
+                        await _manageLinkedAlbums();
+                      }
+                    },
                   ),
-                  AnimatedSize(
-                    duration: const Duration(milliseconds: 300),
-                    curve: Curves.easeInOut,
-                    child: AnimatedOpacity(
-                      duration: const Duration(milliseconds: 200),
-                      opacity: albumSyncEnable ? 1.0 : 0.0,
-                      child: albumSyncEnable
-                          ? SettingListTile(
-                              onTap: _manualSyncAlbums,
-                              contentPadding: const EdgeInsets.only(left: 32, right: 16),
-                              title: "organize_into_albums".t(context: context),
-                              subtitle: "organize_into_albums_description".t(context: context),
-                              trailing: isAlbumSyncInProgress
-                                  ? const SizedBox(
-                                      width: 32,
-                                      height: 32,
-                                      child: CircularProgressIndicator.adaptive(strokeWidth: 2),
-                                    )
-                                  : IconButton(
-                                      onPressed: _manualSyncAlbums,
-                                      icon: const Icon(Icons.sync_rounded),
-                                      color: context.colorScheme.onSurface.withValues(alpha: 0.7),
-                                      iconSize: 20,
-                                      constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
-                                    ),
-                            )
-                          : const SizedBox.shrink(),
-                    ),
+                ),
+                AnimatedSize(
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                  child: AnimatedOpacity(
+                    duration: const Duration(milliseconds: 200),
+                    opacity: albumSyncEnable ? 1.0 : 0.0,
+                    child: albumSyncEnable
+                        ? ListTile(
+                            onTap: _manualSyncAlbums,
+                            contentPadding: const EdgeInsets.only(left: 32, right: 16),
+                            title: Text(
+                              "organize_into_albums".t(context: context),
+                              style: context.textTheme.titleSmall?.copyWith(
+                                color: context.colorScheme.onSurface,
+                                fontWeight: FontWeight.normal,
+                              ),
+                            ),
+                            subtitle: Text(
+                              "organize_into_albums_description".t(context: context),
+                              style: context.textTheme.bodyMedium?.copyWith(
+                                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                              ),
+                            ),
+                            trailing: isAlbumSyncInProgress
+                                ? const SizedBox(
+                                    width: 32,
+                                    height: 32,
+                                    child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+                                  )
+                                : IconButton(
+                                    onPressed: _manualSyncAlbums,
+                                    icon: const Icon(Icons.sync_rounded),
+                                    color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                                    iconSize: 20,
+                                    constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                                  ),
+                          )
+                        : const SizedBox.shrink(),
                   ),
-                ],
-              );
-            },
-          ),
-        ],
-      ),
+                ),
+              ],
+            );
+          },
+        ),
+      ],
     );
   }
 }
@@ -199,24 +222,24 @@ class _SettingsSwitchTileState extends ConsumerState<_SettingsSwitchTile> {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0),
-      child: SettingListTile(
-        title: widget.titleKey.t(context: context),
-        subtitle: widget.subtitleKey.t(context: context),
-        trailing: StreamBuilder(
-          stream: valueStream,
-          initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
-          builder: (context, snapshot) {
-            final value = snapshot.data ?? false;
-            return Switch(
-              value: value,
-              onChanged: (bool newValue) async {
-                await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
-              },
-            );
-          },
-        ),
+    return ListTile(
+      title: Text(
+        widget.titleKey.t(context: context),
+        style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+      ),
+      subtitle: Text(widget.subtitleKey.t(context: context), style: context.textTheme.labelLarge),
+      trailing: StreamBuilder(
+        stream: valueStream,
+        initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
+        builder: (context, snapshot) {
+          final value = snapshot.data ?? false;
+          return Switch(
+            value: value,
+            onChanged: (bool newValue) async {
+              await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
+            },
+          );
+        },
       ),
     );
   }
@@ -331,7 +354,7 @@ class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
             'backup_controller_page_background_delay'.tr(
               namedArgs: {'duration': formatBackupDelaySliderValue(currentValue)},
             ),
-            style: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500),
+            style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
           ),
         ),
         Slider(

mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart

@@ -34,36 +34,33 @@ class EntityCountTile extends StatelessWidget {
         children: [
           // Icon and Label
           Row(
-            mainAxisAlignment: MainAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.start,
             children: [
-              Icon(icon, color: context.primaryColor, size: 14),
-              const SizedBox(width: 4),
+              Icon(icon, color: context.primaryColor),
+              const SizedBox(width: 8),
               Flexible(
                 child: Text(
                   label,
-                  style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.w500),
+                  style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold, fontSize: 16),
                 ),
               ),
             ],
           ),
           // Number
           const Spacer(),
-          Padding(
-            padding: const EdgeInsets.only(top: 8.0),
-            child: RichText(
-              text: TextSpan(
-                style: const TextStyle(fontSize: 18, fontFamily: 'GoogleSansCode'),
-                children: [
-                  TextSpan(
-                    text: zeroPadding(count, maxDigits),
-                    style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
-                  ),
-                  TextSpan(
-                    text: count.toString(),
-                    style: TextStyle(color: context.colorScheme.onSurface),
-                  ),
-                ],
-              ),
+          RichText(
+            text: TextSpan(
+              style: const TextStyle(fontSize: 18, fontFamily: 'GoogleSansCode', fontWeight: FontWeight.w600),
+              children: [
+                TextSpan(
+                  text: zeroPadding(count, maxDigits),
+                  style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
+                ),
+                TextSpan(
+                  text: count.toString(),
+                  style: TextStyle(color: context.primaryColor),
+                ),
+              ],
             ),
           ),
         ],

mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart

@@ -16,8 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart'
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
@@ -114,39 +112,48 @@ class SyncStatusAndActions extends HookConsumerWidget {
       padding: const EdgeInsets.only(top: 16, bottom: 96),
       children: [
         const _SyncStatsCounts(),
-        const Divider(height: 10),
-        const SizedBox(height: 16),
-        SettingGroupTitle(title: "jobs".t(context: context)),
-        SettingListTile(
-          title: "sync_local".t(context: context),
-          subtitle: "tap_to_run_job".t(context: context),
+        const Divider(height: 1, indent: 16, endIndent: 16),
+        const SizedBox(height: 24),
+        _SectionHeaderText(text: "jobs".t(context: context)),
+        ListTile(
+          title: Text(
+            "sync_local".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           leading: const Icon(Icons.sync),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).localSyncStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).syncLocal(full: true);
           },
         ),
-        SettingListTile(
-          title: "sync_remote".t(context: context),
-          subtitle: "tap_to_run_job".t(context: context),
+        ListTile(
+          title: Text(
+            "sync_remote".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           leading: const Icon(Icons.cloud_sync),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).remoteSyncStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).syncRemote();
           },
         ),
-        SettingListTile(
-          title: "hash_asset".t(context: context),
+        ListTile(
+          title: Text(
+            "hash_asset".t(context: context),
+            style: const TextStyle(fontWeight: FontWeight.w500),
+          ),
           leading: const Icon(Icons.tag),
-          subtitle: "tap_to_run_job".t(context: context),
+          subtitle: Text("tap_to_run_job".t(context: context)),
           trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).hashJobStatus),
           onTap: () {
             ref.read(backgroundSyncProvider).hashAssets();
           },
         ),
-        const Divider(height: 1),
-        const SizedBox(height: 16),
-        SettingGroupTitle(title: "actions".t(context: context)),
+        const Divider(height: 1, indent: 16, endIndent: 16),
+        const SizedBox(height: 24),
+        _SectionHeaderText(text: "actions".t(context: context)),
         ListTile(
           title: Text(
             "clear_file_cache".t(context: context),
@@ -195,6 +202,26 @@ class _SyncStatusIcon extends StatelessWidget {
   }
 }
 
+class _SectionHeaderText extends StatelessWidget {
+  final String text;
+
+  const _SectionHeaderText({required this.text});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16.0),
+      child: Text(
+        text.toUpperCase(),
+        style: context.textTheme.labelLarge?.copyWith(
+          fontWeight: FontWeight.w500,
+          color: context.colorScheme.onSurface.withAlpha(200),
+        ),
+      ),
+    );
+  }
+}
+
 class _SyncStatsCounts extends ConsumerWidget {
   const _SyncStatsCounts();
 
@@ -252,9 +279,9 @@ class _SyncStatsCounts extends ConsumerWidget {
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SettingGroupTitle(title: "assets".t(context: context)),
+            _SectionHeaderText(text: "assets".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               // 1. Wrap in IntrinsicHeight
               child: IntrinsicHeight(
                 child: Flex(
@@ -282,9 +309,9 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ),
               ),
             ),
-            SettingGroupTitle(title: "albums".t(context: context)),
+            _SectionHeaderText(text: "albums".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               child: IntrinsicHeight(
                 child: Flex(
                   direction: Axis.horizontal,
@@ -310,9 +337,9 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ),
               ),
             ),
-            SettingGroupTitle(title: "other".t(context: context)),
+            _SectionHeaderText(text: "other".t(context: context)),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
               child: IntrinsicHeight(
                 child: Flex(
                   direction: Axis.horizontal,
@@ -341,7 +368,7 @@ class _SyncStatsCounts extends ConsumerWidget {
             // To be removed once the experimental feature is stable
             if (CurrentPlatform.isAndroid &&
                 appSettingsService.getSetting<bool>(AppSettingsEnum.manageLocalMediaAndroid)) ...[
-              SettingGroupTitle(title: "trash".t(context: context)),
+              _SectionHeaderText(text: "trash".t(context: context)),
               Consumer(
                 builder: (context, ref, _) {
                   final counts = ref.watch(trashedAssetsCountProvider);

mobile/lib/widgets/settings/beta_timeline_list_tile.dart

@@ -9,7 +9,6 @@ import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 
 class BetaTimelineListTile extends ConsumerWidget {
   const BetaTimelineListTile({super.key});
@@ -57,8 +56,8 @@ class BetaTimelineListTile extends ConsumerWidget {
 
     return Padding(
       padding: const EdgeInsets.only(left: 4.0),
-      child: SettingListTile(
-        title: "new_timeline".t(context: context),
+      child: ListTile(
+        title: Text("new_timeline".t(context: context)),
         trailing: Switch.adaptive(
           value: betaTimelineValue,
           onChanged: onSwitchChanged,

mobile/lib/widgets/settings/free_up_space_settings.dart

@@ -142,9 +142,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     final state = ref.watch(cleanupProvider);
     final hasDate = state.selectedDate != null;
     final hasAssets = _hasScanned && state.assetsToDelete.isNotEmpty;
-    final subtitleStyle = context.textTheme.bodyMedium!.copyWith(
-      color: context.textTheme.bodyMedium!.color!.withAlpha(215),
-    );
+
     StepStyle styleForState(StepState stepState, {bool isDestructive = false}) {
       switch (stepState) {
         case StepState.complete:
@@ -216,7 +214,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   borderRadius: const BorderRadius.all(Radius.circular(12)),
                   border: Border.all(color: context.primaryColor.withValues(alpha: 0.25)),
                 ),
-                child: Text('free_up_space_description'.t(context: context), style: context.textTheme.bodyMedium),
+                child: Text(
+                  'free_up_space_description'.t(context: context),
+                  style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
+                ),
               ),
             ),
 
@@ -255,7 +256,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   content: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Text('cutoff_date_description'.t(context: context), style: subtitleStyle),
+                      Text('cutoff_date_description'.t(context: context), style: context.textTheme.labelLarge),
                       const SizedBox(height: 16),
                       GridView.count(
                         shrinkWrap: true,
@@ -351,7 +352,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                   content: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Text('cleanup_filter_description'.t(context: context), style: subtitleStyle),
+                      Text('cleanup_filter_description'.t(context: context), style: context.textTheme.labelLarge),
                       const SizedBox(height: 16),
                       SegmentedButton<AssetFilterType>(
                         segments: [
@@ -380,15 +381,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                       const SizedBox(height: 16),
                       SwitchListTile(
                         contentPadding: EdgeInsets.zero,
-                        title: Text(
-                          'keep_favorites'.t(context: context),
-                          style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-                        ),
+                        title: Text('keep_favorites'.t(context: context), style: context.textTheme.titleSmall),
                         subtitle: Text(
                           'keep_favorites_description'.t(context: context),
-                          style: context.textTheme.bodyMedium!.copyWith(
-                            color: context.textTheme.bodyMedium!.color!.withAlpha(215),
-                          ),
+                          style: context.textTheme.labelLarge,
                         ),
                         value: state.keepFavorites,
                         onChanged: (value) {
@@ -439,7 +435,10 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
                       : null,
                   content: Column(
                     children: [
-                      Text('cleanup_step3_description'.t(context: context), style: subtitleStyle),
+                      Text(
+                        'cleanup_step3_description'.t(context: context),
+                        style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
+                      ),
                       if (CurrentPlatform.isIOS) ...[
                         const SizedBox(height: 12),
                         Container(

mobile/lib/widgets/settings/networking_settings/endpoint_input.dart

@@ -117,7 +117,7 @@ class EndpointInputState extends ConsumerState<EndpointInput> {
           autovalidateMode: AutovalidateMode.onUserInteraction,
           validator: validateUrl,
           keyboardType: TextInputType.url,
-          style: const TextStyle(fontFamily: 'GoogleSansCode', fontSize: 14),
+          style: const TextStyle(fontFamily: 'GoogleSansCode', fontWeight: FontWeight.w600, fontSize: 14),
           decoration: InputDecoration(
             hintText: 'http(s)://immich.domain.com',
             contentPadding: const EdgeInsets.all(16),

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
@@ -103,7 +103,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
               children: [
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 24),
-                  child: Text("external_network_sheet_info".t(context: context), style: context.textTheme.bodyMedium),
+                  child: Text("external_network_sheet_info".tr(), style: context.textTheme.bodyMedium),
                 ),
                 const SizedBox(height: 4),
                 Divider(color: context.colorScheme.surfaceContainerHighest),
@@ -135,7 +135,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
                     height: 48,
                     child: OutlinedButton.icon(
                       icon: const Icon(Icons.add),
-                      label: Text('add_endpoint'.t(context: context)),
+                      label: Text('add_endpoint'.tr().toUpperCase()),
                       onPressed: enabled
                           ? () {
                               entries.value = [

mobile/lib/widgets/settings/networking_settings/local_network_preference.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 
@@ -168,12 +167,13 @@ class LocalNetworkPreference extends HookConsumerWidget {
                       enabled: enabled,
                       contentPadding: const EdgeInsets.only(left: 24, right: 8),
                       leading: const Icon(Icons.lan_rounded),
-                      title: Text("server_endpoint".t(context: context)),
+                      title: Text("server_endpoint".tr()),
                       subtitle: localEndpointText.value.isEmpty
                           ? const Text("http://local-ip:2283")
                           : Text(
                               localEndpointText.value,
                               style: context.textTheme.labelLarge?.copyWith(
+                                fontWeight: FontWeight.bold,
                                 color: enabled ? context.primaryColor : context.colorScheme.onSurface.withAlpha(100),
                                 fontFamily: 'GoogleSansCode',
                               ),
@@ -190,7 +190,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
                         height: 48,
                         child: OutlinedButton.icon(
                           icon: const Icon(Icons.wifi_find_rounded),
-                          label: Text('use_current_connection'.t(context: context)),
+                          label: Text('use_current_connection'.tr().toUpperCase()),
                           onPressed: enabled ? autofillCurrentNetwork : null,
                         ),
                       ),

mobile/lib/widgets/settings/networking_settings/networking_settings.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -11,7 +10,6 @@ import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/external_network_preference.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/local_network_preference.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
 class NetworkingSettings extends HookConsumerWidget {
@@ -89,10 +87,12 @@ class NetworkingSettings extends HookConsumerWidget {
     return ListView(
       padding: const EdgeInsets.only(bottom: 96),
       children: <Widget>[
-        const SizedBox(height: 8),
-        SettingGroupTitle(
-          title: "current_server_address".t(context: context),
-          icon: (currentEndpoint?.startsWith('https') ?? false) ? Icons.https_outlined : Icons.http_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 8, left: 16, bottom: 8),
+          child: NetworkPreferenceTitle(
+            title: "current_server_address".tr().toUpperCase(),
+            icon: (currentEndpoint?.startsWith('https') ?? false) ? Icons.https_outlined : Icons.http_outlined,
+          ),
         ),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -108,7 +108,12 @@ class NetworkingSettings extends HookConsumerWidget {
                   : const Icon(Icons.circle_outlined),
               title: Text(
                 currentEndpoint ?? "--",
-                style: TextStyle(fontSize: 14, fontFamily: 'GoogleSansCode', color: context.primaryColor),
+                style: TextStyle(
+                  fontSize: 16,
+                  fontFamily: 'GoogleSansCode',
+                  fontWeight: FontWeight.bold,
+                  color: context.primaryColor,
+                ),
               ),
             ),
           ),
@@ -123,16 +128,14 @@ class NetworkingSettings extends HookConsumerWidget {
           title: "automatic_endpoint_switching_title".tr(),
           subtitle: "automatic_endpoint_switching_subtitle".tr(),
         ),
-        const SizedBox(height: 8),
-        SettingGroupTitle(
-          title: "local_network".t(context: context),
-          icon: Icons.home_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 8, left: 16, bottom: 16),
+          child: NetworkPreferenceTitle(title: "local_network".tr().toUpperCase(), icon: Icons.home_outlined),
         ),
         LocalNetworkPreference(enabled: featureEnabled.value),
-        const SizedBox(height: 16),
-        SettingGroupTitle(
-          title: "external_network".t(context: context),
-          icon: Icons.dns_outlined,
+        Padding(
+          padding: const EdgeInsets.only(top: 32, left: 16, bottom: 16),
+          child: NetworkPreferenceTitle(title: "external_network".tr().toUpperCase(), icon: Icons.dns_outlined),
         ),
         ExternalNetworkPreference(enabled: featureEnabled.value),
       ],
@@ -140,6 +143,30 @@ class NetworkingSettings extends HookConsumerWidget {
   }
 }
 
+class NetworkPreferenceTitle extends StatelessWidget {
+  const NetworkPreferenceTitle({super.key, required this.icon, required this.title});
+
+  final IconData icon;
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Icon(icon, color: context.colorScheme.onSurface.withAlpha(150)),
+        const SizedBox(width: 8),
+        Text(
+          title,
+          style: context.textTheme.displaySmall?.copyWith(
+            color: context.colorScheme.onSurface.withAlpha(200),
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
 class NetworkStatusIcon extends StatelessWidget {
   const NetworkStatusIcon({super.key, required this.status, this.enabled = true}) : super();
 
@@ -148,10 +175,10 @@ class NetworkStatusIcon extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return AnimatedSwitcher(duration: const Duration(milliseconds: 200), child: buildIcon(context));
+    return AnimatedSwitcher(duration: const Duration(milliseconds: 200), child: _buildIcon(context));
   }
 
-  Widget buildIcon(BuildContext context) => switch (status) {
+  Widget _buildIcon(BuildContext context) => switch (status) {
     AuxCheckStatus.loading => Padding(
       padding: const EdgeInsets.only(left: 4.0),
       child: SizedBox(

mobile/lib/widgets/settings/preference_settings/haptic_setting.dart

@@ -1,9 +1,9 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -22,13 +22,10 @@ class HapticSetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "haptic_feedback_title".t(context: context),
-          icon: Icons.vibration_outlined,
-        ),
+        SettingsSubTitle(title: "haptic_feedback_title".tr()),
         SettingsSwitchListTile(
           valueNotifier: isHapticFeedbackEnabled,
-          title: 'enabled'.t(context: context),
+          title: 'haptic_feedback_switch'.tr(),
           onChanged: onHapticFeedbackChange,
         ),
       ],

mobile/lib/widgets/settings/preference_settings/theme_setting.dart

@@ -1,12 +1,12 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/primary_color_setting.dart';
-import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
@@ -74,26 +74,23 @@ class ThemeSetting extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SettingGroupTitle(
-          title: "theme".t(context: context),
-          icon: Icons.color_lens_outlined,
-        ),
+        SettingsSubTitle(title: "theme".tr()),
         SettingsSwitchListTile(
           valueNotifier: isSystemTheme,
-          title: 'theme_setting_system_theme_switch'.t(context: context),
+          title: 'theme_setting_system_theme_switch'.tr(),
           onChanged: onSystemThemeChange,
         ),
         if (currentTheme.value != ThemeMode.system)
           SettingsSwitchListTile(
             valueNotifier: isDarkTheme,
-            title: 'map_settings_dark_mode'.t(context: context),
+            title: 'map_settings_dark_mode'.tr(),
             onChanged: onThemeChange,
           ),
         const PrimaryColorSetting(),
         SettingsSwitchListTile(
           valueNotifier: applyThemeToBackgroundProvider,
-          title: "theme_setting_colorful_interface_title".t(context: context),
-          subtitle: 'theme_setting_colorful_interface_subtitle'.t(context: context),
+          title: "theme_setting_colorful_interface_title".tr(),
+          subtitle: 'theme_setting_colorful_interface_subtitle'.tr(),
           onChanged: onSurfaceColorSettingChange,
         ),
       ],

mobile/lib/widgets/settings/setting_group_title.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-
-class SettingGroupTitle extends StatelessWidget {
-  final String title;
-  final String? subtitle;
-  final IconData? icon;
-  final EdgeInsetsGeometry? contentPadding;
-
-  const SettingGroupTitle({super.key, required this.title, this.icon, this.subtitle, this.contentPadding});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: contentPadding ?? const EdgeInsets.only(left: 20.0, right: 20.0, bottom: 8.0),
-      child: Column(
-        children: [
-          Row(
-            children: [
-              if (icon != null) ...[
-                Icon(icon, color: context.colorScheme.onSurfaceSecondary, size: 20),
-                const SizedBox(width: 8),
-              ],
-              Text(title, style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary)),
-            ],
-          ),
-          if (subtitle != null) ...[
-            const SizedBox(height: 8),
-            Text(
-              subtitle!,
-              style: context.textTheme.bodyMedium!.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
-            ),
-          ],
-        ],
-      ),
-    );
-  }
-}

mobile/lib/widgets/settings/setting_list_tile.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class SettingListTile extends StatelessWidget {
-  final String title;
-  final String? subtitle;
-  final Widget? leading;
-  final Widget? trailing;
-  final VoidCallback? onTap;
-  final EdgeInsetsGeometry? contentPadding;
-
-  const SettingListTile({
-    required this.title,
-    this.subtitle,
-    this.leading,
-    this.trailing,
-    this.onTap,
-    this.contentPadding,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(title, style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5)),
-      subtitle: subtitle != null
-          ? Text(
-              subtitle!,
-              style: context.textTheme.bodyMedium!.copyWith(color: context.textTheme.bodyMedium!.color!.withAlpha(215)),
-            )
-          : null,
-      leading: leading,
-      trailing: trailing,
-      onTap: onTap,
-      contentPadding: contentPadding,
-    );
-  }
-}

mobile/lib/widgets/settings/settings_card.dart

@@ -36,8 +36,11 @@ class SettingsCard extends StatelessWidget {
             padding: const EdgeInsets.all(16.0),
             child: Icon(icon, color: context.primaryColor),
           ),
-          title: Text(title, style: context.textTheme.titleMedium!.copyWith(color: context.primaryColor)),
-          subtitle: Text(subtitle, style: context.textTheme.bodyMedium),
+          title: Text(
+            title,
+            style: context.textTheme.titleMedium!.copyWith(fontWeight: FontWeight.w600, color: context.primaryColor),
+          ),
+          subtitle: Text(subtitle, style: context.textTheme.labelLarge),
           onTap: () => context.pushRoute(settingRoute),
         ),
       ),

mobile/lib/widgets/settings/settings_sub_page_scaffold.dart

@@ -9,11 +9,13 @@ class SettingsSubPageScaffold extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView.separated(
-      padding: const EdgeInsets.symmetric(vertical: 16),
+      padding: const EdgeInsets.symmetric(vertical: 20),
       itemCount: settings.length,
       itemBuilder: (ctx, index) => settings[index],
       separatorBuilder: (context, index) => showDivider
-          ? const Column(children: [SizedBox(height: 5), Divider(height: 10), SizedBox(height: 15)])
+          ? const Column(
+              children: [SizedBox(height: 5), Divider(height: 10, indent: 15, endIndent: 15), SizedBox(height: 15)],
+            )
           : const SizedBox(height: 10),
     );
   }

mobile/lib/wm_executor.dart

@@ -0,0 +1,251 @@
+// part of 'package:worker_manager/worker_manager.dart';
+// ignore_for_file: implementation_imports, avoid_print
+
+import 'dart:async';
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
+import 'package:worker_manager/src/number_of_processors/processors_io.dart';
+import 'package:worker_manager/src/worker/worker.dart';
+import 'package:worker_manager/worker_manager.dart';
+
+final workerManagerPatch = _Executor();
+
+// [-2^54; 2^53] is compatible with dart2js, see core.int doc
+const _minId = -9007199254740992;
+const _maxId = 9007199254740992;
+
+class Mixinable<T> {
+  late final itSelf = this as T;
+}
+
+mixin _ExecutorLogger on Mixinable<_Executor> {
+  var log = false;
+
+  @mustCallSuper
+  void init() {
+    logMessage("${itSelf._isolatesCount} workers have been spawned and initialized");
+  }
+
+  void logTaskAdded<R>(String uid) {
+    logMessage("added task with number $uid");
+  }
+
+  @mustCallSuper
+  void dispose() {
+    logMessage("worker_manager have been disposed");
+  }
+
+  @mustCallSuper
+  void _cancel(Task task) {
+    logMessage("Task ${task.id} have been canceled");
+  }
+
+  void logMessage(String message) {
+    if (log) print(message);
+  }
+}
+
+class _Executor extends Mixinable<_Executor> with _ExecutorLogger {
+  final _queue = PriorityQueue<Task>();
+  final _pool = <Worker>[];
+  var _nextTaskId = _minId;
+  var _dynamicSpawning = false;
+  var _isolatesCount = numberOfProcessors;
+
+  @override
+  Future<void> init({int? isolatesCount, bool? dynamicSpawning}) async {
+    if (_pool.isNotEmpty) {
+      print("worker_manager already warmed up, init is ignored. Dispose before init");
+      return;
+    }
+    if (isolatesCount != null) {
+      if (isolatesCount < 0) {
+        throw Exception("isolatesCount must be greater than 0");
+      }
+
+      _isolatesCount = isolatesCount;
+    }
+    _dynamicSpawning = dynamicSpawning ?? false;
+    await _ensureWorkersInitialized();
+    super.init();
+  }
+
+  @override
+  Future<void> dispose() async {
+    _queue.clear();
+    for (final worker in _pool) {
+      worker.kill();
+    }
+    _pool.clear();
+    super.dispose();
+  }
+
+  Cancelable<R> execute<R>(Execute<R> execution, {WorkPriority priority = WorkPriority.immediately}) {
+    return _createCancelable<R>(execution: execution, priority: priority);
+  }
+
+  Cancelable<R> executeNow<R>(ExecuteGentle<R> execution) {
+    final task = TaskGentle<R>(
+      id: "",
+      workPriority: WorkPriority.immediately,
+      execution: execution,
+      completer: Completer<R>(),
+    );
+
+    Future<void> run() async {
+      try {
+        final result = await execution(() => task.canceled);
+        task.complete(result, null, null);
+      } catch (error, st) {
+        task.complete(null, error, st);
+      }
+    }
+
+    run();
+    return Cancelable(completer: task.completer, onCancel: () => _cancel(task));
+  }
+
+  Cancelable<R> executeWithPort<R, T>(
+    ExecuteWithPort<R> execution, {
+    WorkPriority priority = WorkPriority.immediately,
+    required void Function(T value) onMessage,
+  }) {
+    return _createCancelable<R>(
+      execution: execution,
+      priority: priority,
+      onMessage: (message) => onMessage(message as T),
+    );
+  }
+
+  Cancelable<R> executeGentle<R>(ExecuteGentle<R> execution, {WorkPriority priority = WorkPriority.immediately}) {
+    return _createCancelable<R>(execution: execution, priority: priority);
+  }
+
+  Cancelable<R> executeGentleWithPort<R, T>(
+    ExecuteGentleWithPort<R> execution, {
+    WorkPriority priority = WorkPriority.immediately,
+    required void Function(T value) onMessage,
+  }) {
+    return _createCancelable<R>(
+      execution: execution,
+      priority: priority,
+      onMessage: (message) => onMessage(message as T),
+    );
+  }
+
+  void _createWorkers() {
+    for (var i = 0; i < _isolatesCount; i++) {
+      _pool.add(Worker());
+    }
+  }
+
+  Future<void> _initializeWorkers() async {
+    await Future.wait(_pool.map((e) => e.initialize()));
+  }
+
+  Cancelable<R> _createCancelable<R>({
+    required Function execution,
+    WorkPriority priority = WorkPriority.immediately,
+    void Function(Object value)? onMessage,
+  }) {
+    if (_nextTaskId + 1 == _maxId) {
+      _nextTaskId = _minId;
+    }
+    final id = _nextTaskId.toString();
+    _nextTaskId++;
+    late final Task<R> task;
+    final completer = Completer<R>();
+    if (execution is Execute<R>) {
+      task = TaskRegular<R>(id: id, workPriority: priority, execution: execution, completer: completer);
+    } else if (execution is ExecuteWithPort<R>) {
+      task = TaskWithPort<R>(
+        id: id,
+        workPriority: priority,
+        execution: execution,
+        completer: completer,
+        onMessage: onMessage!,
+      );
+    } else if (execution is ExecuteGentle<R>) {
+      task = TaskGentle<R>(id: id, workPriority: priority, execution: execution, completer: completer);
+    } else if (execution is ExecuteGentleWithPort<R>) {
+      task = TaskGentleWithPort<R>(
+        id: id,
+        workPriority: priority,
+        execution: execution,
+        completer: completer,
+        onMessage: onMessage!,
+      );
+    }
+    _queue.add(task);
+    _schedule();
+    logTaskAdded(task.id);
+    return Cancelable(completer: task.completer, onCancel: () => _cancel(task));
+  }
+
+  Future<void> _ensureWorkersInitialized() async {
+    if (_pool.isEmpty) {
+      _createWorkers();
+      if (!_dynamicSpawning) {
+        await _initializeWorkers();
+        final poolSize = _pool.length;
+        final queueSize = _queue.length;
+        for (int i = 0; i <= min(poolSize, queueSize); i++) {
+          _schedule();
+        }
+      }
+    }
+    if (_pool.every((worker) => worker.taskId != null)) {
+      return;
+    }
+    if (_dynamicSpawning) {
+      final freeWorker = _pool.firstWhereOrNull(
+        (worker) => worker.taskId == null && !worker.initialized && !worker.initializing,
+      );
+      await freeWorker?.initialize();
+      _schedule();
+    }
+  }
+
+  void _schedule() {
+    final availableWorker = _pool.firstWhereOrNull((worker) => worker.taskId == null && worker.initialized);
+    if (availableWorker == null) {
+      _ensureWorkersInitialized();
+      return;
+    }
+    if (_queue.isEmpty) return;
+    final task = _queue.removeFirst();
+
+    availableWorker
+        .work(task)
+        .then(
+          (value) {
+            //could be completed already by cancel and it is normal.
+            //Assuming that worker finished with error and cleaned gracefully
+            task.complete(value, null, null);
+          },
+          onError: (error, st) {
+            task.complete(null, error, st);
+          },
+        )
+        .whenComplete(() {
+          if (_dynamicSpawning && _queue.isEmpty) availableWorker.kill();
+          _schedule();
+        });
+  }
+
+  @override
+  void _cancel(Task task) {
+    task.cancel();
+    _queue.remove(task);
+    final targetWorker = _pool.firstWhereOrNull((worker) => worker.taskId == task.id);
+    if (task is Gentle) {
+      targetWorker?.cancelGentle();
+    } else {
+      targetWorker?.kill();
+      if (!_dynamicSpawning) targetWorker?.initialize();
+    }
+    super._cancel(task);
+  }
+}

mobile/openapi/README.md

@@ -138,11 +138,6 @@ Class | Method | HTTP request | Description
 *AuthenticationApi* | [**unlockAuthSession**](doc//AuthenticationApi.md#unlockauthsession) | **POST** /auth/session/unlock | Unlock auth session
 *AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | Validate access token
 *AuthenticationAdminApi* | [**unlinkAllOAuthAccountsAdmin**](doc//AuthenticationAdminApi.md#unlinkalloauthaccountsadmin) | **POST** /admin/auth/unlink-all | Unlink all OAuth accounts
-*DatabaseBackupsAdminApi* | [**deleteDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#deletedatabasebackup) | **DELETE** /admin/database-backups | Delete database backup
-*DatabaseBackupsAdminApi* | [**downloadDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#downloaddatabasebackup) | **GET** /admin/database-backups/{filename} | Download database backup
-*DatabaseBackupsAdminApi* | [**listDatabaseBackups**](doc//DatabaseBackupsAdminApi.md#listdatabasebackups) | **GET** /admin/database-backups | List database backups
-*DatabaseBackupsAdminApi* | [**startDatabaseRestoreFlow**](doc//DatabaseBackupsAdminApi.md#startdatabaserestoreflow) | **POST** /admin/database-backups/start-restore | Start database backup restore flow
-*DatabaseBackupsAdminApi* | [**uploadDatabaseBackup**](doc//DatabaseBackupsAdminApi.md#uploaddatabasebackup) | **POST** /admin/database-backups/upload | Upload database backup
 *DeprecatedApi* | [**createPartnerDeprecated**](doc//DeprecatedApi.md#createpartnerdeprecated) | **POST** /partners/{id} | Create a partner
 *DeprecatedApi* | [**getAllUserAssetsByDeviceId**](doc//DeprecatedApi.md#getalluserassetsbydeviceid) | **GET** /assets/device/{deviceId} | Retrieve assets by device ID
 *DeprecatedApi* | [**getDeltaSync**](doc//DeprecatedApi.md#getdeltasync) | **POST** /sync/delta-sync | Get delta sync for user
@@ -171,8 +166,6 @@ Class | Method | HTTP request | Description
 *LibrariesApi* | [**scanLibrary**](doc//LibrariesApi.md#scanlibrary) | **POST** /libraries/{id}/scan | Scan a library
 *LibrariesApi* | [**updateLibrary**](doc//LibrariesApi.md#updatelibrary) | **PUT** /libraries/{id} | Update a library
 *LibrariesApi* | [**validate**](doc//LibrariesApi.md#validate) | **POST** /libraries/{id}/validate | Validate library settings
-*MaintenanceAdminApi* | [**detectPriorInstall**](doc//MaintenanceAdminApi.md#detectpriorinstall) | **GET** /admin/maintenance/detect-install | Detect existing install
-*MaintenanceAdminApi* | [**getMaintenanceStatus**](doc//MaintenanceAdminApi.md#getmaintenancestatus) | **GET** /admin/maintenance/status | Get maintenance mode status
 *MaintenanceAdminApi* | [**maintenanceLogin**](doc//MaintenanceAdminApi.md#maintenancelogin) | **POST** /admin/maintenance/login | Log into maintenance mode
 *MaintenanceAdminApi* | [**setMaintenanceMode**](doc//MaintenanceAdminApi.md#setmaintenancemode) | **POST** /admin/maintenance | Set maintenance mode
 *MapApi* | [**getMapMarkers**](doc//MapApi.md#getmapmarkers) | **GET** /map/markers | Retrieve map markers
@@ -412,9 +405,6 @@ Class | Method | HTTP request | Description
  - [CreateProfileImageResponseDto](doc//CreateProfileImageResponseDto.md)
  - [CropParameters](doc//CropParameters.md)
  - [DatabaseBackupConfig](doc//DatabaseBackupConfig.md)
- - [DatabaseBackupDeleteDto](doc//DatabaseBackupDeleteDto.md)
- - [DatabaseBackupDto](doc//DatabaseBackupDto.md)
- - [DatabaseBackupListResponseDto](doc//DatabaseBackupListResponseDto.md)
  - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md)
  - [DownloadInfoDto](doc//DownloadInfoDto.md)
  - [DownloadResponse](doc//DownloadResponse.md)
@@ -444,10 +434,7 @@ Class | Method | HTTP request | Description
  - [MachineLearningAvailabilityChecksDto](doc//MachineLearningAvailabilityChecksDto.md)
  - [MaintenanceAction](doc//MaintenanceAction.md)
  - [MaintenanceAuthDto](doc//MaintenanceAuthDto.md)
- - [MaintenanceDetectInstallResponseDto](doc//MaintenanceDetectInstallResponseDto.md)
- - [MaintenanceDetectInstallStorageFolderDto](doc//MaintenanceDetectInstallStorageFolderDto.md)
  - [MaintenanceLoginDto](doc//MaintenanceLoginDto.md)
- - [MaintenanceStatusResponseDto](doc//MaintenanceStatusResponseDto.md)
  - [ManualJobName](doc//ManualJobName.md)
  - [MapMarkerResponseDto](doc//MapMarkerResponseDto.md)
  - [MapReverseGeocodeResponseDto](doc//MapReverseGeocodeResponseDto.md)
@@ -563,7 +550,6 @@ Class | Method | HTTP request | Description
  - [StackResponseDto](doc//StackResponseDto.md)
  - [StackUpdateDto](doc//StackUpdateDto.md)
  - [StatisticsSearchDto](doc//StatisticsSearchDto.md)
- - [StorageFolder](doc//StorageFolder.md)
  - [SyncAckDeleteDto](doc//SyncAckDeleteDto.md)
  - [SyncAckDto](doc//SyncAckDto.md)
  - [SyncAckSetDto](doc//SyncAckSetDto.md)

mobile/openapi/lib/api.dart

@@ -36,7 +36,6 @@ part 'api/albums_api.dart';
 part 'api/assets_api.dart';
 part 'api/authentication_api.dart';
 part 'api/authentication_admin_api.dart';
-part 'api/database_backups_admin_api.dart';
 part 'api/deprecated_api.dart';
 part 'api/download_api.dart';
 part 'api/duplicates_api.dart';
@@ -152,9 +151,6 @@ part 'model/create_library_dto.dart';
 part 'model/create_profile_image_response_dto.dart';
 part 'model/crop_parameters.dart';
 part 'model/database_backup_config.dart';
-part 'model/database_backup_delete_dto.dart';
-part 'model/database_backup_dto.dart';
-part 'model/database_backup_list_response_dto.dart';
 part 'model/download_archive_info.dart';
 part 'model/download_info_dto.dart';
 part 'model/download_response.dart';
@@ -184,10 +180,7 @@ part 'model/logout_response_dto.dart';
 part 'model/machine_learning_availability_checks_dto.dart';
 part 'model/maintenance_action.dart';
 part 'model/maintenance_auth_dto.dart';
-part 'model/maintenance_detect_install_response_dto.dart';
-part 'model/maintenance_detect_install_storage_folder_dto.dart';
 part 'model/maintenance_login_dto.dart';
-part 'model/maintenance_status_response_dto.dart';
 part 'model/manual_job_name.dart';
 part 'model/map_marker_response_dto.dart';
 part 'model/map_reverse_geocode_response_dto.dart';
@@ -303,7 +296,6 @@ part 'model/stack_create_dto.dart';
 part 'model/stack_response_dto.dart';
 part 'model/stack_update_dto.dart';
 part 'model/statistics_search_dto.dart';
-part 'model/storage_folder.dart';
 part 'model/sync_ack_delete_dto.dart';
 part 'model/sync_ack_dto.dart';
 part 'model/sync_ack_set_dto.dart';

mobile/openapi/lib/api/database_backups_admin_api.dart

@@ -1,269 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class DatabaseBackupsAdminApi {
-  DatabaseBackupsAdminApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
-
-  final ApiClient apiClient;
-
-  /// Delete database backup
-  ///
-  /// Delete a backup by its filename
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [DatabaseBackupDeleteDto] databaseBackupDeleteDto (required):
-  Future<Response> deleteDatabaseBackupWithHttpInfo(DatabaseBackupDeleteDto databaseBackupDeleteDto,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups';
-
-    // ignore: prefer_final_locals
-    Object? postBody = databaseBackupDeleteDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'DELETE',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Delete database backup
-  ///
-  /// Delete a backup by its filename
-  ///
-  /// Parameters:
-  ///
-  /// * [DatabaseBackupDeleteDto] databaseBackupDeleteDto (required):
-  Future<void> deleteDatabaseBackup(DatabaseBackupDeleteDto databaseBackupDeleteDto,) async {
-    final response = await deleteDatabaseBackupWithHttpInfo(databaseBackupDeleteDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Download database backup
-  ///
-  /// Downloads the database backup file
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] filename (required):
-  Future<Response> downloadDatabaseBackupWithHttpInfo(String filename,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/{filename}'
-      .replaceAll('{filename}', filename);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Download database backup
-  ///
-  /// Downloads the database backup file
-  ///
-  /// Parameters:
-  ///
-  /// * [String] filename (required):
-  Future<MultipartFile?> downloadDatabaseBackup(String filename,) async {
-    final response = await downloadDatabaseBackupWithHttpInfo(filename,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MultipartFile',) as MultipartFile;
-    
-    }
-    return null;
-  }
-
-  /// List database backups
-  ///
-  /// Get the list of the successful and failed backups
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> listDatabaseBackupsWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// List database backups
-  ///
-  /// Get the list of the successful and failed backups
-  Future<DatabaseBackupListResponseDto?> listDatabaseBackups() async {
-    final response = await listDatabaseBackupsWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'DatabaseBackupListResponseDto',) as DatabaseBackupListResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Start database backup restore flow
-  ///
-  /// Put Immich into maintenance mode to restore a backup (Immich must not be configured)
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> startDatabaseRestoreFlowWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/start-restore';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Start database backup restore flow
-  ///
-  /// Put Immich into maintenance mode to restore a backup (Immich must not be configured)
-  Future<void> startDatabaseRestoreFlow() async {
-    final response = await startDatabaseRestoreFlowWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Upload database backup
-  ///
-  /// Uploads .sql/.sql.gz file to restore backup from
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [MultipartFile] file:
-  Future<Response> uploadDatabaseBackupWithHttpInfo({ MultipartFile? file, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/database-backups/upload';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['multipart/form-data'];
-
-    bool hasFields = false;
-    final mp = MultipartRequest('POST', Uri.parse(apiPath));
-    if (file != null) {
-      hasFields = true;
-      mp.fields[r'file'] = file.field;
-      mp.files.add(file);
-    }
-    if (hasFields) {
-      postBody = mp;
-    }
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Upload database backup
-  ///
-  /// Uploads .sql/.sql.gz file to restore backup from
-  ///
-  /// Parameters:
-  ///
-  /// * [MultipartFile] file:
-  Future<void> uploadDatabaseBackup({ MultipartFile? file, }) async {
-    final response = await uploadDatabaseBackupWithHttpInfo( file: file, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-}

mobile/openapi/lib/api/maintenance_admin_api.dart

@@ -16,102 +16,6 @@ class MaintenanceAdminApi {
 
   final ApiClient apiClient;
 
-  /// Detect existing install
-  ///
-  /// Collect integrity checks and other heuristics about local data.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> detectPriorInstallWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/maintenance/detect-install';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Detect existing install
-  ///
-  /// Collect integrity checks and other heuristics about local data.
-  Future<MaintenanceDetectInstallResponseDto?> detectPriorInstall() async {
-    final response = await detectPriorInstallWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MaintenanceDetectInstallResponseDto',) as MaintenanceDetectInstallResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Get maintenance mode status
-  ///
-  /// Fetch information about the currently running maintenance action.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> getMaintenanceStatusWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/admin/maintenance/status';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Get maintenance mode status
-  ///
-  /// Fetch information about the currently running maintenance action.
-  Future<MaintenanceStatusResponseDto?> getMaintenanceStatus() async {
-    final response = await getMaintenanceStatusWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MaintenanceStatusResponseDto',) as MaintenanceStatusResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Log into maintenance mode
   ///
   /// Login with maintenance token or cookie to receive current information and perform further actions.

mobile/openapi/lib/api_client.dart

@@ -350,12 +350,6 @@ class ApiClient {
           return CropParameters.fromJson(value);
         case 'DatabaseBackupConfig':
           return DatabaseBackupConfig.fromJson(value);
-        case 'DatabaseBackupDeleteDto':
-          return DatabaseBackupDeleteDto.fromJson(value);
-        case 'DatabaseBackupDto':
-          return DatabaseBackupDto.fromJson(value);
-        case 'DatabaseBackupListResponseDto':
-          return DatabaseBackupListResponseDto.fromJson(value);
         case 'DownloadArchiveInfo':
           return DownloadArchiveInfo.fromJson(value);
         case 'DownloadInfoDto':
@@ -414,14 +408,8 @@ class ApiClient {
           return MaintenanceActionTypeTransformer().decode(value);
         case 'MaintenanceAuthDto':
           return MaintenanceAuthDto.fromJson(value);
-        case 'MaintenanceDetectInstallResponseDto':
-          return MaintenanceDetectInstallResponseDto.fromJson(value);
-        case 'MaintenanceDetectInstallStorageFolderDto':
-          return MaintenanceDetectInstallStorageFolderDto.fromJson(value);
         case 'MaintenanceLoginDto':
           return MaintenanceLoginDto.fromJson(value);
-        case 'MaintenanceStatusResponseDto':
-          return MaintenanceStatusResponseDto.fromJson(value);
         case 'ManualJobName':
           return ManualJobNameTypeTransformer().decode(value);
         case 'MapMarkerResponseDto':
@@ -652,8 +640,6 @@ class ApiClient {
           return StackUpdateDto.fromJson(value);
         case 'StatisticsSearchDto':
           return StatisticsSearchDto.fromJson(value);
-        case 'StorageFolder':
-          return StorageFolderTypeTransformer().decode(value);
         case 'SyncAckDeleteDto':
           return SyncAckDeleteDto.fromJson(value);
         case 'SyncAckDto':

mobile/openapi/lib/api_helper.dart

@@ -160,9 +160,6 @@ String parameterToString(dynamic value) {
   if (value is SourceType) {
     return SourceTypeTypeTransformer().encode(value).toString();
   }
-  if (value is StorageFolder) {
-    return StorageFolderTypeTransformer().encode(value).toString();
-  }
   if (value is SyncEntityType) {
     return SyncEntityTypeTypeTransformer().encode(value).toString();
   }

mobile/openapi/lib/model/asset_response_dto.dart

@@ -26,7 +26,6 @@ class AssetResponseDto {
     required this.height,
     required this.id,
     required this.isArchived,
-    required this.isEdited,
     required this.isFavorite,
     required this.isOffline,
     required this.isTrashed,
@@ -86,8 +85,6 @@ class AssetResponseDto {
 
   bool isArchived;
 
-  bool isEdited;
-
   bool isFavorite;
 
   bool isOffline;
@@ -165,7 +162,6 @@ class AssetResponseDto {
     other.height == height &&
     other.id == id &&
     other.isArchived == isArchived &&
-    other.isEdited == isEdited &&
     other.isFavorite == isFavorite &&
     other.isOffline == isOffline &&
     other.isTrashed == isTrashed &&
@@ -204,7 +200,6 @@ class AssetResponseDto {
     (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
     (isArchived.hashCode) +
-    (isEdited.hashCode) +
     (isFavorite.hashCode) +
     (isOffline.hashCode) +
     (isTrashed.hashCode) +
@@ -228,7 +223,7 @@ class AssetResponseDto {
     (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isEdited=$isEdited, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
+  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -257,7 +252,6 @@ class AssetResponseDto {
     }
       json[r'id'] = this.id;
       json[r'isArchived'] = this.isArchived;
-      json[r'isEdited'] = this.isEdited;
       json[r'isFavorite'] = this.isFavorite;
       json[r'isOffline'] = this.isOffline;
       json[r'isTrashed'] = this.isTrashed;
@@ -338,7 +332,6 @@ class AssetResponseDto {
             : num.parse('${json[r'height']}'),
         id: mapValueOfType<String>(json, r'id')!,
         isArchived: mapValueOfType<bool>(json, r'isArchived')!,
-        isEdited: mapValueOfType<bool>(json, r'isEdited')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         isOffline: mapValueOfType<bool>(json, r'isOffline')!,
         isTrashed: mapValueOfType<bool>(json, r'isTrashed')!,
@@ -420,7 +413,6 @@ class AssetResponseDto {
     'height',
     'id',
     'isArchived',
-    'isEdited',
     'isFavorite',
     'isOffline',
     'isTrashed',

mobile/openapi/lib/model/database_backup_delete_dto.dart

@@ -1,101 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupDeleteDto {
-  /// Returns a new [DatabaseBackupDeleteDto] instance.
-  DatabaseBackupDeleteDto({
-    this.backups = const [],
-  });
-
-  List<String> backups;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupDeleteDto &&
-    _deepEquality.equals(other.backups, backups);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (backups.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupDeleteDto[backups=$backups]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'backups'] = this.backups;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupDeleteDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupDeleteDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupDeleteDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupDeleteDto(
-        backups: json[r'backups'] is Iterable
-            ? (json[r'backups'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupDeleteDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupDeleteDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupDeleteDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupDeleteDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupDeleteDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupDeleteDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupDeleteDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupDeleteDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupDeleteDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupDeleteDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'backups',
-  };
-}
-

mobile/openapi/lib/model/database_backup_dto.dart

@@ -1,107 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupDto {
-  /// Returns a new [DatabaseBackupDto] instance.
-  DatabaseBackupDto({
-    required this.filename,
-    required this.filesize,
-  });
-
-  String filename;
-
-  num filesize;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupDto &&
-    other.filename == filename &&
-    other.filesize == filesize;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (filename.hashCode) +
-    (filesize.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupDto[filename=$filename, filesize=$filesize]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'filename'] = this.filename;
-      json[r'filesize'] = this.filesize;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupDto(
-        filename: mapValueOfType<String>(json, r'filename')!,
-        filesize: num.parse('${json[r'filesize']}'),
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'filename',
-    'filesize',
-  };
-}
-

mobile/openapi/lib/model/database_backup_list_response_dto.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class DatabaseBackupListResponseDto {
-  /// Returns a new [DatabaseBackupListResponseDto] instance.
-  DatabaseBackupListResponseDto({
-    this.backups = const [],
-  });
-
-  List<DatabaseBackupDto> backups;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupListResponseDto &&
-    _deepEquality.equals(other.backups, backups);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (backups.hashCode);
-
-  @override
-  String toString() => 'DatabaseBackupListResponseDto[backups=$backups]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'backups'] = this.backups;
-    return json;
-  }
-
-  /// Returns a new [DatabaseBackupListResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static DatabaseBackupListResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "DatabaseBackupListResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return DatabaseBackupListResponseDto(
-        backups: DatabaseBackupDto.listFromJson(json[r'backups']),
-      );
-    }
-    return null;
-  }
-
-  static List<DatabaseBackupListResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <DatabaseBackupListResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = DatabaseBackupListResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, DatabaseBackupListResponseDto> mapFromJson(dynamic json) {
-    final map = <String, DatabaseBackupListResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = DatabaseBackupListResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of DatabaseBackupListResponseDto-objects as value to a dart map
-  static Map<String, List<DatabaseBackupListResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<DatabaseBackupListResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = DatabaseBackupListResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'backups',
-  };
-}
-

mobile/openapi/lib/model/maintenance_action.dart

@@ -25,15 +25,11 @@ class MaintenanceAction {
 
   static const start = MaintenanceAction._(r'start');
   static const end = MaintenanceAction._(r'end');
-  static const selectDatabaseRestore = MaintenanceAction._(r'select_database_restore');
-  static const restoreDatabase = MaintenanceAction._(r'restore_database');
 
   /// List of all possible values in this [enum][MaintenanceAction].
   static const values = <MaintenanceAction>[
     start,
     end,
-    selectDatabaseRestore,
-    restoreDatabase,
   ];
 
   static MaintenanceAction? fromJson(dynamic value) => MaintenanceActionTypeTransformer().decode(value);
@@ -74,8 +70,6 @@ class MaintenanceActionTypeTransformer {
       switch (data) {
         case r'start': return MaintenanceAction.start;
         case r'end': return MaintenanceAction.end;
-        case r'select_database_restore': return MaintenanceAction.selectDatabaseRestore;
-        case r'restore_database': return MaintenanceAction.restoreDatabase;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');

mobile/openapi/lib/model/maintenance_detect_install_response_dto.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceDetectInstallResponseDto {
-  /// Returns a new [MaintenanceDetectInstallResponseDto] instance.
-  MaintenanceDetectInstallResponseDto({
-    this.storage = const [],
-  });
-
-  List<MaintenanceDetectInstallStorageFolderDto> storage;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceDetectInstallResponseDto &&
-    _deepEquality.equals(other.storage, storage);
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (storage.hashCode);
-
-  @override
-  String toString() => 'MaintenanceDetectInstallResponseDto[storage=$storage]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'storage'] = this.storage;
-    return json;
-  }
-
-  /// Returns a new [MaintenanceDetectInstallResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceDetectInstallResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceDetectInstallResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceDetectInstallResponseDto(
-        storage: MaintenanceDetectInstallStorageFolderDto.listFromJson(json[r'storage']),
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceDetectInstallResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceDetectInstallResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceDetectInstallResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceDetectInstallResponseDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceDetectInstallResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceDetectInstallResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceDetectInstallResponseDto-objects as value to a dart map
-  static Map<String, List<MaintenanceDetectInstallResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceDetectInstallResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceDetectInstallResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'storage',
-  };
-}
-

mobile/openapi/lib/model/maintenance_detect_install_storage_folder_dto.dart

@@ -1,123 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceDetectInstallStorageFolderDto {
-  /// Returns a new [MaintenanceDetectInstallStorageFolderDto] instance.
-  MaintenanceDetectInstallStorageFolderDto({
-    required this.files,
-    required this.folder,
-    required this.readable,
-    required this.writable,
-  });
-
-  num files;
-
-  StorageFolder folder;
-
-  bool readable;
-
-  bool writable;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceDetectInstallStorageFolderDto &&
-    other.files == files &&
-    other.folder == folder &&
-    other.readable == readable &&
-    other.writable == writable;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (files.hashCode) +
-    (folder.hashCode) +
-    (readable.hashCode) +
-    (writable.hashCode);
-
-  @override
-  String toString() => 'MaintenanceDetectInstallStorageFolderDto[files=$files, folder=$folder, readable=$readable, writable=$writable]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'files'] = this.files;
-      json[r'folder'] = this.folder;
-      json[r'readable'] = this.readable;
-      json[r'writable'] = this.writable;
-    return json;
-  }
-
-  /// Returns a new [MaintenanceDetectInstallStorageFolderDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceDetectInstallStorageFolderDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceDetectInstallStorageFolderDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceDetectInstallStorageFolderDto(
-        files: num.parse('${json[r'files']}'),
-        folder: StorageFolder.fromJson(json[r'folder'])!,
-        readable: mapValueOfType<bool>(json, r'readable')!,
-        writable: mapValueOfType<bool>(json, r'writable')!,
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceDetectInstallStorageFolderDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceDetectInstallStorageFolderDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceDetectInstallStorageFolderDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceDetectInstallStorageFolderDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceDetectInstallStorageFolderDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceDetectInstallStorageFolderDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceDetectInstallStorageFolderDto-objects as value to a dart map
-  static Map<String, List<MaintenanceDetectInstallStorageFolderDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceDetectInstallStorageFolderDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceDetectInstallStorageFolderDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'files',
-    'folder',
-    'readable',
-    'writable',
-  };
-}
-

mobile/openapi/lib/model/maintenance_status_response_dto.dart

@@ -1,158 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class MaintenanceStatusResponseDto {
-  /// Returns a new [MaintenanceStatusResponseDto] instance.
-  MaintenanceStatusResponseDto({
-    required this.action,
-    required this.active,
-    this.error,
-    this.progress,
-    this.task,
-  });
-
-  MaintenanceAction action;
-
-  bool active;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? error;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  num? progress;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? task;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MaintenanceStatusResponseDto &&
-    other.action == action &&
-    other.active == active &&
-    other.error == error &&
-    other.progress == progress &&
-    other.task == task;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (active.hashCode) +
-    (error == null ? 0 : error!.hashCode) +
-    (progress == null ? 0 : progress!.hashCode) +
-    (task == null ? 0 : task!.hashCode);
-
-  @override
-  String toString() => 'MaintenanceStatusResponseDto[action=$action, active=$active, error=$error, progress=$progress, task=$task]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'action'] = this.action;
-      json[r'active'] = this.active;
-    if (this.error != null) {
-      json[r'error'] = this.error;
-    } else {
-    //  json[r'error'] = null;
-    }
-    if (this.progress != null) {
-      json[r'progress'] = this.progress;
-    } else {
-    //  json[r'progress'] = null;
-    }
-    if (this.task != null) {
-      json[r'task'] = this.task;
-    } else {
-    //  json[r'task'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [MaintenanceStatusResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static MaintenanceStatusResponseDto? fromJson(dynamic value) {
-    upgradeDto(value, "MaintenanceStatusResponseDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return MaintenanceStatusResponseDto(
-        action: MaintenanceAction.fromJson(json[r'action'])!,
-        active: mapValueOfType<bool>(json, r'active')!,
-        error: mapValueOfType<String>(json, r'error'),
-        progress: num.parse('${json[r'progress']}'),
-        task: mapValueOfType<String>(json, r'task'),
-      );
-    }
-    return null;
-  }
-
-  static List<MaintenanceStatusResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <MaintenanceStatusResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = MaintenanceStatusResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, MaintenanceStatusResponseDto> mapFromJson(dynamic json) {
-    final map = <String, MaintenanceStatusResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = MaintenanceStatusResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of MaintenanceStatusResponseDto-objects as value to a dart map
-  static Map<String, List<MaintenanceStatusResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<MaintenanceStatusResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = MaintenanceStatusResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'action',
-    'active',
-  };
-}
-

mobile/openapi/lib/model/permission.dart

@@ -62,10 +62,6 @@ class Permission {
   static const authPeriodChangePassword = Permission._(r'auth.changePassword');
   static const authDevicePeriodDelete = Permission._(r'authDevice.delete');
   static const archivePeriodRead = Permission._(r'archive.read');
-  static const backupPeriodList = Permission._(r'backup.list');
-  static const backupPeriodDownload = Permission._(r'backup.download');
-  static const backupPeriodUpload = Permission._(r'backup.upload');
-  static const backupPeriodDelete = Permission._(r'backup.delete');
   static const duplicatePeriodRead = Permission._(r'duplicate.read');
   static const duplicatePeriodDelete = Permission._(r'duplicate.delete');
   static const facePeriodCreate = Permission._(r'face.create');
@@ -218,10 +214,6 @@ class Permission {
     authPeriodChangePassword,
     authDevicePeriodDelete,
     archivePeriodRead,
-    backupPeriodList,
-    backupPeriodDownload,
-    backupPeriodUpload,
-    backupPeriodDelete,
     duplicatePeriodRead,
     duplicatePeriodDelete,
     facePeriodCreate,
@@ -409,10 +401,6 @@ class PermissionTypeTransformer {
         case r'auth.changePassword': return Permission.authPeriodChangePassword;
         case r'authDevice.delete': return Permission.authDevicePeriodDelete;
         case r'archive.read': return Permission.archivePeriodRead;
-        case r'backup.list': return Permission.backupPeriodList;
-        case r'backup.download': return Permission.backupPeriodDownload;
-        case r'backup.upload': return Permission.backupPeriodUpload;
-        case r'backup.delete': return Permission.backupPeriodDelete;
         case r'duplicate.read': return Permission.duplicatePeriodRead;
         case r'duplicate.delete': return Permission.duplicatePeriodDelete;
         case r'face.create': return Permission.facePeriodCreate;

mobile/openapi/lib/model/set_maintenance_mode_dto.dart

@@ -14,41 +14,25 @@ class SetMaintenanceModeDto {
   /// Returns a new [SetMaintenanceModeDto] instance.
   SetMaintenanceModeDto({
     required this.action,
-    this.restoreBackupFilename,
   });
 
   MaintenanceAction action;
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? restoreBackupFilename;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is SetMaintenanceModeDto &&
-    other.action == action &&
-    other.restoreBackupFilename == restoreBackupFilename;
+    other.action == action;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (restoreBackupFilename == null ? 0 : restoreBackupFilename!.hashCode);
+    (action.hashCode);
 
   @override
-  String toString() => 'SetMaintenanceModeDto[action=$action, restoreBackupFilename=$restoreBackupFilename]';
+  String toString() => 'SetMaintenanceModeDto[action=$action]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'action'] = this.action;
-    if (this.restoreBackupFilename != null) {
-      json[r'restoreBackupFilename'] = this.restoreBackupFilename;
-    } else {
-    //  json[r'restoreBackupFilename'] = null;
-    }
     return json;
   }
 
@@ -62,7 +46,6 @@ class SetMaintenanceModeDto {
 
       return SetMaintenanceModeDto(
         action: MaintenanceAction.fromJson(json[r'action'])!,
-        restoreBackupFilename: mapValueOfType<String>(json, r'restoreBackupFilename'),
       );
     }
     return null;

mobile/openapi/lib/model/storage_folder.dart

@@ -1,97 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class StorageFolder {
-  /// Instantiate a new enum with the provided [value].
-  const StorageFolder._(this.value);
-
-  /// The underlying value of this enum member.
-  final String value;
-
-  @override
-  String toString() => value;
-
-  String toJson() => value;
-
-  static const encodedVideo = StorageFolder._(r'encoded-video');
-  static const library_ = StorageFolder._(r'library');
-  static const upload = StorageFolder._(r'upload');
-  static const profile = StorageFolder._(r'profile');
-  static const thumbs = StorageFolder._(r'thumbs');
-  static const backups = StorageFolder._(r'backups');
-
-  /// List of all possible values in this [enum][StorageFolder].
-  static const values = <StorageFolder>[
-    encodedVideo,
-    library_,
-    upload,
-    profile,
-    thumbs,
-    backups,
-  ];
-
-  static StorageFolder? fromJson(dynamic value) => StorageFolderTypeTransformer().decode(value);
-
-  static List<StorageFolder> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <StorageFolder>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = StorageFolder.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-}
-
-/// Transformation class that can [encode] an instance of [StorageFolder] to String,
-/// and [decode] dynamic data back to [StorageFolder].
-class StorageFolderTypeTransformer {
-  factory StorageFolderTypeTransformer() => _instance ??= const StorageFolderTypeTransformer._();
-
-  const StorageFolderTypeTransformer._();
-
-  String encode(StorageFolder data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a StorageFolder.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  StorageFolder? decode(dynamic data, {bool allowNull = true}) {
-    if (data != null) {
-      switch (data) {
-        case r'encoded-video': return StorageFolder.encodedVideo;
-        case r'library': return StorageFolder.library_;
-        case r'upload': return StorageFolder.upload;
-        case r'profile': return StorageFolder.profile;
-        case r'thumbs': return StorageFolder.thumbs;
-        case r'backups': return StorageFolder.backups;
-        default:
-          if (!allowNull) {
-            throw ArgumentError('Unknown enum value to decode: $data');
-          }
-      }
-    }
-    return null;
-  }
-
-  /// Singleton [StorageFolderTypeTransformer] instance.
-  static StorageFolderTypeTransformer? _instance;
-}
-

mobile/openapi/lib/model/sync_asset_v1.dart

@@ -20,7 +20,6 @@ class SyncAssetV1 {
     required this.fileModifiedAt,
     required this.height,
     required this.id,
-    required this.isEdited,
     required this.isFavorite,
     required this.libraryId,
     required this.livePhotoVideoId,
@@ -48,8 +47,6 @@ class SyncAssetV1 {
 
   String id;
 
-  bool isEdited;
-
   bool isFavorite;
 
   String? libraryId;
@@ -81,7 +78,6 @@ class SyncAssetV1 {
     other.fileModifiedAt == fileModifiedAt &&
     other.height == height &&
     other.id == id &&
-    other.isEdited == isEdited &&
     other.isFavorite == isFavorite &&
     other.libraryId == libraryId &&
     other.livePhotoVideoId == livePhotoVideoId &&
@@ -104,7 +100,6 @@ class SyncAssetV1 {
     (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
     (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
-    (isEdited.hashCode) +
     (isFavorite.hashCode) +
     (libraryId == null ? 0 : libraryId!.hashCode) +
     (livePhotoVideoId == null ? 0 : livePhotoVideoId!.hashCode) +
@@ -118,7 +113,7 @@ class SyncAssetV1 {
     (width == null ? 0 : width!.hashCode);
 
   @override
-  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isEdited=$isEdited, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
+  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -149,7 +144,6 @@ class SyncAssetV1 {
     //  json[r'height'] = null;
     }
       json[r'id'] = this.id;
-      json[r'isEdited'] = this.isEdited;
       json[r'isFavorite'] = this.isFavorite;
     if (this.libraryId != null) {
       json[r'libraryId'] = this.libraryId;
@@ -204,7 +198,6 @@ class SyncAssetV1 {
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r''),
         height: mapValueOfType<int>(json, r'height'),
         id: mapValueOfType<String>(json, r'id')!,
-        isEdited: mapValueOfType<bool>(json, r'isEdited')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         libraryId: mapValueOfType<String>(json, r'libraryId'),
         livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
@@ -270,7 +263,6 @@ class SyncAssetV1 {
     'fileModifiedAt',
     'height',
     'id',
-    'isEdited',
     'isFavorite',
     'libraryId',
     'livePhotoVideoId',

mobile/pubspec.lock

@@ -2154,6 +2154,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.3"
+  worker_manager:
+    dependency: "direct main"
+    description:
+      name: worker_manager
+      sha256: "1bce9f894a0c187856f5fc0e150e7fe1facce326f048ca6172947754dac3d4f3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.7"
   xdg_directories:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -85,6 +85,7 @@ dependencies:
   url_launcher: ^6.3.2
   uuid: ^4.5.1
   wakelock_plus: ^1.3.0
+  worker_manager: ^7.2.7
 
 dev_dependencies:
   auto_route_generator: ^9.0.0

mobile/test/domain/repositories/sync_stream_repository_test.dart

@@ -44,7 +44,6 @@ SyncAssetV1 _createAsset({
     livePhotoVideoId: null,
     stackId: null,
     thumbhash: null,
-    isEdited: false,
   );
 }
 

mobile/test/drift/main/generated/schema.dart

@@ -19,7 +19,6 @@ import 'schema_v13.dart' as v13;
 import 'schema_v14.dart' as v14;
 import 'schema_v15.dart' as v15;
 import 'schema_v16.dart' as v16;
-import 'schema_v17.dart' as v17;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -57,8 +56,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v15.DatabaseAtV15(db);
       case 16:
         return v16.DatabaseAtV16(db);
-      case 17:
-        return v17.DatabaseAtV17(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -81,6 +78,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     14,
     15,
     16,
-    17,
   ];
 }