Skip to content

[pull] main from immich-app:main #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 7 commits into from
Jan 12, 2026
Merged

[pull] main from immich-app:main #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e3f5f2
fix: unlock properties after successful sidecar write (#25168)
danieldietzler Jan 12, 2026
afe925a
fix(web): show relevant navbar options for partner assets (#24832)
YarosMallorca Jan 12, 2026
7992fe8
fix(web): added background gradient for video time visibility (#25138)
HemendraSinghShekhawat Jan 12, 2026
8ed81ac
feat(mobile): do not restore locally deleted assets during trash sync…
PeterOmbodi Jan 12, 2026
3bf0d5b
fix: asset local type casting (#25214)
alextran1502 Jan 12, 2026
4b5b9ba
Update Thai README (remove "under active development" lines) (#25208)
ppnplus Jan 12, 2026
94ea83c
fix(web): ocr button not clickable for stacked assets (#25210)
YarosMallorca 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
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
View file
Open in desktop
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
81 changes: 77 additions & 4 deletions mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
View file
Open in desktop

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
View file
Open in desktop
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