chore: revert #16732 (#17819)

* chore: revert #16732

* lint

mobile/lib/domain/models/store.model.dart

@@ -65,7 +65,6 @@ enum StoreKey<T> {
 
   // Video settings
   loadOriginalVideo<bool>._(136),
-  manageLocalMediaAndroid<bool>._(137),
 
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000);

mobile/lib/interfaces/local_files_manager.interface.dart

@@ -1,5 +0,0 @@
-abstract interface class ILocalFilesManager {
-  Future<bool> moveToTrash(String fileName);
-  Future<bool> restoreFromTrash(String fileName);
-  Future<bool> requestManageStoragePermission();
-}

mobile/lib/providers/websocket.provider.dart

@@ -23,7 +23,6 @@ enum PendingAction {
   assetDelete,
   assetUploaded,
   assetHidden,
-  assetTrash,
 }
 
 class PendingChange {
@@ -161,7 +160,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         socket.on('on_upload_success', _handleOnUploadSuccess);
         socket.on('on_config_update', _handleOnConfigUpdate);
         socket.on('on_asset_delete', _handleOnAssetDelete);
-        socket.on('on_asset_trash', _handleOnAssetTrash);
+        socket.on('on_asset_trash', _handleServerUpdates);
         socket.on('on_asset_restore', _handleServerUpdates);
         socket.on('on_asset_update', _handleServerUpdates);
         socket.on('on_asset_stack_update', _handleServerUpdates);
@@ -208,26 +207,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _debounce.run(handlePendingChanges);
   }
 
-  Future<void> _handlePendingTrashes() async {
-    final trashChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetTrash)
-        .toList();
-    if (trashChanges.isNotEmpty) {
-      List<String> remoteIds = trashChanges
-          .expand((a) => (a.value as List).map((e) => e.toString()))
-          .toList();
-
-      await _ref.read(syncServiceProvider).handleRemoteAssetRemoval(remoteIds);
-      await _ref.read(assetProvider.notifier).getAllAsset();
-
-      state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => trashChanges.contains(c))
-            .toList(),
-      );
-    }
-  }
-
   Future<void> _handlePendingDeletes() async {
     final deleteChanges = state.pendingChanges
         .where((c) => c.action == PendingAction.assetDelete)
@@ -288,7 +267,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     await _handlePendingUploaded();
     await _handlePendingDeletes();
     await _handlingPendingHidden();
-    await _handlePendingTrashes();
   }
 
   void _handleOnConfigUpdate(dynamic _) {
@@ -307,10 +285,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   void _handleOnAssetDelete(dynamic data) =>
       addPendingChange(PendingAction.assetDelete, data);
 
-  void _handleOnAssetTrash(dynamic data) {
-    addPendingChange(PendingAction.assetTrash, data);
-  }
-
   void _handleOnAssetHidden(dynamic data) =>
       addPendingChange(PendingAction.assetHidden, data);
 

mobile/lib/repositories/local_files_manager.repository.dart

@@ -1,23 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/local_files_manager.interface.dart';
-import 'package:immich_mobile/utils/local_files_manager.dart';
-
-final localFilesManagerRepositoryProvider =
-    Provider((ref) => LocalFilesManagerRepository());
-
-class LocalFilesManagerRepository implements ILocalFilesManager {
-  @override
-  Future<bool> moveToTrash(String fileName) async {
-    return await LocalFilesManager.moveToTrash(fileName);
-  }
-
-  @override
-  Future<bool> restoreFromTrash(String fileName) async {
-    return await LocalFilesManager.restoreFromTrash(fileName);
-  }
-
-  @override
-  Future<bool> requestManageStoragePermission() async {
-    return await LocalFilesManager.requestManageStoragePermission();
-  }
-}

mobile/lib/services/app_settings.service.dart

@@ -61,7 +61,6 @@ enum AppSettingsEnum<T> {
     0,
   ),
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
-  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
   logLevel<int>(StoreKey.logLevel, null, 5), // Level.INFO = 5
   preferRemoteImage<bool>(StoreKey.preferRemoteImage, null, false),
   loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),

mobile/lib/services/sync.service.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -17,10 +16,8 @@ import 'package:immich_mobile/interfaces/album_api.interface.dart';
 import 'package:immich_mobile/interfaces/album_media.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/etag.interface.dart';
-import 'package:immich_mobile/interfaces/local_files_manager.interface.dart';
 import 'package:immich_mobile/interfaces/partner.interface.dart';
 import 'package:immich_mobile/interfaces/partner_api.interface.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/album.repository.dart';
@@ -28,10 +25,8 @@ import 'package:immich_mobile/repositories/album_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/etag.repository.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/repositories/partner.repository.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/entity.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
@@ -53,8 +48,6 @@ final syncServiceProvider = Provider(
     ref.watch(userRepositoryProvider),
     ref.watch(userServiceProvider),
     ref.watch(etagRepositoryProvider),
-    ref.watch(appSettingsServiceProvider),
-    ref.watch(localFilesManagerRepositoryProvider),
     ref.watch(partnerApiRepositoryProvider),
     ref.watch(userApiRepositoryProvider),
   ),
