feat: opt-in sync of deletes and restores from web to Android

mobile/android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     android:maxSdkVersion="32" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
     android:maxSdkVersion="32" />
+  <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
   <uses-permission android:name="android.permission.MANAGE_MEDIA" />
   <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
@@ -124,4 +125,4 @@
       <data android:scheme="geo" />
     </intent>
   </queries>
-</manifest>
+</manifest>

mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt

@@ -3,13 +3,181 @@ package app.alextran.immich
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import android.os.Bundle
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.ContentResolver
+import android.net.Uri
+import android.provider.MediaStore
+import android.util.Log
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
 import android.content.Intent
+import android.content.Context
+import androidx.annotation.NonNull
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
 
 class MainActivity : FlutterActivity() {
+    private val CHANNEL = "file_trash"
+    private val PERMISSION_REQUEST_CODE = 1001
 
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(BackgroundServicePlugin())
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
+            when (call.method) {
+                "moveToTrash" -> {
+                    val fileName = call.argument<String>("fileName")
+                    if (fileName != null) {
+                        if (hasManageStoragePermission()) {
+                            val success = moveToTrash(fileName)
+                            result.success(success)
+                        } else {
+                            result.error("PERMISSION_DENIED", "Storage permission required", null)
+                        }
+                    } else {
+                        result.error("INVALID_NAME", "The file name is not specified.", null)
+                    }
+                }
+                "restoreFromTrash" -> {
+                    val fileName = call.argument<String>("fileName")
+                    if (fileName != null) {
+                        if (hasManageStoragePermission()) {
+                            val success = untrashImage(fileName)
+                            result.success(success)
+                        } else {
+                            result.error("PERMISSION_DENIED", "Storage permission required", null)
+                        }
+                    } else {
+                        result.error("INVALID_NAME", "The file name is not specified.", null)
+                    }
+                }
+                "requestManageStoragePermission" -> {
+                  if (!hasManageStoragePermission()) {
+                      requestManageStoragePermission(result)
+                  } else {
+                      Log.e("Manage storage permission", "Permission already granted")
+                      result.success(true)
+                  }
+                }
+
+                else -> result.notImplemented()
+            }
+        }
+    }
+
+    private var pendingResult: MethodChannel.Result? = null
+
+    private fun requestManageStoragePermission(result: MethodChannel.Result) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        pendingResult = result // Store the result callback
+
+        val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
+        intent.data = Uri.parse("package:$packageName")
+        startActivityForResult(intent, PERMISSION_REQUEST_CODE)
+    } else {
+        result.success(true)
+    }
+}
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            val granted = hasManageStoragePermission()
+            pendingResult?.success(granted)
+            pendingResult = null
+        }
+    }
+
+    private fun hasManageStoragePermission(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            Environment.isExternalStorageManager()
+        } else {
+            true
+        }
+    }
+
+    private fun moveToTrash(fileName: String): Boolean {
+        val uri = getFileUri(fileName)
+
+        Log.e("FILE_URI", uri.toString())
+
+        return uri?.let { moveToTrash(it) } ?: false
     }
 
+    private fun moveToTrash(contentUri: Uri): Boolean {
+        return try {
+                            val values = ContentValues().apply {
+                    put(MediaStore.MediaColumns.IS_TRASHED, 1) // Move to trash
+                }
+
+                val updated = contentResolver.update(contentUri, values, null, null)
+                updated > 0
+                    } catch (e: Exception) {
+            Log.e("TrashError", "Error moving to trash", e)
+            false
+        }
+    }
+
+        private fun getFileUri(fileName: String): Uri? {
+        val contentUri = MediaStore.Files.getContentUri("external")
+        val projection = arrayOf(MediaStore.Images.Media._ID)
+        val selection = "${MediaStore.Images.Media.DISPLAY_NAME} = ?"
+        val selectionArgs = arrayOf(fileName)
+        var fileUri: Uri? = null
+
+        contentResolver.query(contentUri, projection, selection, selectionArgs, null)?.use { cursor ->
+            if (cursor.moveToFirst()) {
+                val id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID))
+                fileUri = ContentUris.withAppendedId(contentUri, id)
+            }
+        }
+        return fileUri
+    }
+
+
+    private fun untrashImage(name: String): Boolean {
+        val uri = getTrashedFileUri(contentResolver,name)
+        Log.e("FILE_URI", uri.toString())
+
+        return uri?.let { untrashImage(it) } ?: false
+    }
+
+
+    private fun untrashImage(contentUri: Uri): Boolean {
+        return try {
+                            val values = ContentValues().apply {
+                    put(MediaStore.MediaColumns.IS_TRASHED, 0) // Restore file
+                }
+
+                val updated = contentResolver.update(contentUri, values, null, null)
+                updated > 0
+                    } catch (e: Exception) {
+            Log.e("TrashError", "Error restoring file", e)
+            false
+        }
+    }
+
+    fun getTrashedFileUri(contentResolver: ContentResolver, fileName: String): Uri? {
+        val contentUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+        val projection = arrayOf(MediaStore.Files.FileColumns._ID)
+
+        val queryArgs = Bundle().apply {
+            putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns.DISPLAY_NAME} = ?")
+            putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(fileName))
+            putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+        }
+
+        contentResolver.query(contentUri, projection, queryArgs, null)?.use { cursor ->
+            if (cursor.moveToFirst()) {
+                val id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns._ID))
+                return ContentUris.withAppendedId(contentUri, id)
+            }
+        }
+        return null
+    }
 }

mobile/assets/i18n/en-US.json

@@ -21,6 +21,8 @@
   "advanced_settings_tile_title": "Advanced",
   "advanced_settings_troubleshooting_subtitle": "Enable additional features for troubleshooting",
   "advanced_settings_troubleshooting_title": "Troubleshooting",
+  "advanced_settings_sync_remote_deletions_title": "Sync remote deletions [EXPERIMENTAL]",
+  "advanced_settings_sync_remote_deletions_subtitle": "Automatically delete or restore an asset on this device when that action is taken on the web",
   "album_info_card_backup_album_excluded": "EXCLUDED",
   "album_info_card_backup_album_included": "INCLUDED",
   "albums": "Albums",

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

@@ -65,6 +65,7 @@ enum StoreKey<T> {
 
   // Video settings
   loadOriginalVideo<bool>._(136),
+  manageLocalMediaAndroid<bool>._(137),
   ;
 
   const StoreKey._(this.id);

mobile/lib/interfaces/local_files_manager.interface.dart

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

mobile/lib/providers/websocket.provider.dart

@@ -23,6 +23,7 @@ enum PendingAction {
   assetDelete,
   assetUploaded,
   assetHidden,
+  assetTrash,
 }
 
 class PendingChange {
@@ -160,7 +161,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', _handleServerUpdates);
+        socket.on('on_asset_trash', _handleOnAssetTrash);
         socket.on('on_asset_restore', _handleServerUpdates);
         socket.on('on_asset_update', _handleServerUpdates);
         socket.on('on_asset_stack_update', _handleServerUpdates);
@@ -207,6 +208,26 @@ 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)
@@ -267,6 +288,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     await _handlePendingUploaded();
     await _handlePendingDeletes();
     await _handlingPendingHidden();
+    await _handlePendingTrashes();
   }
 
   void _handleOnConfigUpdate(dynamic _) {
@@ -285,6 +307,10 @@ 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

@@ -0,0 +1,23 @@
+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,6 +61,7 @@ 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),