rename TrashService to TrashSyncService to avoid duplicated names

revert changes in original trash.provider.dart

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

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
-import 'package:immich_mobile/domain/services/trash.service.dart';
+import 'package:immich_mobile/domain/services/trash_sync.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
@@ -13,17 +13,17 @@ class SyncStreamService {
 
   final SyncApiRepository _syncApiRepository;
   final SyncStreamRepository _syncStreamRepository;
-  final TrashService _trashService;
+  final TrashSyncService _trashSyncService;
   final bool Function()? _cancelChecker;
 
   SyncStreamService({
     required SyncApiRepository syncApiRepository,
     required SyncStreamRepository syncStreamRepository,
-    required TrashService trashService,
+    required TrashSyncService trashSyncService,
     bool Function()? cancelChecker,
   }) : _syncApiRepository = syncApiRepository,
        _syncStreamRepository = syncStreamRepository,
-       _trashService = trashService,
+       _trashSyncService = trashSyncService,
        _cancelChecker = cancelChecker;
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
@@ -119,7 +119,7 @@ class SyncStreamService {
         return _syncStreamRepository.deletePartnerV1(data.cast());
       case SyncEntityType.assetV1:
         final remoteSyncAssets = data.cast<SyncAssetV1>();
-        await _trashService.handleRemoteChanges(
+        await _trashSyncService.handleRemoteChanges(
           remoteSyncAssets.map((e) => (checksum: e.checksum, deletedAt: e.deletedAt)),
         );
         return _syncStreamRepository.updateAssetsV1(remoteSyncAssets);

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

@@ -6,7 +6,7 @@ import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';
 import 'package:platform/platform.dart';
 
-class TrashService {
+class TrashSyncService {
   final AppSettingsService _appSettingsService;
   final RemoteAssetRepository _remoteAssetRepository;
   final DriftLocalAssetRepository _localAssetRepository;
@@ -15,7 +15,7 @@ class TrashService {
   final Platform _platform;
   final Logger _logger = Logger('TrashService');
 
-  TrashService({
+  TrashSyncService({
     required AppSettingsService appSettingsService,
     required RemoteAssetRepository remoteAssetRepository,
     required DriftLocalAssetRepository localAssetRepository,

mobile/lib/providers/infrastructure/sync.provider.dart

@@ -11,13 +11,13 @@ import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/trash.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart';
 
 final syncStreamServiceProvider = Provider(
   (ref) => SyncStreamService(
     syncApiRepository: ref.watch(syncApiRepositoryProvider),
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
-    trashService: ref.watch(trashServiceProvider),
+    trashSyncService: ref.watch(trashSyncServiceProvider),
     cancelChecker: ref.watch(cancellationProvider),
   ),
 );

mobile/lib/providers/infrastructure/trash_sync.provider.dart

@@ -1,13 +1,13 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/trash.service.dart';
+import 'package:immich_mobile/domain/services/trash_sync.service.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 
 import 'asset.provider.dart';
 
-final trashServiceProvider = Provider(
+final trashSyncServiceProvider = Provider(
-  (ref) => TrashService(
+  (ref) => TrashSyncService(
     appSettingsService: ref.watch(appSettingsServiceProvider),
     remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
     localAssetRepository: ref.watch(localAssetRepository),

mobile/lib/providers/trash.provider.dart

@@ -3,10 +3,6 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/services/trash.service.dart';
 import 'package:logging/logging.dart';
 
-final trashProvider = StateNotifierProvider<TrashNotifier, bool>((ref) {
-  return TrashNotifier(ref.watch(trashServiceProvider));
-});
-
 class TrashNotifier extends StateNotifier<bool> {
   final TrashService _trashService;
   final _log = Logger('TrashNotifier');
@@ -43,3 +39,7 @@ class TrashNotifier extends StateNotifier<bool> {
     }
   }
 }
+
+final trashProvider = StateNotifierProvider<TrashNotifier, bool>((ref) {
+  return TrashNotifier(ref.watch(trashServiceProvider));
+});

mobile/test/domain/service.mock.dart

@@ -1,5 +1,5 @@
 import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/domain/services/trash.service.dart';
+import 'package:immich_mobile/domain/services/trash_sync.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
@@ -19,4 +19,4 @@ class MockAppSettingsService extends Mock implements AppSettingsService {}
 
 class MockUploadService extends Mock implements UploadService {}
 
-class MockTrashService extends Mock implements TrashService {}
+class MockTrashSyncService extends Mock implements TrashSyncService {}

mobile/test/domain/services/sync_stream_service_test.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/domain/services/sync_stream.service.dart';
-import 'package:immich_mobile/domain/services/trash.service.dart';
+import 'package:immich_mobile/domain/services/trash_sync.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:mocktail/mocktail.dart';
@@ -32,7 +32,7 @@ void main() {
   late SyncStreamService sut;
   late SyncStreamRepository mockSyncStreamRepo;
   late SyncApiRepository mockSyncApiRepo;
-  late TrashService mockTrashService;
+  late TrashSyncService mockTrashService;
   late Function(List<SyncEvent>, Function()) handleEventsCallback;
   late _MockAbortCallbackWrapper mockAbortCallbackWrapper;
 
@@ -42,7 +42,7 @@ void main() {
     mockSyncStreamRepo = MockSyncStreamRepository();
     mockSyncApiRepo = MockSyncApiRepository();
     mockAbortCallbackWrapper = _MockAbortCallbackWrapper();
-    mockTrashService = MockTrashService();
+    mockTrashService = MockTrashSyncService();
     when(() => mockAbortCallbackWrapper()).thenReturn(false);
 
     when(() => mockSyncApiRepo.streamChanges(any())).thenAnswer((invocation) async {
@@ -87,7 +87,7 @@ void main() {
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
       syncStreamRepository: mockSyncStreamRepo,
-      trashService: mockTrashService,
+      trashSyncService: mockTrashService,
     );
   });
 
@@ -153,7 +153,7 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
-        trashService: mockTrashService,
+        trashSyncService: mockTrashService,
         cancelChecker: cancellationChecker.call,
       );
       await sut.sync();
@@ -189,7 +189,7 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
-        trashService: mockTrashService,
+        trashSyncService: mockTrashService,
         cancelChecker: cancellationChecker.call,
       );