@@ -76,8 +69,6 @@ class SyncService {
   final IUserApiRepository _userApiRepository;
   final AsyncMutex _lock = AsyncMutex();
   final Logger _log = Logger('SyncService');
-  final AppSettingsService _appSettingsService;
-  final ILocalFilesManager _localFilesManager;
 
   SyncService(
     this._hashService,
@@ -91,8 +82,6 @@ class SyncService {
     this._userRepository,
     this._userService,
     this._eTagRepository,
-    this._appSettingsService,
-    this._localFilesManager,
     this._partnerApiRepository,
     this._userApiRepository,
   );
@@ -249,19 +238,8 @@ class SyncService {
     return null;
   }
 
-  Future<void> _moveToTrashMatchedAssets(Iterable<String> idsToDelete) async {
-    final List<Asset> localAssets = await _assetRepository.getAllLocal();
-    final List<Asset> matchedAssets = localAssets
-        .where((asset) => idsToDelete.contains(asset.remoteId))
-        .toList();
-
-    for (var asset in matchedAssets) {
-      _localFilesManager.moveToTrash(asset.fileName);
-    }
-  }
-
   /// Deletes remote-only assets, updates merged assets to be local-only
-  Future<void> handleRemoteAssetRemoval(List<String> idsToDelete) async {
+  Future<void> handleRemoteAssetRemoval(List<String> idsToDelete) {
     return _assetRepository.transaction(() async {
       await _assetRepository.deleteAllByRemoteId(
         idsToDelete,
@@ -271,12 +249,6 @@ class SyncService {
         idsToDelete,
         state: AssetState.merged,
       );
-      if (Platform.isAndroid &&
-          _appSettingsService.getSetting<bool>(
-            AppSettingsEnum.manageLocalMediaAndroid,
-          )) {
-        await _moveToTrashMatchedAssets(idsToDelete);
-      }
       if (merged.isEmpty) return;
       for (final Asset asset in merged) {
         asset.remoteId = null;
@@ -818,27 +790,10 @@ class SyncService {
     return (existing, toUpsert);
   }
 
-  Future<void> _toggleTrashStatusForAssets(List<Asset> assetsList) async {
-    for (var asset in assetsList) {
-      if (asset.isTrashed) {
-        _localFilesManager.moveToTrash(asset.fileName);
-      } else {
-        _localFilesManager.restoreFromTrash(asset.fileName);
-      }
-    }
-  }
-
   /// Inserts or updates the assets in the database with their ExifInfo (if any)
   Future<void> upsertAssetsWithExif(List<Asset> assets) async {
     if (assets.isEmpty) return;
 
-    if (Platform.isAndroid &&
-        _appSettingsService.getSetting<bool>(
-          AppSettingsEnum.manageLocalMediaAndroid,
-        )) {
-      _toggleTrashStatusForAssets(assets);
-    }
-
     try {
       await _assetRepository.transaction(() async {
         await _assetRepository.updateAll(assets);

mobile/lib/utils/local_files_manager.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-
-class LocalFilesManager {
-  static const MethodChannel _channel = MethodChannel('file_trash');
-
-  static Future<bool> moveToTrash(String fileName) async {
-    try {
-      final bool success =
-          await _channel.invokeMethod('moveToTrash', {'fileName': fileName});
-      return success;
-    } on PlatformException catch (e) {
-      debugPrint('Error moving to trash: ${e.message}');
-      return false;
-    }
-  }
-
-  static Future<bool> restoreFromTrash(String fileName) async {
-    try {
-      final bool success = await _channel
-          .invokeMethod('restoreFromTrash', {'fileName': fileName});
-      return success;
-    } on PlatformException catch (e) {
-      debugPrint('Error restoring file: ${e.message}');
-      return false;
-    }
-  }
-
-  static Future<bool> requestManageStoragePermission() async {
-    try {
-      final bool success =
-          await _channel.invokeMethod('requestManageStoragePermission');
-      return success;
-    } on PlatformException catch (e) {
-      debugPrint('Error requesting permission: ${e.message}');
-      return false;
-    }
-  }
-}

mobile/lib/widgets/settings/advanced_settings.dart

@@ -1,13 +1,11 @@
 import 'dart:io';
 
-import 'package:device_info_plus/device_info_plus.dart';
 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/services/log.service.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.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/utils/http_ssl_cert_override.dart';
@@ -27,8 +25,6 @@ class AdvancedSettings extends HookConsumerWidget {
 
     final advancedTroubleshooting =
         useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
-    final manageLocalMediaAndroid =
-        useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
     final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
     final allowSelfSignedSSLCert =
@@ -44,16 +40,6 @@ class AdvancedSettings extends HookConsumerWidget {
           LogService.I.setlogLevel(Level.LEVELS[levelId.value].toLogLevel()),
     );
 
-    Future<bool> checkAndroidVersion() async {
-      if (Platform.isAndroid) {
-        DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
-        AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
-        int sdkVersion = androidInfo.version.sdkInt;
-        return sdkVersion >= 30;
-      }
-      return false;
-    }
-
     final advancedSettings = [
       SettingsSwitchListTile(
         enabled: true,
@@ -61,29 +47,6 @@ class AdvancedSettings extends HookConsumerWidget {
         title: "advanced_settings_troubleshooting_title".tr(),
         subtitle: "advanced_settings_troubleshooting_subtitle".tr(),
       ),
-      FutureBuilder<bool>(
-        future: checkAndroidVersion(),
-        builder: (context, snapshot) {
-          if (snapshot.hasData && snapshot.data == true) {
-            return SettingsSwitchListTile(
-              enabled: true,
-              valueNotifier: manageLocalMediaAndroid,
-              title: "advanced_settings_sync_remote_deletions_title".tr(),
-              subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
-              onChanged: (value) async {
-                if (value) {
-                  final result = await ref
-                      .read(localFilesManagerRepositoryProvider)
-                      .requestManageStoragePermission();
-                  manageLocalMediaAndroid.value = result;
-                }
-              },
-            );
-          } else {
-            return const SizedBox.shrink();
-          }
-        },
-      ),
       SettingsSliderListTile(
         text: "advanced_settings_log_level_title".tr(args: [logLevel]),
         valueNotifier: levelId,