diff --git a/mobile/lib/interfaces/asset_media.interface.dart b/mobile/lib/interfaces/asset_media.interface.dart deleted file mode 100644 index 2606d5c23c..0000000000 --- a/mobile/lib/interfaces/asset_media.interface.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:immich_mobile/entities/asset.entity.dart'; - -abstract interface class IAssetMediaRepository { - Future> deleteAll(List ids); - - Future get(String id); - - /// Obtaining the correct original filename of the asset - Future getOriginalFilename(String id); -} diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart index 7df26455cd..0a415b95e2 100644 --- a/mobile/lib/repositories/asset_media.repository.dart +++ b/mobile/lib/repositories/asset_media.repository.dart @@ -3,18 +3,15 @@ import 'package:immich_mobile/domain/models/exif.model.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/utils/hash.dart'; import 'package:photo_manager/photo_manager.dart' hide AssetType; final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository()); -class AssetMediaRepository implements IAssetMediaRepository { - @override +class AssetMediaRepository { Future> deleteAll(List ids) => PhotoManager.editor.deleteWithIds(ids); - @override Future get(String id) async { final entity = await AssetEntity.fromId(id); return toAsset(entity); @@ -47,7 +44,6 @@ class AssetMediaRepository implements IAssetMediaRepository { return asset; } - @override Future getOriginalFilename(String id) async { final entity = await AssetEntity.fromId(id); diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart index 0500fb8924..b4bb8dad78 100644 --- a/mobile/lib/services/asset.service.dart +++ b/mobile/lib/services/asset.service.dart @@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/infrastructure/repositories/user.repository.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; -import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/providers/infrastructure/exif.provider.dart'; @@ -58,7 +57,7 @@ class AssetService { final BackupService _backupService; final AlbumService _albumService; final UserService _userService; - final IAssetMediaRepository _assetMediaRepository; + final AssetMediaRepository _assetMediaRepository; final log = Logger('AssetService'); AssetService( diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dart index e07f9b4580..370b64398d 100644 --- a/mobile/lib/services/backup.service.dart +++ b/mobile/lib/services/backup.service.dart @@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/album.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/backup_album.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/models/backup/backup_candidate.model.dart'; import 'package:immich_mobile/models/backup/current_upload_asset.model.dart'; import 'package:immich_mobile/models/backup/error_upload_asset.model.dart'; @@ -52,7 +51,7 @@ class BackupService { final AlbumMediaRepository _albumMediaRepository; final FileMediaRepository _fileMediaRepository; final AssetRepository _assetRepository; - final IAssetMediaRepository _assetMediaRepository; + final AssetMediaRepository _assetMediaRepository; BackupService( this._apiService, diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index 752fd3de6d..94c3b34aa3 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -1,7 +1,6 @@ import 'package:immich_mobile/domain/interfaces/exif.interface.dart'; import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; -import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/album_media.repository.dart'; import 'package:immich_mobile/repositories/album_api.repository.dart'; @@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/repositories/auth.repository.dart'; import 'package:immich_mobile/repositories/auth_api.repository.dart'; import 'package:immich_mobile/repositories/asset.repository.dart'; +import 'package:immich_mobile/repositories/asset_media.repository.dart'; import 'package:mocktail/mocktail.dart'; class MockAlbumRepository extends Mock implements IAlbumRepository {} @@ -31,7 +31,7 @@ class MockBackupAlbumRepository extends Mock implements BackupAlbumRepository {} class MockAssetApiRepository extends Mock implements IAssetApiRepository {} -class MockAssetMediaRepository extends Mock implements IAssetMediaRepository {} +class MockAssetMediaRepository extends Mock implements AssetMediaRepository {} class MockFileMediaRepository extends Mock implements FileMediaRepository {}