Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4fd7a4c
feat(trash_sync): do not restore assets deleted locally only
Nov 27, 2025
e118501
feat(trash_sync): revert tag name
Nov 27, 2025
6b368a7
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 1, 2025
4504518
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 2, 2025
f6252fb
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 3, 2025
8c2a219
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 4, 2025
66dd77e
feat(trash_sync): resolve merge conflicts
Dec 4, 2025
82d244b
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
PeterOmbodi Dec 11, 2025
af582ea
refactor(trash_sync): consolidate local asset deletion logic
Dec 15, 2025
8d3893f
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 15, 2025
f3f8b80
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 17, 2025
1b05d1b
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 22, 2025
0250a83
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 23, 2025
459bfb5
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Dec 26, 2025
d1fbe14
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 2, 2026
379384b
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 5, 2026
51dcac5
feat(mobile): Add TrashOrigin enum
Jan 5, 2026
13da500
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 6, 2026
dd57c14
feat(mobile): fix format
Jan 6, 2026
0f9fea7
fix(mobile): fix restoration scope
Jan 6, 2026
401c2e8
fix(mobile): Add coverage for ActionService deleteLocal paths
Jan 6, 2026
3766221
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 6, 2026
967ad83
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 7, 2026
7cb1a75
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 8, 2026
d4e3878
Merge remote-tracking branch 'origin/main' into fix/restoration_scoupe
Jan 12, 2026
178211a
fix(mobile): db - require trash origin and update drift schema
Jan 12, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mobile/drift_schemas/main/drift_schema_v15.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

enum TrashOrigin {
// do not change this order!
localSync,
remoteSync,
localUser,
}

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)')
class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
Expand All @@ -19,6 +26,8 @@ class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntity

IntColumn get orientation => integer().withDefault(const Constant(0))();

IntColumn get source => intEnum<TrashOrigin>()();

@override
Set<Column> get primaryKey => {id, albumId};
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion mobile/lib/infrastructure/repositories/db.repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class Drift extends $Drift implements IDatabaseRepository {
}

@override
int get schemaVersion => 14;
int get schemaVersion => 15;

@override
MigrationStrategy get migration => MigrationStrategy(
Expand Down Expand Up @@ -190,6 +190,9 @@ class Drift extends $Drift implements IDatabaseRepository {
await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
},
from14To15: (m, v15) async {
await m.addColumn(v15.trashedLocalAssetEntity, v15.trashedLocalAssetEntity.source);
},
),
);

Expand Down
Loading
Loading