mirror of
				https://github.com/KevinMidboe/immich.git
				synced 2025-10-29 17:40:28 +00:00 
			
		
		
		
	feat(server): trash asset (#4015)
* refactor(server): delete assets endpoint * fix: formatting * chore: cleanup * chore: open api * chore(mobile): replace DeleteAssetDTO with BulkIdsDTOs * feat: trash an asset * chore(server): formatting * chore: open api * chore: wording * chore: open-api * feat(server): add withDeleted to getAssets queries * WIP: mobile-recycle-bin * feat(server): recycle-bin to system config * feat(web): use recycle-bin system config * chore(server): domain assetcore removed * chore(server): rename recycle-bin to trash * chore(web): rename recycle-bin to trash * chore(server): always send soft deleted assets for getAllByUserId * chore(web): formatting * feat(server): permanent delete assets older than trashed period * feat(web): trash empty placeholder image * feat(server): empty trash * feat(web): empty trash * WIP: mobile-recycle-bin * refactor(server): empty / restore trash to separate endpoint * test(server): handle failures * test(server): fix e2e server-info test * test(server): deletion test refactor * feat(mobile): use map settings from server-config to enable / disable map * feat(mobile): trash asset * fix(server): operations on assets in trash * feat(web): show trash statistics * fix(web): handle trash enabled * fix(mobile): restore updates from trash * fix(server): ignore trashed assets for person * fix(server): add / remove search index when trashed / restored * chore(web): format * fix(server): asset service test * fix(server): include trashed assts for duplicates from uploads * feat(mobile): no dialog for trash, always dialog for permanent delete * refactor(mobile): use isar where instead of dart filter * refactor(mobile): asset provide - handle deletes in single db txn * chore(mobile): review changes * feat(web): confirmation before empty trash * server: review changes * fix(server): handle library changes * fix: filter external assets from getting trashed / deleted * fix(server): empty-bin * feat: broadcast config update events through ws * change order of trash button on mobile * styling * fix(mobile): do not show trashed toast for local only assets --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com> Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
This commit is contained in:
		@@ -322,5 +322,17 @@
 | 
			
		||||
  "map_no_location_permission_title": "Location Permission denied",
 | 
			
		||||
  "map_no_location_permission_content": "Location permission is needed to display assets from your current location. Do you want to allow it now?",
 | 
			
		||||
  "map_location_dialog_cancel": "Cancel",
 | 
			
		||||
  "map_location_dialog_yes": "Yes"
 | 
			
		||||
  "map_location_dialog_yes": "Yes",
 | 
			
		||||
  "trash_page_title": "Trash ({})",
 | 
			
		||||
  "trash_page_info": "Backed up items will be permanently deleted after {} days",
 | 
			
		||||
  "trash_page_no_assets": "No trashed assets",
 | 
			
		||||
  "trash_page_delete": "Delete",
 | 
			
		||||
  "trash_page_delete_all": "Delete All",
 | 
			
		||||
  "trash_page_restore": "Restore",
 | 
			
		||||
  "trash_page_restore_all": "Restore All",
 | 
			
		||||
  "trash_page_select_btn": "Select",
 | 
			
		||||
  "trash_page_select_assets_btn": "Select assets",
 | 
			
		||||
  "trash_page_empty_trash_btn": "Empty trash",
 | 
			
		||||
  "trash_page_empty_trash_dialog_ok": "Ok",
 | 
			
		||||
  "trash_page_empty_trash_dialog_content": "Do you want to empty your trashed assets? These items will be permanently removed from Immich"
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -169,4 +169,4 @@ SPEC CHECKSUMS:
 | 
			
		||||
 | 
			
		||||
PODFILE CHECKSUM: 599d8aeb73728400c15364e734525722250a5382
 | 
			
		||||
 | 
			
		||||
COCOAPODS: 1.12.1
 | 
			
		||||
COCOAPODS: 1.11.3
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ final archiveProvider = StreamProvider<RenderList>((ref) async* {
 | 
			
		||||
      .ownerIdEqualToAnyChecksum(user.isarId)
 | 
			
		||||
      .filter()
 | 
			
		||||
      .isArchivedEqualTo(true)
 | 
			
		||||
      .isTrashedEqualTo(false)
 | 
			
		||||
      .sortByFileCreatedAt();
 | 
			
		||||
  final settings = ref.watch(appSettingsServiceProvider);
 | 
			
		||||
  final groupBy =
 | 
			
		||||
 
 | 
			
		||||
@@ -6,6 +6,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 | 
			
		||||
import 'package:flutter/material.dart';
 | 
			
		||||
import 'package:flutter/services.dart';
 | 
			
		||||
import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 | 
			
		||||
import 'package:fluttertoast/fluttertoast.dart';
 | 
			
		||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
 | 
			
		||||
@@ -19,11 +20,14 @@ import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart'
 | 
			
		||||
import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/upload_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/cache/original_image_provider.dart';
 | 
			
		||||
import 'package:immich_mobile/routing/router.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/store.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/immich_image.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/immich_toast.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/photo_view/photo_view_gallery.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_computed_scale.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_scale_state.dart';
 | 
			
		||||
@@ -67,6 +71,12 @@ class GalleryViewerPage extends HookConsumerWidget {
 | 
			
		||||
    final header = {"Authorization": authToken};
 | 
			
		||||
    final currentIndex = useState(initialIndex);
 | 
			
		||||
    final currentAsset = loadAsset(currentIndex.value);
 | 
			
		||||
    final isTrashEnabled =
 | 
			
		||||
        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
 | 
			
		||||
    final navStack = AutoRouter.of(context).stackData;
 | 
			
		||||
    final isFromTrash = isTrashEnabled &&
 | 
			
		||||
        navStack.length > 2 &&
 | 
			
		||||
        navStack.elementAt(navStack.length - 2).name == TrashRoute.name;
 | 
			
		||||
 | 
			
		||||
    Asset asset() => currentAsset;
 | 
			
		||||
 | 
			
		||||
@@ -161,25 +171,47 @@ class GalleryViewerPage extends HookConsumerWidget {
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void handleDelete(Asset deleteAsset) {
 | 
			
		||||
    void handleDelete(Asset deleteAsset) async {
 | 
			
		||||
      Future<bool> onDelete(bool force) async {
 | 
			
		||||
        final isDeleted = await ref.read(assetProvider.notifier).deleteAssets(
 | 
			
		||||
          {deleteAsset},
 | 
			
		||||
          force: force,
 | 
			
		||||
        );
 | 
			
		||||
        if (isDeleted) {
 | 
			
		||||
          if (totalAssets == 1) {
 | 
			
		||||
            // Handle only one asset
 | 
			
		||||
            AutoRouter.of(context).pop();
 | 
			
		||||
          } else {
 | 
			
		||||
            // Go to next page otherwise
 | 
			
		||||
            controller.nextPage(
 | 
			
		||||
              duration: const Duration(milliseconds: 100),
 | 
			
		||||
              curve: Curves.fastLinearToSlowEaseIn,
 | 
			
		||||
            );
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
        return isDeleted;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      // Asset is trashed
 | 
			
		||||
      if (isTrashEnabled && !isFromTrash) {
 | 
			
		||||
        final isDeleted = await onDelete(false);
 | 
			
		||||
        // Can only trash assets stored in server. Local assets are always permanently removed for now
 | 
			
		||||
        if (context.mounted && isDeleted && deleteAsset.isRemote) {
 | 
			
		||||
          ImmichToast.show(
 | 
			
		||||
            durationInSecond: 1,
 | 
			
		||||
            context: context,
 | 
			
		||||
            msg: 'Asset trashed',
 | 
			
		||||
            gravity: ToastGravity.BOTTOM,
 | 
			
		||||
          );
 | 
			
		||||
        }
 | 
			
		||||
        return;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      // Asset is permanently removed
 | 
			
		||||
      showDialog(
 | 
			
		||||
        context: context,
 | 
			
		||||
        builder: (BuildContext _) {
 | 
			
		||||
          return DeleteDialog(
 | 
			
		||||
            onDelete: () {
 | 
			
		||||
              if (totalAssets == 1) {
 | 
			
		||||
                // Handle only one asset
 | 
			
		||||
                AutoRouter.of(context).pop();
 | 
			
		||||
              } else {
 | 
			
		||||
                // Go to next page otherwise
 | 
			
		||||
                controller.nextPage(
 | 
			
		||||
                  duration: const Duration(milliseconds: 100),
 | 
			
		||||
                  curve: Curves.fastLinearToSlowEaseIn,
 | 
			
		||||
                );
 | 
			
		||||
              }
 | 
			
		||||
              ref.watch(assetProvider.notifier).deleteAssets({deleteAsset});
 | 
			
		||||
            },
 | 
			
		||||
          );
 | 
			
		||||
          return DeleteDialog(onDelete: () => onDelete(true));
 | 
			
		||||
        },
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -81,7 +81,9 @@ class BackupControllerPage extends HookConsumerWidget {
 | 
			
		||||
          context: context,
 | 
			
		||||
          msg: "Deleting ${assets.length} assets on the server...",
 | 
			
		||||
        );
 | 
			
		||||
        await ref.read(assetProvider.notifier).deleteAssets(assets);
 | 
			
		||||
        await ref
 | 
			
		||||
            .read(assetProvider.notifier)
 | 
			
		||||
            .deleteAssets(assets, force: true);
 | 
			
		||||
        ImmichToast.show(
 | 
			
		||||
          context: context,
 | 
			
		||||
          msg: "Deleted ${assets.length} assets on the server. "
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ final favoriteAssetsProvider = StreamProvider<RenderList>((ref) async* {
 | 
			
		||||
      .ownerIdEqualToAnyChecksum(user.isarId)
 | 
			
		||||
      .filter()
 | 
			
		||||
      .isFavoriteEqualTo(true)
 | 
			
		||||
      .isTrashedEqualTo(false)
 | 
			
		||||
      .sortByFileCreatedAt();
 | 
			
		||||
  final settings = ref.watch(appSettingsServiceProvider);
 | 
			
		||||
  final groupBy =
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,7 @@ import 'package:immich_mobile/modules/album/ui/add_to_album_sliverlist.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/upload_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/asset.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/drag_sheet.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/album.dart';
 | 
			
		||||
 | 
			
		||||
@@ -43,6 +44,8 @@ class ControlBottomAppBar extends ConsumerWidget {
 | 
			
		||||
  Widget build(BuildContext context, WidgetRef ref) {
 | 
			
		||||
    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
 | 
			
		||||
    var hasRemote = selectionAssetState == AssetState.remote;
 | 
			
		||||
    final trashEnabled =
 | 
			
		||||
        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
 | 
			
		||||
 | 
			
		||||
    Widget renderActionButtons() {
 | 
			
		||||
      return Row(
 | 
			
		||||
@@ -70,14 +73,20 @@ class ControlBottomAppBar extends ConsumerWidget {
 | 
			
		||||
            iconData: Icons.delete_outline_rounded,
 | 
			
		||||
            label: "control_bottom_app_bar_delete".tr(),
 | 
			
		||||
            onPressed: enabled
 | 
			
		||||
                ? () => showDialog(
 | 
			
		||||
                      context: context,
 | 
			
		||||
                      builder: (BuildContext context) {
 | 
			
		||||
                        return DeleteDialog(
 | 
			
		||||
                          onDelete: onDelete,
 | 
			
		||||
                        );
 | 
			
		||||
                      },
 | 
			
		||||
                    )
 | 
			
		||||
                ? () {
 | 
			
		||||
                    if (!trashEnabled) {
 | 
			
		||||
                      showDialog(
 | 
			
		||||
                        context: context,
 | 
			
		||||
                        builder: (BuildContext context) {
 | 
			
		||||
                          return DeleteDialog(
 | 
			
		||||
                            onDelete: onDelete,
 | 
			
		||||
                          );
 | 
			
		||||
                        },
 | 
			
		||||
                      );
 | 
			
		||||
                    } else {
 | 
			
		||||
                      onDelete();
 | 
			
		||||
                    }
 | 
			
		||||
                  }
 | 
			
		||||
                : null,
 | 
			
		||||
          ),
 | 
			
		||||
          if (!hasRemote)
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,7 @@ import 'package:immich_mobile/modules/home/ui/profile_drawer/server_info_box.dar
 | 
			
		||||
import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/routing/router.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/asset.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/websocket.provider.dart';
 | 
			
		||||
 | 
			
		||||
class ProfileDrawer extends HookConsumerWidget {
 | 
			
		||||
@@ -16,6 +17,9 @@ class ProfileDrawer extends HookConsumerWidget {
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  Widget build(BuildContext context, WidgetRef ref) {
 | 
			
		||||
    final trashEnabled =
 | 
			
		||||
        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
 | 
			
		||||
 | 
			
		||||
    buildSignOutButton() {
 | 
			
		||||
      return ListTile(
 | 
			
		||||
        leading: SizedBox(
 | 
			
		||||
@@ -91,6 +95,29 @@ class ProfileDrawer extends HookConsumerWidget {
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    buildTrashButton() {
 | 
			
		||||
      return ListTile(
 | 
			
		||||
        leading: SizedBox(
 | 
			
		||||
          height: double.infinity,
 | 
			
		||||
          child: Icon(
 | 
			
		||||
            Icons.delete_rounded,
 | 
			
		||||
            color: Theme.of(context).textTheme.labelMedium?.color,
 | 
			
		||||
            size: 20,
 | 
			
		||||
          ),
 | 
			
		||||
        ),
 | 
			
		||||
        title: Text(
 | 
			
		||||
          "Trash",
 | 
			
		||||
          style: Theme.of(context)
 | 
			
		||||
              .textTheme
 | 
			
		||||
              .labelLarge
 | 
			
		||||
              ?.copyWith(fontWeight: FontWeight.bold),
 | 
			
		||||
        ).tr(),
 | 
			
		||||
        onTap: () {
 | 
			
		||||
          AutoRouter.of(context).push(const TrashRoute());
 | 
			
		||||
        },
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return Drawer(
 | 
			
		||||
      shape: const RoundedRectangleBorder(
 | 
			
		||||
        borderRadius: BorderRadius.zero,
 | 
			
		||||
@@ -105,6 +132,7 @@ class ProfileDrawer extends HookConsumerWidget {
 | 
			
		||||
              const ProfileDrawerHeader(),
 | 
			
		||||
              buildSettingButton(),
 | 
			
		||||
              buildAppLogButton(),
 | 
			
		||||
              if (trashEnabled) buildTrashButton(),
 | 
			
		||||
              buildSignOutButton(),
 | 
			
		||||
            ],
 | 
			
		||||
          ),
 | 
			
		||||
 
 | 
			
		||||
@@ -43,6 +43,8 @@ class HomePage extends HookConsumerWidget {
 | 
			
		||||
    final sharedAlbums = ref.watch(sharedAlbumProvider);
 | 
			
		||||
    final albumService = ref.watch(albumServiceProvider);
 | 
			
		||||
    final currentUser = ref.watch(currentUserProvider);
 | 
			
		||||
    final trashEnabled =
 | 
			
		||||
        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
 | 
			
		||||
 | 
			
		||||
    final tipOneOpacity = useState(0.0);
 | 
			
		||||
    final refreshCount = useState(0);
 | 
			
		||||
@@ -139,7 +141,21 @@ class HomePage extends HookConsumerWidget {
 | 
			
		||||
      void onDelete() async {
 | 
			
		||||
        processing.value = true;
 | 
			
		||||
        try {
 | 
			
		||||
          await ref.read(assetProvider.notifier).deleteAssets(selection.value);
 | 
			
		||||
          await ref
 | 
			
		||||
              .read(assetProvider.notifier)
 | 
			
		||||
              .deleteAssets(selection.value, force: !trashEnabled);
 | 
			
		||||
 | 
			
		||||
          final hasRemote = selection.value.any((a) => a.isRemote);
 | 
			
		||||
          final assetOrAssets = selection.value.length > 1 ? 'assets' : 'asset';
 | 
			
		||||
          final trashOrRemoved =
 | 
			
		||||
              !trashEnabled ? 'deleted permanently' : 'trashed';
 | 
			
		||||
          if (hasRemote) {
 | 
			
		||||
            ImmichToast.show(
 | 
			
		||||
              context: context,
 | 
			
		||||
              msg: '${selection.value.length} $assetOrAssets $trashOrRemoved',
 | 
			
		||||
              gravity: ToastGravity.BOTTOM,
 | 
			
		||||
            );
 | 
			
		||||
          }
 | 
			
		||||
          selectionEnabledHook.value = false;
 | 
			
		||||
        } finally {
 | 
			
		||||
          processing.value = false;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										144
									
								
								mobile/lib/modules/trash/providers/trashed_asset.provider.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										144
									
								
								mobile/lib/modules/trash/providers/trashed_asset.provider.dart
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,144 @@
 | 
			
		||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/trash/services/trash.service.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/asset.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/exif_info.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/asset.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/db.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/user.provider.dart';
 | 
			
		||||
import 'package:isar/isar.dart';
 | 
			
		||||
import 'package:logging/logging.dart';
 | 
			
		||||
 | 
			
		||||
class TrashNotifier extends StateNotifier<bool> {
 | 
			
		||||
  final Isar _db;
 | 
			
		||||
  final Ref _ref;
 | 
			
		||||
  final TrashService _trashService;
 | 
			
		||||
  final _log = Logger('TrashNotifier');
 | 
			
		||||
 | 
			
		||||
  TrashNotifier(
 | 
			
		||||
    this._trashService,
 | 
			
		||||
    this._db,
 | 
			
		||||
    this._ref,
 | 
			
		||||
  ) : super(false);
 | 
			
		||||
 | 
			
		||||
  Future<void> emptyTrash() async {
 | 
			
		||||
    try {
 | 
			
		||||
      final user = _ref.read(currentUserProvider);
 | 
			
		||||
      if (user == null) {
 | 
			
		||||
        return;
 | 
			
		||||
      }
 | 
			
		||||
      await _trashService.emptyTrash();
 | 
			
		||||
 | 
			
		||||
      final dbIds = await _db.assets
 | 
			
		||||
          .where()
 | 
			
		||||
          .remoteIdIsNotNull()
 | 
			
		||||
          .filter()
 | 
			
		||||
          .ownerIdEqualTo(user.isarId)
 | 
			
		||||
          .isTrashedEqualTo(true)
 | 
			
		||||
          .idProperty()
 | 
			
		||||
          .findAll();
 | 
			
		||||
 | 
			
		||||
      await _db.writeTxn(() async {
 | 
			
		||||
        await _db.exifInfos.deleteAll(dbIds);
 | 
			
		||||
        await _db.assets.deleteAll(dbIds);
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      // Refresh assets in background
 | 
			
		||||
      Future.delayed(
 | 
			
		||||
        const Duration(seconds: 4),
 | 
			
		||||
        () async => await _ref.read(assetProvider.notifier).getAllAsset(),
 | 
			
		||||
      );
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot empty trash ${error.toString()}", error, stack);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<bool> restoreAssets(Iterable<Asset> assetList) async {
 | 
			
		||||
    try {
 | 
			
		||||
      final result = await _trashService.restoreAssets(assetList);
 | 
			
		||||
 | 
			
		||||
      if (result) {
 | 
			
		||||
        final remoteAssets = assetList.where((a) => a.isRemote).toList();
 | 
			
		||||
 | 
			
		||||
        final updatedAssets = remoteAssets.map((e) {
 | 
			
		||||
          e.isTrashed = false;
 | 
			
		||||
          return e;
 | 
			
		||||
        }).toList();
 | 
			
		||||
 | 
			
		||||
        await _db.writeTxn(() async {
 | 
			
		||||
          await _db.assets.putAll(updatedAssets);
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        // Refresh assets in background
 | 
			
		||||
        Future.delayed(
 | 
			
		||||
          const Duration(seconds: 4),
 | 
			
		||||
          () async => await _ref.read(assetProvider.notifier).getAllAsset(),
 | 
			
		||||
        );
 | 
			
		||||
        return true;
 | 
			
		||||
      }
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot restore trash ${error.toString()}", error, stack);
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> restoreTrash() async {
 | 
			
		||||
    try {
 | 
			
		||||
      final user = _ref.read(currentUserProvider);
 | 
			
		||||
      if (user == null) {
 | 
			
		||||
        return;
 | 
			
		||||
      }
 | 
			
		||||
      await _trashService.restoreTrash();
 | 
			
		||||
 | 
			
		||||
      final assets = await _db.assets
 | 
			
		||||
          .where()
 | 
			
		||||
          .remoteIdIsNotNull()
 | 
			
		||||
          .filter()
 | 
			
		||||
          .ownerIdEqualTo(user.isarId)
 | 
			
		||||
          .isTrashedEqualTo(true)
 | 
			
		||||
          .findAll();
 | 
			
		||||
 | 
			
		||||
      final updatedAssets = assets.map((e) {
 | 
			
		||||
        e.isTrashed = false;
 | 
			
		||||
        return e;
 | 
			
		||||
      }).toList();
 | 
			
		||||
 | 
			
		||||
      await _db.writeTxn(() async {
 | 
			
		||||
        await _db.assets.putAll(updatedAssets);
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      // Refresh assets in background
 | 
			
		||||
      Future.delayed(
 | 
			
		||||
        const Duration(seconds: 4),
 | 
			
		||||
        () async => await _ref.read(assetProvider.notifier).getAllAsset(),
 | 
			
		||||
      );
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot restore trash ${error.toString()}", error, stack);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
final trashProvider = StateNotifierProvider<TrashNotifier, bool>((ref) {
 | 
			
		||||
  return TrashNotifier(
 | 
			
		||||
    ref.watch(trashServiceProvider),
 | 
			
		||||
    ref.watch(dbProvider),
 | 
			
		||||
    ref,
 | 
			
		||||
  );
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
final trashedAssetsProvider = StreamProvider<RenderList>((ref) async* {
 | 
			
		||||
  final user = ref.read(currentUserProvider);
 | 
			
		||||
  if (user == null) return;
 | 
			
		||||
  final query = ref
 | 
			
		||||
      .watch(dbProvider)
 | 
			
		||||
      .assets
 | 
			
		||||
      .filter()
 | 
			
		||||
      .ownerIdEqualTo(user.isarId)
 | 
			
		||||
      .isTrashedEqualTo(true)
 | 
			
		||||
      .sortByFileCreatedAt();
 | 
			
		||||
  const groupBy = GroupAssetsBy.none;
 | 
			
		||||
  yield await RenderList.fromQuery(query, groupBy);
 | 
			
		||||
  await for (final _ in query.watchLazy()) {
 | 
			
		||||
    yield await RenderList.fromQuery(query, groupBy);
 | 
			
		||||
  }
 | 
			
		||||
});
 | 
			
		||||
							
								
								
									
										48
									
								
								mobile/lib/modules/trash/services/trash.service.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								mobile/lib/modules/trash/services/trash.service.dart
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,48 @@
 | 
			
		||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/asset.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/api.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/services/api.service.dart';
 | 
			
		||||
import 'package:logging/logging.dart';
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
 | 
			
		||||
final trashServiceProvider = Provider<TrashService>((ref) {
 | 
			
		||||
  return TrashService(
 | 
			
		||||
    ref.watch(apiServiceProvider),
 | 
			
		||||
  );
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
class TrashService {
 | 
			
		||||
  final _log = Logger("TrashService");
 | 
			
		||||
 | 
			
		||||
  final ApiService _apiService;
 | 
			
		||||
 | 
			
		||||
  TrashService(this._apiService);
 | 
			
		||||
 | 
			
		||||
  Future<bool> restoreAssets(Iterable<Asset> assetList) async {
 | 
			
		||||
    try {
 | 
			
		||||
      List<String> remoteIds =
 | 
			
		||||
          assetList.where((a) => a.isRemote).map((e) => e.remoteId!).toList();
 | 
			
		||||
      await _apiService.assetApi.restoreAssets(BulkIdsDto(ids: remoteIds));
 | 
			
		||||
      return true;
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot restore assets ${error.toString()}", error, stack);
 | 
			
		||||
      return false;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> emptyTrash() async {
 | 
			
		||||
    try {
 | 
			
		||||
      await _apiService.assetApi.emptyTrash();
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot empty trash ${error.toString()}", error, stack);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> restoreTrash() async {
 | 
			
		||||
    try {
 | 
			
		||||
      await _apiService.assetApi.restoreTrash();
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      _log.severe("Cannot restore trash ${error.toString()}", error, stack);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										276
									
								
								mobile/lib/modules/trash/views/trash_page.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										276
									
								
								mobile/lib/modules/trash/views/trash_page.dart
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,276 @@
 | 
			
		||||
import 'package:auto_route/auto_route.dart';
 | 
			
		||||
import 'package:easy_localization/easy_localization.dart';
 | 
			
		||||
import 'package:flutter/material.dart';
 | 
			
		||||
import 'package:flutter_hooks/flutter_hooks.dart';
 | 
			
		||||
import 'package:fluttertoast/fluttertoast.dart';
 | 
			
		||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/trash/providers/trashed_asset.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/asset.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/asset.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/ui/immich_toast.dart';
 | 
			
		||||
 | 
			
		||||
class TrashPage extends HookConsumerWidget {
 | 
			
		||||
  const TrashPage({super.key});
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  Widget build(BuildContext context, WidgetRef ref) {
 | 
			
		||||
    final trashedAssets = ref.watch(trashedAssetsProvider);
 | 
			
		||||
    final trashDays =
 | 
			
		||||
        ref.watch(serverInfoProvider.select((v) => v.serverConfig.trashDays));
 | 
			
		||||
    final selectionEnabledHook = useState(false);
 | 
			
		||||
    final selection = useState(<Asset>{});
 | 
			
		||||
    final processing = useState(false);
 | 
			
		||||
 | 
			
		||||
    void selectionListener(
 | 
			
		||||
      bool multiselect,
 | 
			
		||||
      Set<Asset> selectedAssets,
 | 
			
		||||
    ) {
 | 
			
		||||
      selectionEnabledHook.value = multiselect;
 | 
			
		||||
      selection.value = selectedAssets;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    onEmptyTrash() async {
 | 
			
		||||
      processing.value = true;
 | 
			
		||||
      await ref.read(trashProvider.notifier).emptyTrash();
 | 
			
		||||
      processing.value = false;
 | 
			
		||||
      selectionEnabledHook.value = false;
 | 
			
		||||
      if (context.mounted) {
 | 
			
		||||
        ImmichToast.show(
 | 
			
		||||
          context: context,
 | 
			
		||||
          msg: 'Emptied trash',
 | 
			
		||||
          gravity: ToastGravity.BOTTOM,
 | 
			
		||||
        );
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    handleEmptyTrash() async {
 | 
			
		||||
      await showDialog(
 | 
			
		||||
        context: context,
 | 
			
		||||
        builder: (context) => ConfirmDialog(
 | 
			
		||||
          onOk: () => onEmptyTrash(),
 | 
			
		||||
          title: "trash_page_empty_trash_btn".tr(),
 | 
			
		||||
          ok: "trash_page_empty_trash_dialog_ok".tr(),
 | 
			
		||||
          content: "trash_page_empty_trash_dialog_content".tr(),
 | 
			
		||||
        ),
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Future<void> onPermanentlyDelete() async {
 | 
			
		||||
      processing.value = true;
 | 
			
		||||
      try {
 | 
			
		||||
        if (selection.value.isNotEmpty) {
 | 
			
		||||
          await ref
 | 
			
		||||
              .read(assetProvider.notifier)
 | 
			
		||||
              .deleteAssets(selection.value, force: true);
 | 
			
		||||
 | 
			
		||||
          final assetOrAssets = selection.value.length > 1 ? 'assets' : 'asset';
 | 
			
		||||
          if (context.mounted) {
 | 
			
		||||
            ImmichToast.show(
 | 
			
		||||
              context: context,
 | 
			
		||||
              msg:
 | 
			
		||||
                  '${selection.value.length} $assetOrAssets deleted permanently',
 | 
			
		||||
              gravity: ToastGravity.BOTTOM,
 | 
			
		||||
            );
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      } finally {
 | 
			
		||||
        processing.value = false;
 | 
			
		||||
        selectionEnabledHook.value = false;
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    handlePermanentDelete() async {
 | 
			
		||||
      await showDialog(
 | 
			
		||||
        context: context,
 | 
			
		||||
        builder: (context) => DeleteDialog(
 | 
			
		||||
          onDelete: () => onPermanentlyDelete(),
 | 
			
		||||
        ),
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Future<void> handleRestoreAll() async {
 | 
			
		||||
      processing.value = true;
 | 
			
		||||
      await ref.read(trashProvider.notifier).restoreTrash();
 | 
			
		||||
      processing.value = false;
 | 
			
		||||
      selectionEnabledHook.value = false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Future<void> handleRestore() async {
 | 
			
		||||
      processing.value = true;
 | 
			
		||||
      try {
 | 
			
		||||
        if (selection.value.isNotEmpty) {
 | 
			
		||||
          final result = await ref
 | 
			
		||||
              .read(trashProvider.notifier)
 | 
			
		||||
              .restoreAssets(selection.value);
 | 
			
		||||
 | 
			
		||||
          final assetOrAssets = selection.value.length > 1 ? 'assets' : 'asset';
 | 
			
		||||
          if (result && context.mounted) {
 | 
			
		||||
            ImmichToast.show(
 | 
			
		||||
              context: context,
 | 
			
		||||
              msg:
 | 
			
		||||
                  '${selection.value.length} $assetOrAssets restored successfully',
 | 
			
		||||
              gravity: ToastGravity.BOTTOM,
 | 
			
		||||
            );
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      } finally {
 | 
			
		||||
        processing.value = false;
 | 
			
		||||
        selectionEnabledHook.value = false;
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    String getAppBarTitle(String count) {
 | 
			
		||||
      if (selectionEnabledHook.value) {
 | 
			
		||||
        return selection.value.isNotEmpty
 | 
			
		||||
            ? "${selection.value.length}"
 | 
			
		||||
            : "trash_page_select_assets_btn".tr();
 | 
			
		||||
      }
 | 
			
		||||
      return 'trash_page_title'.tr(args: [count]);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    AppBar buildAppBar(String count) {
 | 
			
		||||
      return AppBar(
 | 
			
		||||
        leading: IconButton(
 | 
			
		||||
          onPressed: !selectionEnabledHook.value
 | 
			
		||||
              ? () => AutoRouter.of(context).pop()
 | 
			
		||||
              : () {
 | 
			
		||||
                  selectionEnabledHook.value = false;
 | 
			
		||||
                  selection.value = {};
 | 
			
		||||
                },
 | 
			
		||||
          icon: !selectionEnabledHook.value
 | 
			
		||||
              ? const Icon(Icons.arrow_back_ios_rounded)
 | 
			
		||||
              : const Icon(Icons.close_rounded),
 | 
			
		||||
        ),
 | 
			
		||||
        centerTitle: !selectionEnabledHook.value,
 | 
			
		||||
        automaticallyImplyLeading: false,
 | 
			
		||||
        title: Text(getAppBarTitle(count)),
 | 
			
		||||
        actions: <Widget>[
 | 
			
		||||
          if (!selectionEnabledHook.value)
 | 
			
		||||
            PopupMenuButton<void Function()>(
 | 
			
		||||
              itemBuilder: (context) {
 | 
			
		||||
                return [
 | 
			
		||||
                  PopupMenuItem(
 | 
			
		||||
                    value: () => selectionEnabledHook.value = true,
 | 
			
		||||
                    child: const Text('trash_page_select_btn').tr(),
 | 
			
		||||
                  ),
 | 
			
		||||
                  PopupMenuItem(
 | 
			
		||||
                    value: handleEmptyTrash,
 | 
			
		||||
                    child: const Text('trash_page_empty_trash_btn').tr(),
 | 
			
		||||
                  ),
 | 
			
		||||
                ];
 | 
			
		||||
              },
 | 
			
		||||
              onSelected: (fn) => fn(),
 | 
			
		||||
            ),
 | 
			
		||||
        ],
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Widget buildBottomBar() {
 | 
			
		||||
      return SafeArea(
 | 
			
		||||
        child: Align(
 | 
			
		||||
          alignment: Alignment.bottomCenter,
 | 
			
		||||
          child: SizedBox(
 | 
			
		||||
            height: 64,
 | 
			
		||||
            child: Container(
 | 
			
		||||
              color: Theme.of(context).canvasColor,
 | 
			
		||||
              child: Row(
 | 
			
		||||
                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
 | 
			
		||||
                children: [
 | 
			
		||||
                  TextButton.icon(
 | 
			
		||||
                    icon: Icon(
 | 
			
		||||
                      Icons.delete_forever,
 | 
			
		||||
                      color: Colors.red[400],
 | 
			
		||||
                    ),
 | 
			
		||||
                    label: Text(
 | 
			
		||||
                      selection.value.isEmpty
 | 
			
		||||
                          ? 'trash_page_delete_all'.tr()
 | 
			
		||||
                          : 'trash_page_delete'.tr(),
 | 
			
		||||
                      style: TextStyle(
 | 
			
		||||
                        fontSize: 14,
 | 
			
		||||
                        color: Colors.red[400],
 | 
			
		||||
                        fontWeight: FontWeight.bold,
 | 
			
		||||
                      ),
 | 
			
		||||
                    ),
 | 
			
		||||
                    onPressed: processing.value
 | 
			
		||||
                        ? null
 | 
			
		||||
                        : selection.value.isEmpty
 | 
			
		||||
                            ? handleEmptyTrash
 | 
			
		||||
                            : handlePermanentDelete,
 | 
			
		||||
                  ),
 | 
			
		||||
                  TextButton.icon(
 | 
			
		||||
                    icon: const Icon(
 | 
			
		||||
                      Icons.history_rounded,
 | 
			
		||||
                    ),
 | 
			
		||||
                    label: Text(
 | 
			
		||||
                      selection.value.isEmpty
 | 
			
		||||
                          ? 'trash_page_restore_all'.tr()
 | 
			
		||||
                          : 'trash_page_restore'.tr(),
 | 
			
		||||
                      style: const TextStyle(
 | 
			
		||||
                        fontSize: 14,
 | 
			
		||||
                        fontWeight: FontWeight.bold,
 | 
			
		||||
                      ),
 | 
			
		||||
                    ),
 | 
			
		||||
                    onPressed: processing.value
 | 
			
		||||
                        ? null
 | 
			
		||||
                        : selection.value.isEmpty
 | 
			
		||||
                            ? handleRestoreAll
 | 
			
		||||
                            : handleRestore,
 | 
			
		||||
                  ),
 | 
			
		||||
                ],
 | 
			
		||||
              ),
 | 
			
		||||
            ),
 | 
			
		||||
          ),
 | 
			
		||||
        ),
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return trashedAssets.when(
 | 
			
		||||
      loading: () => Scaffold(
 | 
			
		||||
        appBar: buildAppBar("?"),
 | 
			
		||||
        body: const Center(child: CircularProgressIndicator()),
 | 
			
		||||
      ),
 | 
			
		||||
      error: (error, stackTrace) => Scaffold(
 | 
			
		||||
        appBar: buildAppBar("!"),
 | 
			
		||||
        body: Center(child: Text(error.toString())),
 | 
			
		||||
      ),
 | 
			
		||||
      data: (data) => Scaffold(
 | 
			
		||||
        appBar: buildAppBar(data.totalAssets.toString()),
 | 
			
		||||
        body: data.isEmpty
 | 
			
		||||
            ? Center(
 | 
			
		||||
                child: Text('trash_page_no_assets'.tr()),
 | 
			
		||||
              )
 | 
			
		||||
            : Stack(
 | 
			
		||||
                children: [
 | 
			
		||||
                  SafeArea(
 | 
			
		||||
                    child: ImmichAssetGrid(
 | 
			
		||||
                      renderList: data,
 | 
			
		||||
                      listener: selectionListener,
 | 
			
		||||
                      selectionActive: selectionEnabledHook.value,
 | 
			
		||||
                      showMultiSelectIndicator: false,
 | 
			
		||||
                      topWidget: Padding(
 | 
			
		||||
                        padding: const EdgeInsets.only(
 | 
			
		||||
                          top: 24,
 | 
			
		||||
                          bottom: 24,
 | 
			
		||||
                          left: 12,
 | 
			
		||||
                          right: 12,
 | 
			
		||||
                        ),
 | 
			
		||||
                        child: const Text(
 | 
			
		||||
                          "trash_page_info",
 | 
			
		||||
                        ).tr(args: ["$trashDays"]),
 | 
			
		||||
                      ),
 | 
			
		||||
                    ),
 | 
			
		||||
                  ),
 | 
			
		||||
                  if (selectionEnabledHook.value) buildBottomBar(),
 | 
			
		||||
                  if (processing.value)
 | 
			
		||||
                    const Center(child: ImmichLoadingIndicator()),
 | 
			
		||||
                ],
 | 
			
		||||
              ),
 | 
			
		||||
      ),
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -28,6 +28,7 @@ import 'package:immich_mobile/modules/login/views/change_password_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/login/views/login_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/onboarding/views/permission_onboarding_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/trash/views/trash_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/search/views/all_motion_videos_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/search/views/all_people_page.dart';
 | 
			
		||||
import 'package:immich_mobile/modules/search/views/all_videos_page.dart';
 | 
			
		||||
@@ -155,6 +156,7 @@ part 'router.gr.dart';
 | 
			
		||||
    AutoRoute(page: MemoryPage, guards: [AuthGuard, DuplicateGuard]),
 | 
			
		||||
    AutoRoute(page: MapPage, guards: [AuthGuard, DuplicateGuard]),
 | 
			
		||||
    AutoRoute(page: AlbumOptionsPage, guards: [AuthGuard, DuplicateGuard]),
 | 
			
		||||
    AutoRoute(page: TrashPage, guards: [AuthGuard, DuplicateGuard]),
 | 
			
		||||
  ],
 | 
			
		||||
)
 | 
			
		||||
class AppRouter extends _$AppRouter {
 | 
			
		||||
 
 | 
			
		||||
@@ -312,6 +312,12 @@ class _$AppRouter extends RootStackRouter {
 | 
			
		||||
        ),
 | 
			
		||||
      );
 | 
			
		||||
    },
 | 
			
		||||
    TrashRoute.name: (routeData) {
 | 
			
		||||
      return MaterialPageX<dynamic>(
 | 
			
		||||
        routeData: routeData,
 | 
			
		||||
        child: const TrashPage(),
 | 
			
		||||
      );
 | 
			
		||||
    },
 | 
			
		||||
    HomeRoute.name: (routeData) {
 | 
			
		||||
      return MaterialPageX<dynamic>(
 | 
			
		||||
        routeData: routeData,
 | 
			
		||||
@@ -624,6 +630,14 @@ class _$AppRouter extends RootStackRouter {
 | 
			
		||||
            duplicateGuard,
 | 
			
		||||
          ],
 | 
			
		||||
        ),
 | 
			
		||||
        RouteConfig(
 | 
			
		||||
          TrashRoute.name,
 | 
			
		||||
          path: '/trash-page',
 | 
			
		||||
          guards: [
 | 
			
		||||
            authGuard,
 | 
			
		||||
            duplicateGuard,
 | 
			
		||||
          ],
 | 
			
		||||
        ),
 | 
			
		||||
      ];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -1394,6 +1408,18 @@ class AlbumOptionsRouteArgs {
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// generated route for
 | 
			
		||||
/// [TrashPage]
 | 
			
		||||
class TrashRoute extends PageRouteInfo<void> {
 | 
			
		||||
  const TrashRoute()
 | 
			
		||||
      : super(
 | 
			
		||||
          TrashRoute.name,
 | 
			
		||||
          path: '/trash-page',
 | 
			
		||||
        );
 | 
			
		||||
 | 
			
		||||
  static const String name = 'TrashRoute';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// generated route for
 | 
			
		||||
/// [HomePage]
 | 
			
		||||
class HomeRoute extends PageRouteInfo<void> {
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,8 @@ class Asset {
 | 
			
		||||
        exifInfo =
 | 
			
		||||
            remote.exifInfo != null ? ExifInfo.fromDto(remote.exifInfo!) : null,
 | 
			
		||||
        isFavorite = remote.isFavorite,
 | 
			
		||||
        isArchived = remote.isArchived;
 | 
			
		||||
        isArchived = remote.isArchived,
 | 
			
		||||
        isTrashed = remote.isTrashed;
 | 
			
		||||
 | 
			
		||||
  Asset.local(AssetEntity local, List<int> hash)
 | 
			
		||||
      : localId = local.id,
 | 
			
		||||
@@ -45,6 +46,7 @@ class Asset {
 | 
			
		||||
        updatedAt = local.modifiedDateTime,
 | 
			
		||||
        isFavorite = local.isFavorite,
 | 
			
		||||
        isArchived = false,
 | 
			
		||||
        isTrashed = false,
 | 
			
		||||
        fileCreatedAt = local.createDateTime {
 | 
			
		||||
    if (fileCreatedAt.year == 1970) {
 | 
			
		||||
      fileCreatedAt = fileModifiedAt;
 | 
			
		||||
@@ -74,6 +76,7 @@ class Asset {
 | 
			
		||||
    this.exifInfo,
 | 
			
		||||
    required this.isFavorite,
 | 
			
		||||
    required this.isArchived,
 | 
			
		||||
    required this.isTrashed,
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  @ignore
 | 
			
		||||
@@ -138,6 +141,8 @@ class Asset {
 | 
			
		||||
 | 
			
		||||
  bool isArchived;
 | 
			
		||||
 | 
			
		||||
  bool isTrashed;
 | 
			
		||||
 | 
			
		||||
  @ignore
 | 
			
		||||
  ExifInfo? exifInfo;
 | 
			
		||||
 | 
			
		||||
@@ -194,7 +199,8 @@ class Asset {
 | 
			
		||||
        livePhotoVideoId == other.livePhotoVideoId &&
 | 
			
		||||
        isFavorite == other.isFavorite &&
 | 
			
		||||
        isLocal == other.isLocal &&
 | 
			
		||||
        isArchived == other.isArchived;
 | 
			
		||||
        isArchived == other.isArchived &&
 | 
			
		||||
        isTrashed == other.isTrashed;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
@@ -216,7 +222,8 @@ class Asset {
 | 
			
		||||
      livePhotoVideoId.hashCode ^
 | 
			
		||||
      isFavorite.hashCode ^
 | 
			
		||||
      isLocal.hashCode ^
 | 
			
		||||
      isArchived.hashCode;
 | 
			
		||||
      isArchived.hashCode ^
 | 
			
		||||
      isTrashed.hashCode;
 | 
			
		||||
 | 
			
		||||
  /// Returns `true` if this [Asset] can updated with values from parameter [a]
 | 
			
		||||
  bool canUpdate(Asset a) {
 | 
			
		||||
@@ -229,8 +236,9 @@ class Asset {
 | 
			
		||||
        width == null && a.width != null ||
 | 
			
		||||
        height == null && a.height != null ||
 | 
			
		||||
        livePhotoVideoId == null && a.livePhotoVideoId != null ||
 | 
			
		||||
        !isRemote && a.isRemote && isFavorite != a.isFavorite ||
 | 
			
		||||
        !isRemote && a.isRemote && isArchived != a.isArchived;
 | 
			
		||||
        isFavorite != a.isFavorite ||
 | 
			
		||||
        isArchived != a.isArchived ||
 | 
			
		||||
        isTrashed != a.isTrashed;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Returns a new [Asset] with values from this and merged & updated with [a]
 | 
			
		||||
@@ -261,6 +269,7 @@ class Asset {
 | 
			
		||||
          livePhotoVideoId: livePhotoVideoId,
 | 
			
		||||
          isFavorite: isFavorite,
 | 
			
		||||
          isArchived: isArchived,
 | 
			
		||||
          isTrashed: isTrashed,
 | 
			
		||||
        );
 | 
			
		||||
      }
 | 
			
		||||
    } else {
 | 
			
		||||
@@ -275,6 +284,7 @@ class Asset {
 | 
			
		||||
          // isFavorite + isArchived are not set by device-only assets
 | 
			
		||||
          isFavorite: a.isFavorite,
 | 
			
		||||
          isArchived: a.isArchived,
 | 
			
		||||
          isTrashed: a.isTrashed,
 | 
			
		||||
          exifInfo: a.exifInfo?.copyWith(id: id) ?? exifInfo,
 | 
			
		||||
        );
 | 
			
		||||
      } else {
 | 
			
		||||
@@ -306,6 +316,7 @@ class Asset {
 | 
			
		||||
    String? livePhotoVideoId,
 | 
			
		||||
    bool? isFavorite,
 | 
			
		||||
    bool? isArchived,
 | 
			
		||||
    bool? isTrashed,
 | 
			
		||||
    ExifInfo? exifInfo,
 | 
			
		||||
  }) =>
 | 
			
		||||
      Asset(
 | 
			
		||||
@@ -325,6 +336,7 @@ class Asset {
 | 
			
		||||
        livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
 | 
			
		||||
        isFavorite: isFavorite ?? this.isFavorite,
 | 
			
		||||
        isArchived: isArchived ?? this.isArchived,
 | 
			
		||||
        isTrashed: isTrashed ?? this.isTrashed,
 | 
			
		||||
        exifInfo: exifInfo ?? this.exifInfo,
 | 
			
		||||
      );
 | 
			
		||||
 | 
			
		||||
@@ -378,7 +390,8 @@ class Asset {
 | 
			
		||||
  "storage": "$storage",
 | 
			
		||||
  "width": ${width ?? "N/A"},
 | 
			
		||||
  "height": ${height ?? "N/A"},
 | 
			
		||||
  "isArchived": $isArchived
 | 
			
		||||
  "isArchived": $isArchived,
 | 
			
		||||
  "isTrashed": $isTrashed,
 | 
			
		||||
}""";
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -57,39 +57,44 @@ const AssetSchema = CollectionSchema(
 | 
			
		||||
      name: r'isFavorite',
 | 
			
		||||
      type: IsarType.bool,
 | 
			
		||||
    ),
 | 
			
		||||
    r'livePhotoVideoId': PropertySchema(
 | 
			
		||||
    r'isTrashed': PropertySchema(
 | 
			
		||||
      id: 8,
 | 
			
		||||
      name: r'isTrashed',
 | 
			
		||||
      type: IsarType.bool,
 | 
			
		||||
    ),
 | 
			
		||||
    r'livePhotoVideoId': PropertySchema(
 | 
			
		||||
      id: 9,
 | 
			
		||||
      name: r'livePhotoVideoId',
 | 
			
		||||
      type: IsarType.string,
 | 
			
		||||
    ),
 | 
			
		||||
    r'localId': PropertySchema(
 | 
			
		||||
      id: 9,
 | 
			
		||||
      id: 10,
 | 
			
		||||
      name: r'localId',
 | 
			
		||||
      type: IsarType.string,
 | 
			
		||||
    ),
 | 
			
		||||
    r'ownerId': PropertySchema(
 | 
			
		||||
      id: 10,
 | 
			
		||||
      id: 11,
 | 
			
		||||
      name: r'ownerId',
 | 
			
		||||
      type: IsarType.long,
 | 
			
		||||
    ),
 | 
			
		||||
    r'remoteId': PropertySchema(
 | 
			
		||||
      id: 11,
 | 
			
		||||
      id: 12,
 | 
			
		||||
      name: r'remoteId',
 | 
			
		||||
      type: IsarType.string,
 | 
			
		||||
    ),
 | 
			
		||||
    r'type': PropertySchema(
 | 
			
		||||
      id: 12,
 | 
			
		||||
      id: 13,
 | 
			
		||||
      name: r'type',
 | 
			
		||||
      type: IsarType.byte,
 | 
			
		||||
      enumMap: _AssettypeEnumValueMap,
 | 
			
		||||
    ),
 | 
			
		||||
    r'updatedAt': PropertySchema(
 | 
			
		||||
      id: 13,
 | 
			
		||||
      id: 14,
 | 
			
		||||
      name: r'updatedAt',
 | 
			
		||||
      type: IsarType.dateTime,
 | 
			
		||||
    ),
 | 
			
		||||
    r'width': PropertySchema(
 | 
			
		||||
      id: 14,
 | 
			
		||||
      id: 15,
 | 
			
		||||
      name: r'width',
 | 
			
		||||
      type: IsarType.int,
 | 
			
		||||
    )
 | 
			
		||||
@@ -196,13 +201,14 @@ void _assetSerialize(
 | 
			
		||||
  writer.writeInt(offsets[5], object.height);
 | 
			
		||||
  writer.writeBool(offsets[6], object.isArchived);
 | 
			
		||||
  writer.writeBool(offsets[7], object.isFavorite);
 | 
			
		||||
  writer.writeString(offsets[8], object.livePhotoVideoId);
 | 
			
		||||
  writer.writeString(offsets[9], object.localId);
 | 
			
		||||
  writer.writeLong(offsets[10], object.ownerId);
 | 
			
		||||
  writer.writeString(offsets[11], object.remoteId);
 | 
			
		||||
  writer.writeByte(offsets[12], object.type.index);
 | 
			
		||||
  writer.writeDateTime(offsets[13], object.updatedAt);
 | 
			
		||||
  writer.writeInt(offsets[14], object.width);
 | 
			
		||||
  writer.writeBool(offsets[8], object.isTrashed);
 | 
			
		||||
  writer.writeString(offsets[9], object.livePhotoVideoId);
 | 
			
		||||
  writer.writeString(offsets[10], object.localId);
 | 
			
		||||
  writer.writeLong(offsets[11], object.ownerId);
 | 
			
		||||
  writer.writeString(offsets[12], object.remoteId);
 | 
			
		||||
  writer.writeByte(offsets[13], object.type.index);
 | 
			
		||||
  writer.writeDateTime(offsets[14], object.updatedAt);
 | 
			
		||||
  writer.writeInt(offsets[15], object.width);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Asset _assetDeserialize(
 | 
			
		||||
@@ -221,14 +227,15 @@ Asset _assetDeserialize(
 | 
			
		||||
    id: id,
 | 
			
		||||
    isArchived: reader.readBool(offsets[6]),
 | 
			
		||||
    isFavorite: reader.readBool(offsets[7]),
 | 
			
		||||
    livePhotoVideoId: reader.readStringOrNull(offsets[8]),
 | 
			
		||||
    localId: reader.readStringOrNull(offsets[9]),
 | 
			
		||||
    ownerId: reader.readLong(offsets[10]),
 | 
			
		||||
    remoteId: reader.readStringOrNull(offsets[11]),
 | 
			
		||||
    type: _AssettypeValueEnumMap[reader.readByteOrNull(offsets[12])] ??
 | 
			
		||||
    isTrashed: reader.readBool(offsets[8]),
 | 
			
		||||
    livePhotoVideoId: reader.readStringOrNull(offsets[9]),
 | 
			
		||||
    localId: reader.readStringOrNull(offsets[10]),
 | 
			
		||||
    ownerId: reader.readLong(offsets[11]),
 | 
			
		||||
    remoteId: reader.readStringOrNull(offsets[12]),
 | 
			
		||||
    type: _AssettypeValueEnumMap[reader.readByteOrNull(offsets[13])] ??
 | 
			
		||||
        AssetType.other,
 | 
			
		||||
    updatedAt: reader.readDateTime(offsets[13]),
 | 
			
		||||
    width: reader.readIntOrNull(offsets[14]),
 | 
			
		||||
    updatedAt: reader.readDateTime(offsets[14]),
 | 
			
		||||
    width: reader.readIntOrNull(offsets[15]),
 | 
			
		||||
  );
 | 
			
		||||
  return object;
 | 
			
		||||
}
 | 
			
		||||
@@ -257,19 +264,21 @@ P _assetDeserializeProp<P>(
 | 
			
		||||
    case 7:
 | 
			
		||||
      return (reader.readBool(offset)) as P;
 | 
			
		||||
    case 8:
 | 
			
		||||
      return (reader.readStringOrNull(offset)) as P;
 | 
			
		||||
      return (reader.readBool(offset)) as P;
 | 
			
		||||
    case 9:
 | 
			
		||||
      return (reader.readStringOrNull(offset)) as P;
 | 
			
		||||
    case 10:
 | 
			
		||||
      return (reader.readLong(offset)) as P;
 | 
			
		||||
    case 11:
 | 
			
		||||
      return (reader.readStringOrNull(offset)) as P;
 | 
			
		||||
    case 11:
 | 
			
		||||
      return (reader.readLong(offset)) as P;
 | 
			
		||||
    case 12:
 | 
			
		||||
      return (reader.readStringOrNull(offset)) as P;
 | 
			
		||||
    case 13:
 | 
			
		||||
      return (_AssettypeValueEnumMap[reader.readByteOrNull(offset)] ??
 | 
			
		||||
          AssetType.other) as P;
 | 
			
		||||
    case 13:
 | 
			
		||||
      return (reader.readDateTime(offset)) as P;
 | 
			
		||||
    case 14:
 | 
			
		||||
      return (reader.readDateTime(offset)) as P;
 | 
			
		||||
    case 15:
 | 
			
		||||
      return (reader.readIntOrNull(offset)) as P;
 | 
			
		||||
    default:
 | 
			
		||||
      throw IsarError('Unknown property with id $propertyId');
 | 
			
		||||
@@ -1290,6 +1299,16 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterFilterCondition> isTrashedEqualTo(
 | 
			
		||||
      bool value) {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addFilterCondition(FilterCondition.equalTo(
 | 
			
		||||
        property: r'isTrashed',
 | 
			
		||||
        value: value,
 | 
			
		||||
      ));
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterFilterCondition> livePhotoVideoIdIsNull() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addFilterCondition(const FilterCondition.isNull(
 | 
			
		||||
@@ -2058,6 +2077,18 @@ extension AssetQuerySortBy on QueryBuilder<Asset, Asset, QSortBy> {
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> sortByIsTrashed() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'isTrashed', Sort.asc);
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> sortByIsTrashedDesc() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'isTrashed', Sort.desc);
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> sortByLivePhotoVideoId() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'livePhotoVideoId', Sort.asc);
 | 
			
		||||
@@ -2252,6 +2283,18 @@ extension AssetQuerySortThenBy on QueryBuilder<Asset, Asset, QSortThenBy> {
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> thenByIsTrashed() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'isTrashed', Sort.asc);
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> thenByIsTrashedDesc() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'isTrashed', Sort.desc);
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QAfterSortBy> thenByLivePhotoVideoId() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addSortBy(r'livePhotoVideoId', Sort.asc);
 | 
			
		||||
@@ -2388,6 +2431,12 @@ extension AssetQueryWhereDistinct on QueryBuilder<Asset, Asset, QDistinct> {
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QDistinct> distinctByIsTrashed() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addDistinctBy(r'isTrashed');
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, Asset, QDistinct> distinctByLivePhotoVideoId(
 | 
			
		||||
      {bool caseSensitive = true}) {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
@@ -2490,6 +2539,12 @@ extension AssetQueryProperty on QueryBuilder<Asset, Asset, QQueryProperty> {
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, bool, QQueryOperations> isTrashedProperty() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addPropertyName(r'isTrashed');
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  QueryBuilder<Asset, String?, QQueryOperations> livePhotoVideoIdProperty() {
 | 
			
		||||
    return QueryBuilder.apply(this, (query) {
 | 
			
		||||
      return query.addPropertyName(r'livePhotoVideoId');
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,6 @@ import 'package:immich_mobile/shared/services/user.service.dart';
 | 
			
		||||
import 'package:immich_mobile/utils/db.dart';
 | 
			
		||||
import 'package:isar/isar.dart';
 | 
			
		||||
import 'package:logging/logging.dart';
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
import 'package:photo_manager/photo_manager.dart';
 | 
			
		||||
 | 
			
		||||
class AssetNotifier extends StateNotifier<bool> {
 | 
			
		||||
@@ -92,23 +91,45 @@ class AssetNotifier extends StateNotifier<bool> {
 | 
			
		||||
    await _syncService.syncNewAssetToDb(newAsset);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> deleteAssets(Iterable<Asset> deleteAssets) async {
 | 
			
		||||
  Future<bool> deleteAssets(
 | 
			
		||||
    Iterable<Asset> deleteAssets, {
 | 
			
		||||
    bool? force = false,
 | 
			
		||||
  }) async {
 | 
			
		||||
    _deleteInProgress = true;
 | 
			
		||||
    state = true;
 | 
			
		||||
    try {
 | 
			
		||||
      final localDeleted = await _deleteLocalAssets(deleteAssets);
 | 
			
		||||
      final remoteDeleted = await _deleteRemoteAssets(deleteAssets);
 | 
			
		||||
      final remoteDeleted = await _deleteRemoteAssets(deleteAssets, force);
 | 
			
		||||
      if (localDeleted.isNotEmpty || remoteDeleted.isNotEmpty) {
 | 
			
		||||
        final dbIds = deleteAssets.map((e) => e.id).toList();
 | 
			
		||||
        List<Asset>? assetsToUpdate;
 | 
			
		||||
        // Local only assets are permanently deleted for now. So always remove them from db
 | 
			
		||||
        final dbIds = deleteAssets
 | 
			
		||||
            .where((a) => a.isLocal && !a.isRemote)
 | 
			
		||||
            .map((e) => e.id)
 | 
			
		||||
            .toList();
 | 
			
		||||
        if (force == null || !force) {
 | 
			
		||||
          assetsToUpdate = remoteDeleted.map((e) {
 | 
			
		||||
            e.isTrashed = true;
 | 
			
		||||
            return e;
 | 
			
		||||
          }).toList();
 | 
			
		||||
        } else {
 | 
			
		||||
          // Add all remote assets to be deleted from isar as since they are permanently deleted
 | 
			
		||||
          dbIds.addAll(remoteDeleted.map((e) => e.id));
 | 
			
		||||
        }
 | 
			
		||||
        await _db.writeTxn(() async {
 | 
			
		||||
          if (assetsToUpdate != null) {
 | 
			
		||||
            await _db.assets.putAll(assetsToUpdate);
 | 
			
		||||
          }
 | 
			
		||||
          await _db.exifInfos.deleteAll(dbIds);
 | 
			
		||||
          await _db.assets.deleteAll(dbIds);
 | 
			
		||||
        });
 | 
			
		||||
        return true;
 | 
			
		||||
      }
 | 
			
		||||
    } finally {
 | 
			
		||||
      _deleteInProgress = false;
 | 
			
		||||
      state = false;
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<List<String>> _deleteLocalAssets(
 | 
			
		||||
@@ -127,15 +148,14 @@ class AssetNotifier extends StateNotifier<bool> {
 | 
			
		||||
    return [];
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<Iterable<String>> _deleteRemoteAssets(
 | 
			
		||||
  Future<Iterable<Asset>> _deleteRemoteAssets(
 | 
			
		||||
    Iterable<Asset> assetsToDelete,
 | 
			
		||||
    bool? force,
 | 
			
		||||
  ) async {
 | 
			
		||||
    final Iterable<Asset> remote = assetsToDelete.where((e) => e.isRemote);
 | 
			
		||||
    final List<DeleteAssetResponseDto> deleteAssetResult =
 | 
			
		||||
        await _assetService.deleteAssets(remote) ?? [];
 | 
			
		||||
    return deleteAssetResult
 | 
			
		||||
        .where((a) => a.status == DeleteAssetStatus.SUCCESS)
 | 
			
		||||
        .map((a) => a.id);
 | 
			
		||||
 | 
			
		||||
    final isSuccess = await _assetService.deleteAssets(remote, force: force);
 | 
			
		||||
    return isSuccess ? remote : [];
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> toggleFavorite(List<Asset> assets, bool status) async {
 | 
			
		||||
@@ -190,6 +210,7 @@ final assetsProvider =
 | 
			
		||||
      .ownerIdEqualToAnyChecksum(userId)
 | 
			
		||||
      .filter()
 | 
			
		||||
      .isArchivedEqualTo(false)
 | 
			
		||||
      .isTrashedEqualTo(false)
 | 
			
		||||
      .sortByFileCreatedAtDesc();
 | 
			
		||||
  final settings = ref.watch(appSettingsServiceProvider);
 | 
			
		||||
  final groupBy =
 | 
			
		||||
@@ -210,6 +231,7 @@ final remoteAssetsProvider =
 | 
			
		||||
      .remoteIdIsNotNull()
 | 
			
		||||
      .filter()
 | 
			
		||||
      .ownerIdEqualTo(userId)
 | 
			
		||||
      .isTrashedEqualTo(false)
 | 
			
		||||
      .sortByFileCreatedAtDesc();
 | 
			
		||||
  final settings = ref.watch(appSettingsServiceProvider);
 | 
			
		||||
  final groupBy =
 | 
			
		||||
 
 | 
			
		||||
@@ -26,12 +26,14 @@ class ServerInfoNotifier extends StateNotifier<ServerInfoState> {
 | 
			
		||||
              search: true,
 | 
			
		||||
              sidecar: true,
 | 
			
		||||
              tagImage: true,
 | 
			
		||||
              trash: true,
 | 
			
		||||
              reverseGeocoding: true,
 | 
			
		||||
            ),
 | 
			
		||||
            serverConfig: ServerConfigDto(
 | 
			
		||||
              loginPageMessage: "",
 | 
			
		||||
              mapTileUrl: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
 | 
			
		||||
              oauthButtonText: "",
 | 
			
		||||
              trashDays: 30,
 | 
			
		||||
            ),
 | 
			
		||||
            isVersionMismatch: false,
 | 
			
		||||
            versionMismatchErrorMessage: "",
 | 
			
		||||
 
 | 
			
		||||
@@ -6,6 +6,7 @@ import 'package:immich_mobile/modules/login/providers/authentication.provider.da
 | 
			
		||||
import 'package:immich_mobile/shared/models/asset.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/models/store.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/asset.provider.dart';
 | 
			
		||||
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 | 
			
		||||
import 'package:logging/logging.dart';
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
import 'package:socket_io_client/socket_io_client.dart';
 | 
			
		||||
@@ -92,6 +93,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        socket.on('on_upload_success', _handleOnUploadSuccess);
 | 
			
		||||
        socket.on('on_config_update', _handleOnConfigUpdate);
 | 
			
		||||
      } catch (e) {
 | 
			
		||||
        debugPrint("[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
 | 
			
		||||
      }
 | 
			
		||||
@@ -126,6 +128,11 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 | 
			
		||||
      ref.watch(assetProvider.notifier).onNewAssetUploaded(newAsset);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  _handleOnConfigUpdate(dynamic data) {
 | 
			
		||||
    ref.read(serverInfoProvider.notifier).getServerFeatures();
 | 
			
		||||
    ref.read(serverInfoProvider.notifier).getServerConfig();
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
final websocketProvider =
 | 
			
		||||
 
 | 
			
		||||
@@ -64,7 +64,9 @@ class AssetService {
 | 
			
		||||
  Future<List<Asset>?> _getRemoteAssets(User user) async {
 | 
			
		||||
    try {
 | 
			
		||||
      final List<AssetResponseDto>? assets =
 | 
			
		||||
          await _apiService.assetApi.getAllAssets(userId: user.id);
 | 
			
		||||
          await _apiService.assetApi.getAllAssets(
 | 
			
		||||
        userId: user.id,
 | 
			
		||||
      );
 | 
			
		||||
      if (assets == null) {
 | 
			
		||||
        return null;
 | 
			
		||||
      } else if (assets.isNotEmpty && assets.first.ownerId != user.id) {
 | 
			
		||||
@@ -84,9 +86,10 @@ class AssetService {
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<List<DeleteAssetResponseDto>?> deleteAssets(
 | 
			
		||||
    Iterable<Asset> deleteAssets,
 | 
			
		||||
  ) async {
 | 
			
		||||
  Future<bool> deleteAssets(
 | 
			
		||||
    Iterable<Asset> deleteAssets, {
 | 
			
		||||
    bool? force = false,
 | 
			
		||||
  }) async {
 | 
			
		||||
    try {
 | 
			
		||||
      final List<String> payload = [];
 | 
			
		||||
 | 
			
		||||
@@ -94,12 +97,17 @@ class AssetService {
 | 
			
		||||
        payload.add(asset.remoteId!);
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      return await _apiService.assetApi
 | 
			
		||||
          .deleteAsset(DeleteAssetDto(ids: payload));
 | 
			
		||||
      await _apiService.assetApi.deleteAssets(
 | 
			
		||||
        AssetBulkDeleteDto(
 | 
			
		||||
          ids: payload,
 | 
			
		||||
          force: force,
 | 
			
		||||
        ),
 | 
			
		||||
      );
 | 
			
		||||
      return true;
 | 
			
		||||
    } catch (error, stack) {
 | 
			
		||||
      log.severe("Error deleteAssets  ${error.toString()}", error, stack);
 | 
			
		||||
      return null;
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Loads the exif information from the database. If there is none, loads
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										15
									
								
								mobile/openapi/.openapi-generator/FILES
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										15
									
								
								mobile/openapi/.openapi-generator/FILES
									
									
									
										generated
									
									
									
								
							@@ -15,6 +15,7 @@ doc/AlbumCountResponseDto.md
 | 
			
		||||
doc/AlbumResponseDto.md
 | 
			
		||||
doc/AllJobStatusResponseDto.md
 | 
			
		||||
doc/AssetApi.md
 | 
			
		||||
doc/AssetBulkDeleteDto.md
 | 
			
		||||
doc/AssetBulkUpdateDto.md
 | 
			
		||||
doc/AssetBulkUploadCheckDto.md
 | 
			
		||||
doc/AssetBulkUploadCheckItem.md
 | 
			
		||||
@@ -53,9 +54,6 @@ doc/CreateTagDto.md
 | 
			
		||||
doc/CreateUserDto.md
 | 
			
		||||
doc/CuratedLocationsResponseDto.md
 | 
			
		||||
doc/CuratedObjectsResponseDto.md
 | 
			
		||||
doc/DeleteAssetDto.md
 | 
			
		||||
doc/DeleteAssetResponseDto.md
 | 
			
		||||
doc/DeleteAssetStatus.md
 | 
			
		||||
doc/DownloadArchiveInfo.md
 | 
			
		||||
doc/DownloadInfoDto.md
 | 
			
		||||
doc/DownloadResponseDto.md
 | 
			
		||||
@@ -131,6 +129,7 @@ doc/SystemConfigReverseGeocodingDto.md
 | 
			
		||||
doc/SystemConfigStorageTemplateDto.md
 | 
			
		||||
doc/SystemConfigTemplateStorageOptionDto.md
 | 
			
		||||
doc/SystemConfigThumbnailDto.md
 | 
			
		||||
doc/SystemConfigTrashDto.md
 | 
			
		||||
doc/TagApi.md
 | 
			
		||||
doc/TagResponseDto.md
 | 
			
		||||
doc/TagTypeEnum.md
 | 
			
		||||
@@ -186,6 +185,7 @@ lib/model/api_key_create_dto.dart
 | 
			
		||||
lib/model/api_key_create_response_dto.dart
 | 
			
		||||
lib/model/api_key_response_dto.dart
 | 
			
		||||
lib/model/api_key_update_dto.dart
 | 
			
		||||
lib/model/asset_bulk_delete_dto.dart
 | 
			
		||||
lib/model/asset_bulk_update_dto.dart
 | 
			
		||||
lib/model/asset_bulk_upload_check_dto.dart
 | 
			
		||||
lib/model/asset_bulk_upload_check_item.dart
 | 
			
		||||
@@ -222,9 +222,6 @@ lib/model/create_tag_dto.dart
 | 
			
		||||
lib/model/create_user_dto.dart
 | 
			
		||||
lib/model/curated_locations_response_dto.dart
 | 
			
		||||
lib/model/curated_objects_response_dto.dart
 | 
			
		||||
lib/model/delete_asset_dto.dart
 | 
			
		||||
lib/model/delete_asset_response_dto.dart
 | 
			
		||||
lib/model/delete_asset_status.dart
 | 
			
		||||
lib/model/download_archive_info.dart
 | 
			
		||||
lib/model/download_info_dto.dart
 | 
			
		||||
lib/model/download_response_dto.dart
 | 
			
		||||
@@ -291,6 +288,7 @@ lib/model/system_config_reverse_geocoding_dto.dart
 | 
			
		||||
lib/model/system_config_storage_template_dto.dart
 | 
			
		||||
lib/model/system_config_template_storage_option_dto.dart
 | 
			
		||||
lib/model/system_config_thumbnail_dto.dart
 | 
			
		||||
lib/model/system_config_trash_dto.dart
 | 
			
		||||
lib/model/tag_response_dto.dart
 | 
			
		||||
lib/model/tag_type_enum.dart
 | 
			
		||||
lib/model/thumbnail_format.dart
 | 
			
		||||
@@ -322,6 +320,7 @@ test/api_key_create_response_dto_test.dart
 | 
			
		||||
test/api_key_response_dto_test.dart
 | 
			
		||||
test/api_key_update_dto_test.dart
 | 
			
		||||
test/asset_api_test.dart
 | 
			
		||||
test/asset_bulk_delete_dto_test.dart
 | 
			
		||||
test/asset_bulk_update_dto_test.dart
 | 
			
		||||
test/asset_bulk_upload_check_dto_test.dart
 | 
			
		||||
test/asset_bulk_upload_check_item_test.dart
 | 
			
		||||
@@ -360,9 +359,6 @@ test/create_tag_dto_test.dart
 | 
			
		||||
test/create_user_dto_test.dart
 | 
			
		||||
test/curated_locations_response_dto_test.dart
 | 
			
		||||
test/curated_objects_response_dto_test.dart
 | 
			
		||||
test/delete_asset_dto_test.dart
 | 
			
		||||
test/delete_asset_response_dto_test.dart
 | 
			
		||||
test/delete_asset_status_test.dart
 | 
			
		||||
test/download_archive_info_test.dart
 | 
			
		||||
test/download_info_dto_test.dart
 | 
			
		||||
test/download_response_dto_test.dart
 | 
			
		||||
@@ -438,6 +434,7 @@ test/system_config_reverse_geocoding_dto_test.dart
 | 
			
		||||
test/system_config_storage_template_dto_test.dart
 | 
			
		||||
test/system_config_template_storage_option_dto_test.dart
 | 
			
		||||
test/system_config_thumbnail_dto_test.dart
 | 
			
		||||
test/system_config_trash_dto_test.dart
 | 
			
		||||
test/tag_api_test.dart
 | 
			
		||||
test/tag_response_dto_test.dart
 | 
			
		||||
test/tag_type_enum_test.dart
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								mobile/openapi/README.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10
									
								
								mobile/openapi/README.md
									
									
									
										generated
									
									
									
								
							@@ -90,9 +90,10 @@ Class | Method | HTTP request | Description
 | 
			
		||||
*AssetApi* | [**bulkUploadCheck**](doc//AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | 
 | 
			
		||||
*AssetApi* | [**checkDuplicateAsset**](doc//AssetApi.md#checkduplicateasset) | **POST** /asset/check | 
 | 
			
		||||
*AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist | 
 | 
			
		||||
*AssetApi* | [**deleteAsset**](doc//AssetApi.md#deleteasset) | **DELETE** /asset | 
 | 
			
		||||
*AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | 
 | 
			
		||||
*AssetApi* | [**downloadArchive**](doc//AssetApi.md#downloadarchive) | **POST** /asset/download/archive | 
 | 
			
		||||
*AssetApi* | [**downloadFile**](doc//AssetApi.md#downloadfile) | **POST** /asset/download/{id} | 
 | 
			
		||||
*AssetApi* | [**emptyTrash**](doc//AssetApi.md#emptytrash) | **POST** /asset/trash/empty | 
 | 
			
		||||
*AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | 
 | 
			
		||||
*AssetApi* | [**getAssetById**](doc//AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | 
 | 
			
		||||
*AssetApi* | [**getAssetSearchTerms**](doc//AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
 | 
			
		||||
@@ -108,6 +109,8 @@ Class | Method | HTTP request | Description
 | 
			
		||||
*AssetApi* | [**getTimeBuckets**](doc//AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | 
 | 
			
		||||
*AssetApi* | [**getUserAssetsByDeviceId**](doc//AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | 
 | 
			
		||||
*AssetApi* | [**importFile**](doc//AssetApi.md#importfile) | **POST** /asset/import | 
 | 
			
		||||
*AssetApi* | [**restoreAssets**](doc//AssetApi.md#restoreassets) | **POST** /asset/restore | 
 | 
			
		||||
*AssetApi* | [**restoreTrash**](doc//AssetApi.md#restoretrash) | **POST** /asset/trash/restore | 
 | 
			
		||||
*AssetApi* | [**runAssetJobs**](doc//AssetApi.md#runassetjobs) | **POST** /asset/jobs | 
 | 
			
		||||
*AssetApi* | [**searchAsset**](doc//AssetApi.md#searchasset) | **POST** /asset/search | 
 | 
			
		||||
*AssetApi* | [**serveFile**](doc//AssetApi.md#servefile) | **GET** /asset/file/{id} | 
 | 
			
		||||
@@ -201,6 +204,7 @@ Class | Method | HTTP request | Description
 | 
			
		||||
 - [AlbumCountResponseDto](doc//AlbumCountResponseDto.md)
 | 
			
		||||
 - [AlbumResponseDto](doc//AlbumResponseDto.md)
 | 
			
		||||
 - [AllJobStatusResponseDto](doc//AllJobStatusResponseDto.md)
 | 
			
		||||
 - [AssetBulkDeleteDto](doc//AssetBulkDeleteDto.md)
 | 
			
		||||
 - [AssetBulkUpdateDto](doc//AssetBulkUpdateDto.md)
 | 
			
		||||
 - [AssetBulkUploadCheckDto](doc//AssetBulkUploadCheckDto.md)
 | 
			
		||||
 - [AssetBulkUploadCheckItem](doc//AssetBulkUploadCheckItem.md)
 | 
			
		||||
@@ -237,9 +241,6 @@ Class | Method | HTTP request | Description
 | 
			
		||||
 - [CreateUserDto](doc//CreateUserDto.md)
 | 
			
		||||
 - [CuratedLocationsResponseDto](doc//CuratedLocationsResponseDto.md)
 | 
			
		||||
 - [CuratedObjectsResponseDto](doc//CuratedObjectsResponseDto.md)
 | 
			
		||||
 - [DeleteAssetDto](doc//DeleteAssetDto.md)
 | 
			
		||||
 - [DeleteAssetResponseDto](doc//DeleteAssetResponseDto.md)
 | 
			
		||||
 - [DeleteAssetStatus](doc//DeleteAssetStatus.md)
 | 
			
		||||
 - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md)
 | 
			
		||||
 - [DownloadInfoDto](doc//DownloadInfoDto.md)
 | 
			
		||||
 - [DownloadResponseDto](doc//DownloadResponseDto.md)
 | 
			
		||||
@@ -306,6 +307,7 @@ Class | Method | HTTP request | Description
 | 
			
		||||
 - [SystemConfigStorageTemplateDto](doc//SystemConfigStorageTemplateDto.md)
 | 
			
		||||
 - [SystemConfigTemplateStorageOptionDto](doc//SystemConfigTemplateStorageOptionDto.md)
 | 
			
		||||
 - [SystemConfigThumbnailDto](doc//SystemConfigThumbnailDto.md)
 | 
			
		||||
 - [SystemConfigTrashDto](doc//SystemConfigTrashDto.md)
 | 
			
		||||
 - [TagResponseDto](doc//TagResponseDto.md)
 | 
			
		||||
 - [TagTypeEnum](doc//TagTypeEnum.md)
 | 
			
		||||
 - [ThumbnailFormat](doc//ThumbnailFormat.md)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										194
									
								
								mobile/openapi/doc/AssetApi.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										194
									
								
								mobile/openapi/doc/AssetApi.md
									
									
									
										generated
									
									
									
								
							@@ -12,9 +12,10 @@ Method | HTTP request | Description
 | 
			
		||||
[**bulkUploadCheck**](AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | 
 | 
			
		||||
[**checkDuplicateAsset**](AssetApi.md#checkduplicateasset) | **POST** /asset/check | 
 | 
			
		||||
[**checkExistingAssets**](AssetApi.md#checkexistingassets) | **POST** /asset/exist | 
 | 
			
		||||
[**deleteAsset**](AssetApi.md#deleteasset) | **DELETE** /asset | 
 | 
			
		||||
[**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset | 
 | 
			
		||||
[**downloadArchive**](AssetApi.md#downloadarchive) | **POST** /asset/download/archive | 
 | 
			
		||||
[**downloadFile**](AssetApi.md#downloadfile) | **POST** /asset/download/{id} | 
 | 
			
		||||
[**emptyTrash**](AssetApi.md#emptytrash) | **POST** /asset/trash/empty | 
 | 
			
		||||
[**getAllAssets**](AssetApi.md#getallassets) | **GET** /asset | 
 | 
			
		||||
[**getAssetById**](AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | 
 | 
			
		||||
[**getAssetSearchTerms**](AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
 | 
			
		||||
@@ -30,6 +31,8 @@ Method | HTTP request | Description
 | 
			
		||||
[**getTimeBuckets**](AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | 
 | 
			
		||||
[**getUserAssetsByDeviceId**](AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | 
 | 
			
		||||
[**importFile**](AssetApi.md#importfile) | **POST** /asset/import | 
 | 
			
		||||
[**restoreAssets**](AssetApi.md#restoreassets) | **POST** /asset/restore | 
 | 
			
		||||
[**restoreTrash**](AssetApi.md#restoretrash) | **POST** /asset/trash/restore | 
 | 
			
		||||
[**runAssetJobs**](AssetApi.md#runassetjobs) | **POST** /asset/jobs | 
 | 
			
		||||
[**searchAsset**](AssetApi.md#searchasset) | **POST** /asset/search | 
 | 
			
		||||
[**serveFile**](AssetApi.md#servefile) | **GET** /asset/file/{id} | 
 | 
			
		||||
@@ -211,8 +214,8 @@ Name | Type | Description  | Notes
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **deleteAsset**
 | 
			
		||||
> List<DeleteAssetResponseDto> deleteAsset(deleteAssetDto)
 | 
			
		||||
# **deleteAssets**
 | 
			
		||||
> deleteAssets(assetBulkDeleteDto)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -235,13 +238,12 @@ import 'package:openapi/api.dart';
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 | 
			
		||||
 | 
			
		||||
final api_instance = AssetApi();
 | 
			
		||||
final deleteAssetDto = DeleteAssetDto(); // DeleteAssetDto | 
 | 
			
		||||
final assetBulkDeleteDto = AssetBulkDeleteDto(); // AssetBulkDeleteDto | 
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    final result = api_instance.deleteAsset(deleteAssetDto);
 | 
			
		||||
    print(result);
 | 
			
		||||
    api_instance.deleteAssets(assetBulkDeleteDto);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->deleteAsset: $e\n');
 | 
			
		||||
    print('Exception when calling AssetApi->deleteAssets: $e\n');
 | 
			
		||||
}
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
@@ -249,11 +251,11 @@ try {
 | 
			
		||||
 | 
			
		||||
Name | Type | Description  | Notes
 | 
			
		||||
------------- | ------------- | ------------- | -------------
 | 
			
		||||
 **deleteAssetDto** | [**DeleteAssetDto**](DeleteAssetDto.md)|  | 
 | 
			
		||||
 **assetBulkDeleteDto** | [**AssetBulkDeleteDto**](AssetBulkDeleteDto.md)|  | 
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
 | 
			
		||||
[**List<DeleteAssetResponseDto>**](DeleteAssetResponseDto.md)
 | 
			
		||||
void (empty response body)
 | 
			
		||||
 | 
			
		||||
### Authorization
 | 
			
		||||
 | 
			
		||||
@@ -262,7 +264,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
### HTTP request headers
 | 
			
		||||
 | 
			
		||||
 - **Content-Type**: application/json
 | 
			
		||||
 - **Accept**: application/json
 | 
			
		||||
 - **Accept**: Not defined
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
@@ -380,6 +382,56 @@ Name | Type | Description  | Notes
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **emptyTrash**
 | 
			
		||||
> emptyTrash()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### Example
 | 
			
		||||
```dart
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
// TODO Configure API key authorization: cookie
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure API key authorization: api_key
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure HTTP Bearer authorization: bearer
 | 
			
		||||
// Case 1. Use String Token
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
 | 
			
		||||
// Case 2. Use Function which generate token.
 | 
			
		||||
// String yourTokenGeneratorFunction() { ... }
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 | 
			
		||||
 | 
			
		||||
final api_instance = AssetApi();
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    api_instance.emptyTrash();
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->emptyTrash: $e\n');
 | 
			
		||||
}
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
### Parameters
 | 
			
		||||
This endpoint does not need any parameter.
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
 | 
			
		||||
void (empty response body)
 | 
			
		||||
 | 
			
		||||
### Authorization
 | 
			
		||||
 | 
			
		||||
[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
 | 
			
		||||
 | 
			
		||||
### HTTP request headers
 | 
			
		||||
 | 
			
		||||
 - **Content-Type**: Not defined
 | 
			
		||||
 - **Accept**: Not defined
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **getAllAssets**
 | 
			
		||||
> List<AssetResponseDto> getAllAssets(userId, isFavorite, isArchived, skip, updatedAfter, ifNoneMatch)
 | 
			
		||||
 | 
			
		||||
@@ -558,7 +610,7 @@ This endpoint does not need any parameter.
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **getAssetStats**
 | 
			
		||||
> AssetStatsResponseDto getAssetStats(isArchived, isFavorite)
 | 
			
		||||
> AssetStatsResponseDto getAssetStats(isArchived, isFavorite, isTrashed)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -583,9 +635,10 @@ import 'package:openapi/api.dart';
 | 
			
		||||
final api_instance = AssetApi();
 | 
			
		||||
final isArchived = true; // bool | 
 | 
			
		||||
final isFavorite = true; // bool | 
 | 
			
		||||
final isTrashed = true; // bool | 
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    final result = api_instance.getAssetStats(isArchived, isFavorite);
 | 
			
		||||
    final result = api_instance.getAssetStats(isArchived, isFavorite, isTrashed);
 | 
			
		||||
    print(result);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->getAssetStats: $e\n');
 | 
			
		||||
@@ -598,6 +651,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
------------- | ------------- | ------------- | -------------
 | 
			
		||||
 **isArchived** | **bool**|  | [optional] 
 | 
			
		||||
 **isFavorite** | **bool**|  | [optional] 
 | 
			
		||||
 **isTrashed** | **bool**|  | [optional] 
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
 | 
			
		||||
@@ -674,7 +728,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **getByTimeBucket**
 | 
			
		||||
> List<AssetResponseDto> getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, key)
 | 
			
		||||
> List<AssetResponseDto> getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, key)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -704,10 +758,11 @@ final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String |
 | 
			
		||||
final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 | 
			
		||||
final isArchived = true; // bool | 
 | 
			
		||||
final isFavorite = true; // bool | 
 | 
			
		||||
final isTrashed = true; // bool | 
 | 
			
		||||
final key = key_example; // String | 
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    final result = api_instance.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, key);
 | 
			
		||||
    final result = api_instance.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, key);
 | 
			
		||||
    print(result);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->getByTimeBucket: $e\n');
 | 
			
		||||
@@ -725,6 +780,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
 **personId** | **String**|  | [optional] 
 | 
			
		||||
 **isArchived** | **bool**|  | [optional] 
 | 
			
		||||
 **isFavorite** | **bool**|  | [optional] 
 | 
			
		||||
 **isTrashed** | **bool**|  | [optional] 
 | 
			
		||||
 **key** | **String**|  | [optional] 
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
@@ -1075,7 +1131,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **getTimeBuckets**
 | 
			
		||||
> List<TimeBucketResponseDto> getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, key)
 | 
			
		||||
> List<TimeBucketResponseDto> getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, key)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -1104,10 +1160,11 @@ final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String |
 | 
			
		||||
final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 | 
			
		||||
final isArchived = true; // bool | 
 | 
			
		||||
final isFavorite = true; // bool | 
 | 
			
		||||
final isTrashed = true; // bool | 
 | 
			
		||||
final key = key_example; // String | 
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    final result = api_instance.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, key);
 | 
			
		||||
    final result = api_instance.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, key);
 | 
			
		||||
    print(result);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->getTimeBuckets: $e\n');
 | 
			
		||||
@@ -1124,6 +1181,7 @@ Name | Type | Description  | Notes
 | 
			
		||||
 **personId** | **String**|  | [optional] 
 | 
			
		||||
 **isArchived** | **bool**|  | [optional] 
 | 
			
		||||
 **isFavorite** | **bool**|  | [optional] 
 | 
			
		||||
 **isTrashed** | **bool**|  | [optional] 
 | 
			
		||||
 **key** | **String**|  | [optional] 
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
@@ -1253,6 +1311,110 @@ Name | Type | Description  | Notes
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **restoreAssets**
 | 
			
		||||
> restoreAssets(bulkIdsDto)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### Example
 | 
			
		||||
```dart
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
// TODO Configure API key authorization: cookie
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure API key authorization: api_key
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure HTTP Bearer authorization: bearer
 | 
			
		||||
// Case 1. Use String Token
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
 | 
			
		||||
// Case 2. Use Function which generate token.
 | 
			
		||||
// String yourTokenGeneratorFunction() { ... }
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 | 
			
		||||
 | 
			
		||||
final api_instance = AssetApi();
 | 
			
		||||
final bulkIdsDto = BulkIdsDto(); // BulkIdsDto | 
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    api_instance.restoreAssets(bulkIdsDto);
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->restoreAssets: $e\n');
 | 
			
		||||
}
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
### Parameters
 | 
			
		||||
 | 
			
		||||
Name | Type | Description  | Notes
 | 
			
		||||
------------- | ------------- | ------------- | -------------
 | 
			
		||||
 **bulkIdsDto** | [**BulkIdsDto**](BulkIdsDto.md)|  | 
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
 | 
			
		||||
void (empty response body)
 | 
			
		||||
 | 
			
		||||
### Authorization
 | 
			
		||||
 | 
			
		||||
[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
 | 
			
		||||
 | 
			
		||||
### HTTP request headers
 | 
			
		||||
 | 
			
		||||
 - **Content-Type**: application/json
 | 
			
		||||
 - **Accept**: Not defined
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **restoreTrash**
 | 
			
		||||
> restoreTrash()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### Example
 | 
			
		||||
```dart
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
// TODO Configure API key authorization: cookie
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure API key authorization: api_key
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
 | 
			
		||||
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 | 
			
		||||
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
 | 
			
		||||
// TODO Configure HTTP Bearer authorization: bearer
 | 
			
		||||
// Case 1. Use String Token
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
 | 
			
		||||
// Case 2. Use Function which generate token.
 | 
			
		||||
// String yourTokenGeneratorFunction() { ... }
 | 
			
		||||
//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 | 
			
		||||
 | 
			
		||||
final api_instance = AssetApi();
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
    api_instance.restoreTrash();
 | 
			
		||||
} catch (e) {
 | 
			
		||||
    print('Exception when calling AssetApi->restoreTrash: $e\n');
 | 
			
		||||
}
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
### Parameters
 | 
			
		||||
This endpoint does not need any parameter.
 | 
			
		||||
 | 
			
		||||
### Return type
 | 
			
		||||
 | 
			
		||||
void (empty response body)
 | 
			
		||||
 | 
			
		||||
### Authorization
 | 
			
		||||
 | 
			
		||||
[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
 | 
			
		||||
 | 
			
		||||
### HTTP request headers
 | 
			
		||||
 | 
			
		||||
 - **Content-Type**: Not defined
 | 
			
		||||
 - **Accept**: Not defined
 | 
			
		||||
 | 
			
		||||
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
# **runAssetJobs**
 | 
			
		||||
> runAssetJobs(assetJobsDto)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
# openapi.model.DeleteAssetDto
 | 
			
		||||
# openapi.model.AssetBulkDeleteDto
 | 
			
		||||
 | 
			
		||||
## Load the model package
 | 
			
		||||
```dart
 | 
			
		||||
@@ -8,6 +8,7 @@ import 'package:openapi/api.dart';
 | 
			
		||||
## Properties
 | 
			
		||||
Name | Type | Description | Notes
 | 
			
		||||
------------ | ------------- | ------------- | -------------
 | 
			
		||||
**force** | **bool** |  | [optional] 
 | 
			
		||||
**ids** | **List<String>** |  | [default to const []]
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
							
								
								
									
										1
									
								
								mobile/openapi/doc/AssetResponseDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								mobile/openapi/doc/AssetResponseDto.md
									
									
									
										generated
									
									
									
								
							@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 | 
			
		||||
**isFavorite** | **bool** |  | 
 | 
			
		||||
**isOffline** | **bool** |  | 
 | 
			
		||||
**isReadOnly** | **bool** |  | 
 | 
			
		||||
**isTrashed** | **bool** |  | 
 | 
			
		||||
**libraryId** | **String** |  | 
 | 
			
		||||
**livePhotoVideoId** | **String** |  | [optional] 
 | 
			
		||||
**localDateTime** | [**DateTime**](DateTime.md) |  | 
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										16
									
								
								mobile/openapi/doc/DeleteAssetResponseDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										16
									
								
								mobile/openapi/doc/DeleteAssetResponseDto.md
									
									
									
										generated
									
									
									
								
							@@ -1,16 +0,0 @@
 | 
			
		||||
# openapi.model.DeleteAssetResponseDto
 | 
			
		||||
 | 
			
		||||
## Load the model package
 | 
			
		||||
```dart
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Properties
 | 
			
		||||
Name | Type | Description | Notes
 | 
			
		||||
------------ | ------------- | ------------- | -------------
 | 
			
		||||
**id** | **String** |  | 
 | 
			
		||||
**status** | [**DeleteAssetStatus**](DeleteAssetStatus.md) |  | 
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1
									
								
								mobile/openapi/doc/ServerConfigDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								mobile/openapi/doc/ServerConfigDto.md
									
									
									
										generated
									
									
									
								
							@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 | 
			
		||||
**loginPageMessage** | **String** |  | 
 | 
			
		||||
**mapTileUrl** | **String** |  | 
 | 
			
		||||
**oauthButtonText** | **String** |  | 
 | 
			
		||||
**trashDays** | **int** |  | 
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								mobile/openapi/doc/ServerFeaturesDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								mobile/openapi/doc/ServerFeaturesDto.md
									
									
									
										generated
									
									
									
								
							@@ -19,6 +19,7 @@ Name | Type | Description | Notes
 | 
			
		||||
**search** | **bool** |  | 
 | 
			
		||||
**sidecar** | **bool** |  | 
 | 
			
		||||
**tagImage** | **bool** |  | 
 | 
			
		||||
**trash** | **bool** |  | 
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								mobile/openapi/doc/SystemConfigDto.md
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								mobile/openapi/doc/SystemConfigDto.md
									
									
									
										generated
									
									
									
								
							@@ -17,6 +17,7 @@ Name | Type | Description | Notes
 | 
			
		||||
**reverseGeocoding** | [**SystemConfigReverseGeocodingDto**](SystemConfigReverseGeocodingDto.md) |  | 
 | 
			
		||||
**storageTemplate** | [**SystemConfigStorageTemplateDto**](SystemConfigStorageTemplateDto.md) |  | 
 | 
			
		||||
**thumbnail** | [**SystemConfigThumbnailDto**](SystemConfigThumbnailDto.md) |  | 
 | 
			
		||||
**trash** | [**SystemConfigTrashDto**](SystemConfigTrashDto.md) |  | 
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
# openapi.model.DeleteAssetStatus
 | 
			
		||||
# openapi.model.SystemConfigTrashDto
 | 
			
		||||
 | 
			
		||||
## Load the model package
 | 
			
		||||
```dart
 | 
			
		||||
@@ -8,6 +8,8 @@ import 'package:openapi/api.dart';
 | 
			
		||||
## Properties
 | 
			
		||||
Name | Type | Description | Notes
 | 
			
		||||
------------ | ------------- | ------------- | -------------
 | 
			
		||||
**days** | **int** |  | 
 | 
			
		||||
**enabled** | **bool** |  | 
 | 
			
		||||
 | 
			
		||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										5
									
								
								mobile/openapi/lib/api.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								mobile/openapi/lib/api.dart
									
									
									
										generated
									
									
									
								
							@@ -54,6 +54,7 @@ part 'model/admin_signup_response_dto.dart';
 | 
			
		||||
part 'model/album_count_response_dto.dart';
 | 
			
		||||
part 'model/album_response_dto.dart';
 | 
			
		||||
part 'model/all_job_status_response_dto.dart';
 | 
			
		||||
part 'model/asset_bulk_delete_dto.dart';
 | 
			
		||||
part 'model/asset_bulk_update_dto.dart';
 | 
			
		||||
part 'model/asset_bulk_upload_check_dto.dart';
 | 
			
		||||
part 'model/asset_bulk_upload_check_item.dart';
 | 
			
		||||
@@ -90,9 +91,6 @@ part 'model/create_tag_dto.dart';
 | 
			
		||||
part 'model/create_user_dto.dart';
 | 
			
		||||
part 'model/curated_locations_response_dto.dart';
 | 
			
		||||
part 'model/curated_objects_response_dto.dart';
 | 
			
		||||
part 'model/delete_asset_dto.dart';
 | 
			
		||||
part 'model/delete_asset_response_dto.dart';
 | 
			
		||||
part 'model/delete_asset_status.dart';
 | 
			
		||||
part 'model/download_archive_info.dart';
 | 
			
		||||
part 'model/download_info_dto.dart';
 | 
			
		||||
part 'model/download_response_dto.dart';
 | 
			
		||||
@@ -159,6 +157,7 @@ part 'model/system_config_reverse_geocoding_dto.dart';
 | 
			
		||||
part 'model/system_config_storage_template_dto.dart';
 | 
			
		||||
part 'model/system_config_template_storage_option_dto.dart';
 | 
			
		||||
part 'model/system_config_thumbnail_dto.dart';
 | 
			
		||||
part 'model/system_config_trash_dto.dart';
 | 
			
		||||
part 'model/tag_response_dto.dart';
 | 
			
		||||
part 'model/tag_type_enum.dart';
 | 
			
		||||
part 'model/thumbnail_format.dart';
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										167
									
								
								mobile/openapi/lib/api/asset_api.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										167
									
								
								mobile/openapi/lib/api/asset_api.dart
									
									
									
										generated
									
									
									
								
							@@ -183,13 +183,13 @@ class AssetApi {
 | 
			
		||||
  /// Performs an HTTP 'DELETE /asset' operation and returns the [Response].
 | 
			
		||||
  /// Parameters:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [DeleteAssetDto] deleteAssetDto (required):
 | 
			
		||||
  Future<Response> deleteAssetWithHttpInfo(DeleteAssetDto deleteAssetDto,) async {
 | 
			
		||||
  /// * [AssetBulkDeleteDto] assetBulkDeleteDto (required):
 | 
			
		||||
  Future<Response> deleteAssetsWithHttpInfo(AssetBulkDeleteDto assetBulkDeleteDto,) async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset';
 | 
			
		||||
 | 
			
		||||
    // ignore: prefer_final_locals
 | 
			
		||||
    Object? postBody = deleteAssetDto;
 | 
			
		||||
    Object? postBody = assetBulkDeleteDto;
 | 
			
		||||
 | 
			
		||||
    final queryParams = <QueryParam>[];
 | 
			
		||||
    final headerParams = <String, String>{};
 | 
			
		||||
@@ -211,23 +211,12 @@ class AssetApi {
 | 
			
		||||
 | 
			
		||||
  /// Parameters:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [DeleteAssetDto] deleteAssetDto (required):
 | 
			
		||||
  Future<List<DeleteAssetResponseDto>?> deleteAsset(DeleteAssetDto deleteAssetDto,) async {
 | 
			
		||||
    final response = await deleteAssetWithHttpInfo(deleteAssetDto,);
 | 
			
		||||
  /// * [AssetBulkDeleteDto] assetBulkDeleteDto (required):
 | 
			
		||||
  Future<void> deleteAssets(AssetBulkDeleteDto assetBulkDeleteDto,) async {
 | 
			
		||||
    final response = await deleteAssetsWithHttpInfo(assetBulkDeleteDto,);
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
    // When a remote server returns no body with a status of 204, we shall not decode it.
 | 
			
		||||
    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
 | 
			
		||||
    // FormatException when trying to decode an empty string.
 | 
			
		||||
    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
 | 
			
		||||
      final responseBody = await _decodeBodyBytes(response);
 | 
			
		||||
      return (await apiClient.deserializeAsync(responseBody, 'List<DeleteAssetResponseDto>') as List)
 | 
			
		||||
        .cast<DeleteAssetResponseDto>()
 | 
			
		||||
        .toList();
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Performs an HTTP 'POST /asset/download/archive' operation and returns the [Response].
 | 
			
		||||
@@ -341,6 +330,39 @@ class AssetApi {
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Performs an HTTP 'POST /asset/trash/empty' operation and returns the [Response].
 | 
			
		||||
  Future<Response> emptyTrashWithHttpInfo() async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/trash/empty';
 | 
			
		||||
 | 
			
		||||
    // ignore: prefer_final_locals
 | 
			
		||||
    Object? postBody;
 | 
			
		||||
 | 
			
		||||
    final queryParams = <QueryParam>[];
 | 
			
		||||
    final headerParams = <String, String>{};
 | 
			
		||||
    final formParams = <String, String>{};
 | 
			
		||||
 | 
			
		||||
    const contentTypes = <String>[];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    return apiClient.invokeAPI(
 | 
			
		||||
      path,
 | 
			
		||||
      'POST',
 | 
			
		||||
      queryParams,
 | 
			
		||||
      postBody,
 | 
			
		||||
      headerParams,
 | 
			
		||||
      formParams,
 | 
			
		||||
      contentTypes.isEmpty ? null : contentTypes.first,
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> emptyTrash() async {
 | 
			
		||||
    final response = await emptyTrashWithHttpInfo();
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Get all AssetEntity belong to the user
 | 
			
		||||
  ///
 | 
			
		||||
  /// Note: This method returns the HTTP [Response].
 | 
			
		||||
@@ -549,7 +571,9 @@ class AssetApi {
 | 
			
		||||
  /// * [bool] isArchived:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  Future<Response> getAssetStatsWithHttpInfo({ bool? isArchived, bool? isFavorite, }) async {
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  Future<Response> getAssetStatsWithHttpInfo({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/statistics';
 | 
			
		||||
 | 
			
		||||
@@ -566,6 +590,9 @@ class AssetApi {
 | 
			
		||||
    if (isFavorite != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
 | 
			
		||||
    }
 | 
			
		||||
    if (isTrashed != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const contentTypes = <String>[];
 | 
			
		||||
 | 
			
		||||
@@ -586,8 +613,10 @@ class AssetApi {
 | 
			
		||||
  /// * [bool] isArchived:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  Future<AssetStatsResponseDto?> getAssetStats({ bool? isArchived, bool? isFavorite, }) async {
 | 
			
		||||
    final response = await getAssetStatsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, );
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  Future<AssetStatsResponseDto?> getAssetStats({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
 | 
			
		||||
    final response = await getAssetStatsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, );
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
@@ -681,8 +710,10 @@ class AssetApi {
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [String] key:
 | 
			
		||||
  Future<Response> getByTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, String? key, }) async {
 | 
			
		||||
  Future<Response> getByTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, String? key, }) async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/time-bucket';
 | 
			
		||||
 | 
			
		||||
@@ -708,6 +739,9 @@ class AssetApi {
 | 
			
		||||
    }
 | 
			
		||||
    if (isFavorite != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
 | 
			
		||||
    }
 | 
			
		||||
    if (isTrashed != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
 | 
			
		||||
    }
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'timeBucket', timeBucket));
 | 
			
		||||
    if (key != null) {
 | 
			
		||||
@@ -744,9 +778,11 @@ class AssetApi {
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [String] key:
 | 
			
		||||
  Future<List<AssetResponseDto>?> getByTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, String? key, }) async {
 | 
			
		||||
    final response = await getByTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, key: key, );
 | 
			
		||||
  Future<List<AssetResponseDto>?> getByTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, String? key, }) async {
 | 
			
		||||
    final response = await getByTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, key: key, );
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
@@ -1107,8 +1143,10 @@ class AssetApi {
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [String] key:
 | 
			
		||||
  Future<Response> getTimeBucketsWithHttpInfo(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, String? key, }) async {
 | 
			
		||||
  Future<Response> getTimeBucketsWithHttpInfo(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, String? key, }) async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/time-buckets';
 | 
			
		||||
 | 
			
		||||
@@ -1135,6 +1173,9 @@ class AssetApi {
 | 
			
		||||
    if (isFavorite != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
 | 
			
		||||
    }
 | 
			
		||||
    if (isTrashed != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
 | 
			
		||||
    }
 | 
			
		||||
    if (key != null) {
 | 
			
		||||
      queryParams.addAll(_queryParams('', 'key', key));
 | 
			
		||||
    }
 | 
			
		||||
@@ -1167,9 +1208,11 @@ class AssetApi {
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isFavorite:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [bool] isTrashed:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [String] key:
 | 
			
		||||
  Future<List<TimeBucketResponseDto>?> getTimeBuckets(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, String? key, }) async {
 | 
			
		||||
    final response = await getTimeBucketsWithHttpInfo(size,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, key: key, );
 | 
			
		||||
  Future<List<TimeBucketResponseDto>?> getTimeBuckets(TimeBucketSize size, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, String? key, }) async {
 | 
			
		||||
    final response = await getTimeBucketsWithHttpInfo(size,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, key: key, );
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
@@ -1289,6 +1332,78 @@ class AssetApi {
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Performs an HTTP 'POST /asset/restore' operation and returns the [Response].
 | 
			
		||||
  /// Parameters:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [BulkIdsDto] bulkIdsDto (required):
 | 
			
		||||
  Future<Response> restoreAssetsWithHttpInfo(BulkIdsDto bulkIdsDto,) async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/restore';
 | 
			
		||||
 | 
			
		||||
    // ignore: prefer_final_locals
 | 
			
		||||
    Object? postBody = bulkIdsDto;
 | 
			
		||||
 | 
			
		||||
    final queryParams = <QueryParam>[];
 | 
			
		||||
    final headerParams = <String, String>{};
 | 
			
		||||
    final formParams = <String, String>{};
 | 
			
		||||
 | 
			
		||||
    const contentTypes = <String>['application/json'];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    return apiClient.invokeAPI(
 | 
			
		||||
      path,
 | 
			
		||||
      'POST',
 | 
			
		||||
      queryParams,
 | 
			
		||||
      postBody,
 | 
			
		||||
      headerParams,
 | 
			
		||||
      formParams,
 | 
			
		||||
      contentTypes.isEmpty ? null : contentTypes.first,
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Parameters:
 | 
			
		||||
  ///
 | 
			
		||||
  /// * [BulkIdsDto] bulkIdsDto (required):
 | 
			
		||||
  Future<void> restoreAssets(BulkIdsDto bulkIdsDto,) async {
 | 
			
		||||
    final response = await restoreAssetsWithHttpInfo(bulkIdsDto,);
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Performs an HTTP 'POST /asset/trash/restore' operation and returns the [Response].
 | 
			
		||||
  Future<Response> restoreTrashWithHttpInfo() async {
 | 
			
		||||
    // ignore: prefer_const_declarations
 | 
			
		||||
    final path = r'/asset/trash/restore';
 | 
			
		||||
 | 
			
		||||
    // ignore: prefer_final_locals
 | 
			
		||||
    Object? postBody;
 | 
			
		||||
 | 
			
		||||
    final queryParams = <QueryParam>[];
 | 
			
		||||
    final headerParams = <String, String>{};
 | 
			
		||||
    final formParams = <String, String>{};
 | 
			
		||||
 | 
			
		||||
    const contentTypes = <String>[];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    return apiClient.invokeAPI(
 | 
			
		||||
      path,
 | 
			
		||||
      'POST',
 | 
			
		||||
      queryParams,
 | 
			
		||||
      postBody,
 | 
			
		||||
      headerParams,
 | 
			
		||||
      formParams,
 | 
			
		||||
      contentTypes.isEmpty ? null : contentTypes.first,
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> restoreTrash() async {
 | 
			
		||||
    final response = await restoreTrashWithHttpInfo();
 | 
			
		||||
    if (response.statusCode >= HttpStatus.badRequest) {
 | 
			
		||||
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Performs an HTTP 'POST /asset/jobs' operation and returns the [Response].
 | 
			
		||||
  /// Parameters:
 | 
			
		||||
  ///
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								mobile/openapi/lib/api_client.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10
									
								
								mobile/openapi/lib/api_client.dart
									
									
									
										generated
									
									
									
								
							@@ -199,6 +199,8 @@ class ApiClient {
 | 
			
		||||
          return AlbumResponseDto.fromJson(value);
 | 
			
		||||
        case 'AllJobStatusResponseDto':
 | 
			
		||||
          return AllJobStatusResponseDto.fromJson(value);
 | 
			
		||||
        case 'AssetBulkDeleteDto':
 | 
			
		||||
          return AssetBulkDeleteDto.fromJson(value);
 | 
			
		||||
        case 'AssetBulkUpdateDto':
 | 
			
		||||
          return AssetBulkUpdateDto.fromJson(value);
 | 
			
		||||
        case 'AssetBulkUploadCheckDto':
 | 
			
		||||
@@ -271,12 +273,6 @@ class ApiClient {
 | 
			
		||||
          return CuratedLocationsResponseDto.fromJson(value);
 | 
			
		||||
        case 'CuratedObjectsResponseDto':
 | 
			
		||||
          return CuratedObjectsResponseDto.fromJson(value);
 | 
			
		||||
        case 'DeleteAssetDto':
 | 
			
		||||
          return DeleteAssetDto.fromJson(value);
 | 
			
		||||
        case 'DeleteAssetResponseDto':
 | 
			
		||||
          return DeleteAssetResponseDto.fromJson(value);
 | 
			
		||||
        case 'DeleteAssetStatus':
 | 
			
		||||
          return DeleteAssetStatusTypeTransformer().decode(value);
 | 
			
		||||
        case 'DownloadArchiveInfo':
 | 
			
		||||
          return DownloadArchiveInfo.fromJson(value);
 | 
			
		||||
        case 'DownloadInfoDto':
 | 
			
		||||
@@ -409,6 +405,8 @@ class ApiClient {
 | 
			
		||||
          return SystemConfigTemplateStorageOptionDto.fromJson(value);
 | 
			
		||||
        case 'SystemConfigThumbnailDto':
 | 
			
		||||
          return SystemConfigThumbnailDto.fromJson(value);
 | 
			
		||||
        case 'SystemConfigTrashDto':
 | 
			
		||||
          return SystemConfigTrashDto.fromJson(value);
 | 
			
		||||
        case 'TagResponseDto':
 | 
			
		||||
          return TagResponseDto.fromJson(value);
 | 
			
		||||
        case 'TagTypeEnum':
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								mobile/openapi/lib/api_helper.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								mobile/openapi/lib/api_helper.dart
									
									
									
										generated
									
									
									
								
							@@ -76,9 +76,6 @@ String parameterToString(dynamic value) {
 | 
			
		||||
  if (value is Colorspace) {
 | 
			
		||||
    return ColorspaceTypeTransformer().encode(value).toString();
 | 
			
		||||
  }
 | 
			
		||||
  if (value is DeleteAssetStatus) {
 | 
			
		||||
    return DeleteAssetStatusTypeTransformer().encode(value).toString();
 | 
			
		||||
  }
 | 
			
		||||
  if (value is EntityType) {
 | 
			
		||||
    return EntityTypeTypeTransformer().encode(value).toString();
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -10,40 +10,57 @@
 | 
			
		||||
 | 
			
		||||
part of openapi.api;
 | 
			
		||||
 | 
			
		||||
class DeleteAssetDto {
 | 
			
		||||
  /// Returns a new [DeleteAssetDto] instance.
 | 
			
		||||
  DeleteAssetDto({
 | 
			
		||||
class AssetBulkDeleteDto {
 | 
			
		||||
  /// Returns a new [AssetBulkDeleteDto] instance.
 | 
			
		||||
  AssetBulkDeleteDto({
 | 
			
		||||
    this.force,
 | 
			
		||||
    this.ids = const [],
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  ///
 | 
			
		||||
  /// Please note: This property should have been non-nullable! Since the specification file
 | 
			
		||||
  /// does not include a default value (using the "default:" property), however, the generated
 | 
			
		||||
  /// source code must fall back to having a nullable type.
 | 
			
		||||
  /// Consider adding a "default:" property in the specification file to hide this note.
 | 
			
		||||
  ///
 | 
			
		||||
  bool? force;
 | 
			
		||||
 | 
			
		||||
  List<String> ids;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is DeleteAssetDto &&
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is AssetBulkDeleteDto &&
 | 
			
		||||
     other.force == force &&
 | 
			
		||||
     other.ids == ids;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  int get hashCode =>
 | 
			
		||||
    // ignore: unnecessary_parenthesis
 | 
			
		||||
    (force == null ? 0 : force!.hashCode) +
 | 
			
		||||
    (ids.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'DeleteAssetDto[ids=$ids]';
 | 
			
		||||
  String toString() => 'AssetBulkDeleteDto[force=$force, ids=$ids]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
    if (this.force != null) {
 | 
			
		||||
      json[r'force'] = this.force;
 | 
			
		||||
    } else {
 | 
			
		||||
    //  json[r'force'] = null;
 | 
			
		||||
    }
 | 
			
		||||
      json[r'ids'] = this.ids;
 | 
			
		||||
    return json;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Returns a new [DeleteAssetDto] instance and imports its values from
 | 
			
		||||
  /// Returns a new [AssetBulkDeleteDto] instance and imports its values from
 | 
			
		||||
  /// [value] if it's a [Map], null otherwise.
 | 
			
		||||
  // ignore: prefer_constructors_over_static_methods
 | 
			
		||||
  static DeleteAssetDto? fromJson(dynamic value) {
 | 
			
		||||
  static AssetBulkDeleteDto? fromJson(dynamic value) {
 | 
			
		||||
    if (value is Map) {
 | 
			
		||||
      final json = value.cast<String, dynamic>();
 | 
			
		||||
 | 
			
		||||
      return DeleteAssetDto(
 | 
			
		||||
      return AssetBulkDeleteDto(
 | 
			
		||||
        force: mapValueOfType<bool>(json, r'force'),
 | 
			
		||||
        ids: json[r'ids'] is List
 | 
			
		||||
            ? (json[r'ids'] as List).cast<String>()
 | 
			
		||||
            : const [],
 | 
			
		||||
@@ -52,11 +69,11 @@ class DeleteAssetDto {
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static List<DeleteAssetDto> listFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final result = <DeleteAssetDto>[];
 | 
			
		||||
  static List<AssetBulkDeleteDto> listFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final result = <AssetBulkDeleteDto>[];
 | 
			
		||||
    if (json is List && json.isNotEmpty) {
 | 
			
		||||
      for (final row in json) {
 | 
			
		||||
        final value = DeleteAssetDto.fromJson(row);
 | 
			
		||||
        final value = AssetBulkDeleteDto.fromJson(row);
 | 
			
		||||
        if (value != null) {
 | 
			
		||||
          result.add(value);
 | 
			
		||||
        }
 | 
			
		||||
@@ -65,12 +82,12 @@ class DeleteAssetDto {
 | 
			
		||||
    return result.toList(growable: growable);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static Map<String, DeleteAssetDto> mapFromJson(dynamic json) {
 | 
			
		||||
    final map = <String, DeleteAssetDto>{};
 | 
			
		||||
  static Map<String, AssetBulkDeleteDto> mapFromJson(dynamic json) {
 | 
			
		||||
    final map = <String, AssetBulkDeleteDto>{};
 | 
			
		||||
    if (json is Map && json.isNotEmpty) {
 | 
			
		||||
      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
 | 
			
		||||
      for (final entry in json.entries) {
 | 
			
		||||
        final value = DeleteAssetDto.fromJson(entry.value);
 | 
			
		||||
        final value = AssetBulkDeleteDto.fromJson(entry.value);
 | 
			
		||||
        if (value != null) {
 | 
			
		||||
          map[entry.key] = value;
 | 
			
		||||
        }
 | 
			
		||||
@@ -79,14 +96,14 @@ class DeleteAssetDto {
 | 
			
		||||
    return map;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // maps a json object with a list of DeleteAssetDto-objects as value to a dart map
 | 
			
		||||
  static Map<String, List<DeleteAssetDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final map = <String, List<DeleteAssetDto>>{};
 | 
			
		||||
  // maps a json object with a list of AssetBulkDeleteDto-objects as value to a dart map
 | 
			
		||||
  static Map<String, List<AssetBulkDeleteDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final map = <String, List<AssetBulkDeleteDto>>{};
 | 
			
		||||
    if (json is Map && json.isNotEmpty) {
 | 
			
		||||
      // ignore: parameter_assignments
 | 
			
		||||
      json = json.cast<String, dynamic>();
 | 
			
		||||
      for (final entry in json.entries) {
 | 
			
		||||
        map[entry.key] = DeleteAssetDto.listFromJson(entry.value, growable: growable,);
 | 
			
		||||
        map[entry.key] = AssetBulkDeleteDto.listFromJson(entry.value, growable: growable,);
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return map;
 | 
			
		||||
							
								
								
									
										10
									
								
								mobile/openapi/lib/model/asset_response_dto.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10
									
								
								mobile/openapi/lib/model/asset_response_dto.dart
									
									
									
										generated
									
									
									
								
							@@ -26,6 +26,7 @@ class AssetResponseDto {
 | 
			
		||||
    required this.isFavorite,
 | 
			
		||||
    required this.isOffline,
 | 
			
		||||
    required this.isReadOnly,
 | 
			
		||||
    required this.isTrashed,
 | 
			
		||||
    required this.libraryId,
 | 
			
		||||
    this.livePhotoVideoId,
 | 
			
		||||
    required this.localDateTime,
 | 
			
		||||
@@ -75,6 +76,8 @@ class AssetResponseDto {
 | 
			
		||||
 | 
			
		||||
  bool isReadOnly;
 | 
			
		||||
 | 
			
		||||
  bool isTrashed;
 | 
			
		||||
 | 
			
		||||
  String libraryId;
 | 
			
		||||
 | 
			
		||||
  String? livePhotoVideoId;
 | 
			
		||||
@@ -131,6 +134,7 @@ class AssetResponseDto {
 | 
			
		||||
     other.isFavorite == isFavorite &&
 | 
			
		||||
     other.isOffline == isOffline &&
 | 
			
		||||
     other.isReadOnly == isReadOnly &&
 | 
			
		||||
     other.isTrashed == isTrashed &&
 | 
			
		||||
     other.libraryId == libraryId &&
 | 
			
		||||
     other.livePhotoVideoId == livePhotoVideoId &&
 | 
			
		||||
     other.localDateTime == localDateTime &&
 | 
			
		||||
@@ -162,6 +166,7 @@ class AssetResponseDto {
 | 
			
		||||
    (isFavorite.hashCode) +
 | 
			
		||||
    (isOffline.hashCode) +
 | 
			
		||||
    (isReadOnly.hashCode) +
 | 
			
		||||
    (isTrashed.hashCode) +
 | 
			
		||||
    (libraryId.hashCode) +
 | 
			
		||||
    (livePhotoVideoId == null ? 0 : livePhotoVideoId!.hashCode) +
 | 
			
		||||
    (localDateTime.hashCode) +
 | 
			
		||||
@@ -178,7 +183,7 @@ class AssetResponseDto {
 | 
			
		||||
    (updatedAt.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'AssetResponseDto[checksum=$checksum, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isArchived=$isArchived, isExternal=$isExternal, isFavorite=$isFavorite, isOffline=$isOffline, isReadOnly=$isReadOnly, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, smartInfo=$smartInfo, tags=$tags, thumbhash=$thumbhash, type=$type, updatedAt=$updatedAt]';
 | 
			
		||||
  String toString() => 'AssetResponseDto[checksum=$checksum, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isArchived=$isArchived, isExternal=$isExternal, isFavorite=$isFavorite, isOffline=$isOffline, isReadOnly=$isReadOnly, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, smartInfo=$smartInfo, tags=$tags, thumbhash=$thumbhash, type=$type, updatedAt=$updatedAt]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
@@ -199,6 +204,7 @@ class AssetResponseDto {
 | 
			
		||||
      json[r'isFavorite'] = this.isFavorite;
 | 
			
		||||
      json[r'isOffline'] = this.isOffline;
 | 
			
		||||
      json[r'isReadOnly'] = this.isReadOnly;
 | 
			
		||||
      json[r'isTrashed'] = this.isTrashed;
 | 
			
		||||
      json[r'libraryId'] = this.libraryId;
 | 
			
		||||
    if (this.livePhotoVideoId != null) {
 | 
			
		||||
      json[r'livePhotoVideoId'] = this.livePhotoVideoId;
 | 
			
		||||
@@ -253,6 +259,7 @@ class AssetResponseDto {
 | 
			
		||||
        isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
 | 
			
		||||
        isOffline: mapValueOfType<bool>(json, r'isOffline')!,
 | 
			
		||||
        isReadOnly: mapValueOfType<bool>(json, r'isReadOnly')!,
 | 
			
		||||
        isTrashed: mapValueOfType<bool>(json, r'isTrashed')!,
 | 
			
		||||
        libraryId: mapValueOfType<String>(json, r'libraryId')!,
 | 
			
		||||
        livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
 | 
			
		||||
        localDateTime: mapDateTime(json, r'localDateTime', '')!,
 | 
			
		||||
@@ -326,6 +333,7 @@ class AssetResponseDto {
 | 
			
		||||
    'isFavorite',
 | 
			
		||||
    'isOffline',
 | 
			
		||||
    'isReadOnly',
 | 
			
		||||
    'isTrashed',
 | 
			
		||||
    'libraryId',
 | 
			
		||||
    'localDateTime',
 | 
			
		||||
    'originalFileName',
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										85
									
								
								mobile/openapi/lib/model/delete_asset_status.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										85
									
								
								mobile/openapi/lib/model/delete_asset_status.dart
									
									
									
										generated
									
									
									
								
							@@ -1,85 +0,0 @@
 | 
			
		||||
//
 | 
			
		||||
// AUTO-GENERATED FILE, DO NOT MODIFY!
 | 
			
		||||
//
 | 
			
		||||
// @dart=2.12
 | 
			
		||||
 | 
			
		||||
// ignore_for_file: unused_element, unused_import
 | 
			
		||||
// ignore_for_file: always_put_required_named_parameters_first
 | 
			
		||||
// ignore_for_file: constant_identifier_names
 | 
			
		||||
// ignore_for_file: lines_longer_than_80_chars
 | 
			
		||||
 | 
			
		||||
part of openapi.api;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DeleteAssetStatus {
 | 
			
		||||
  /// Instantiate a new enum with the provided [value].
 | 
			
		||||
  const DeleteAssetStatus._(this.value);
 | 
			
		||||
 | 
			
		||||
  /// The underlying value of this enum member.
 | 
			
		||||
  final String value;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => value;
 | 
			
		||||
 | 
			
		||||
  String toJson() => value;
 | 
			
		||||
 | 
			
		||||
  static const SUCCESS = DeleteAssetStatus._(r'SUCCESS');
 | 
			
		||||
  static const FAILED = DeleteAssetStatus._(r'FAILED');
 | 
			
		||||
 | 
			
		||||
  /// List of all possible values in this [enum][DeleteAssetStatus].
 | 
			
		||||
  static const values = <DeleteAssetStatus>[
 | 
			
		||||
    SUCCESS,
 | 
			
		||||
    FAILED,
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  static DeleteAssetStatus? fromJson(dynamic value) => DeleteAssetStatusTypeTransformer().decode(value);
 | 
			
		||||
 | 
			
		||||
  static List<DeleteAssetStatus>? listFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final result = <DeleteAssetStatus>[];
 | 
			
		||||
    if (json is List && json.isNotEmpty) {
 | 
			
		||||
      for (final row in json) {
 | 
			
		||||
        final value = DeleteAssetStatus.fromJson(row);
 | 
			
		||||
        if (value != null) {
 | 
			
		||||
          result.add(value);
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return result.toList(growable: growable);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// Transformation class that can [encode] an instance of [DeleteAssetStatus] to String,
 | 
			
		||||
/// and [decode] dynamic data back to [DeleteAssetStatus].
 | 
			
		||||
class DeleteAssetStatusTypeTransformer {
 | 
			
		||||
  factory DeleteAssetStatusTypeTransformer() => _instance ??= const DeleteAssetStatusTypeTransformer._();
 | 
			
		||||
 | 
			
		||||
  const DeleteAssetStatusTypeTransformer._();
 | 
			
		||||
 | 
			
		||||
  String encode(DeleteAssetStatus data) => data.value;
 | 
			
		||||
 | 
			
		||||
  /// Decodes a [dynamic value][data] to a DeleteAssetStatus.
 | 
			
		||||
  ///
 | 
			
		||||
  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
 | 
			
		||||
  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
 | 
			
		||||
  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
 | 
			
		||||
  ///
 | 
			
		||||
  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
 | 
			
		||||
  /// and users are still using an old app with the old code.
 | 
			
		||||
  DeleteAssetStatus? decode(dynamic data, {bool allowNull = true}) {
 | 
			
		||||
    if (data != null) {
 | 
			
		||||
      switch (data) {
 | 
			
		||||
        case r'SUCCESS': return DeleteAssetStatus.SUCCESS;
 | 
			
		||||
        case r'FAILED': return DeleteAssetStatus.FAILED;
 | 
			
		||||
        default:
 | 
			
		||||
          if (!allowNull) {
 | 
			
		||||
            throw ArgumentError('Unknown enum value to decode: $data');
 | 
			
		||||
          }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Singleton [DeleteAssetStatusTypeTransformer] instance.
 | 
			
		||||
  static DeleteAssetStatusTypeTransformer? _instance;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										14
									
								
								mobile/openapi/lib/model/server_config_dto.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										14
									
								
								mobile/openapi/lib/model/server_config_dto.dart
									
									
									
										generated
									
									
									
								
							@@ -16,6 +16,7 @@ class ServerConfigDto {
 | 
			
		||||
    required this.loginPageMessage,
 | 
			
		||||
    required this.mapTileUrl,
 | 
			
		||||
    required this.oauthButtonText,
 | 
			
		||||
    required this.trashDays,
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  String loginPageMessage;
 | 
			
		||||
@@ -24,27 +25,32 @@ class ServerConfigDto {
 | 
			
		||||
 | 
			
		||||
  String oauthButtonText;
 | 
			
		||||
 | 
			
		||||
  int trashDays;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is ServerConfigDto &&
 | 
			
		||||
     other.loginPageMessage == loginPageMessage &&
 | 
			
		||||
     other.mapTileUrl == mapTileUrl &&
 | 
			
		||||
     other.oauthButtonText == oauthButtonText;
 | 
			
		||||
     other.oauthButtonText == oauthButtonText &&
 | 
			
		||||
     other.trashDays == trashDays;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  int get hashCode =>
 | 
			
		||||
    // ignore: unnecessary_parenthesis
 | 
			
		||||
    (loginPageMessage.hashCode) +
 | 
			
		||||
    (mapTileUrl.hashCode) +
 | 
			
		||||
    (oauthButtonText.hashCode);
 | 
			
		||||
    (oauthButtonText.hashCode) +
 | 
			
		||||
    (trashDays.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'ServerConfigDto[loginPageMessage=$loginPageMessage, mapTileUrl=$mapTileUrl, oauthButtonText=$oauthButtonText]';
 | 
			
		||||
  String toString() => 'ServerConfigDto[loginPageMessage=$loginPageMessage, mapTileUrl=$mapTileUrl, oauthButtonText=$oauthButtonText, trashDays=$trashDays]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
      json[r'loginPageMessage'] = this.loginPageMessage;
 | 
			
		||||
      json[r'mapTileUrl'] = this.mapTileUrl;
 | 
			
		||||
      json[r'oauthButtonText'] = this.oauthButtonText;
 | 
			
		||||
      json[r'trashDays'] = this.trashDays;
 | 
			
		||||
    return json;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -59,6 +65,7 @@ class ServerConfigDto {
 | 
			
		||||
        loginPageMessage: mapValueOfType<String>(json, r'loginPageMessage')!,
 | 
			
		||||
        mapTileUrl: mapValueOfType<String>(json, r'mapTileUrl')!,
 | 
			
		||||
        oauthButtonText: mapValueOfType<String>(json, r'oauthButtonText')!,
 | 
			
		||||
        trashDays: mapValueOfType<int>(json, r'trashDays')!,
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
@@ -109,6 +116,7 @@ class ServerConfigDto {
 | 
			
		||||
    'loginPageMessage',
 | 
			
		||||
    'mapTileUrl',
 | 
			
		||||
    'oauthButtonText',
 | 
			
		||||
    'trashDays',
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								mobile/openapi/lib/model/server_features_dto.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										14
									
								
								mobile/openapi/lib/model/server_features_dto.dart
									
									
									
										generated
									
									
									
								
							@@ -24,6 +24,7 @@ class ServerFeaturesDto {
 | 
			
		||||
    required this.search,
 | 
			
		||||
    required this.sidecar,
 | 
			
		||||
    required this.tagImage,
 | 
			
		||||
    required this.trash,
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  bool clipEncode;
 | 
			
		||||
@@ -48,6 +49,8 @@ class ServerFeaturesDto {
 | 
			
		||||
 | 
			
		||||
  bool tagImage;
 | 
			
		||||
 | 
			
		||||
  bool trash;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is ServerFeaturesDto &&
 | 
			
		||||
     other.clipEncode == clipEncode &&
 | 
			
		||||
@@ -60,7 +63,8 @@ class ServerFeaturesDto {
 | 
			
		||||
     other.reverseGeocoding == reverseGeocoding &&
 | 
			
		||||
     other.search == search &&
 | 
			
		||||
     other.sidecar == sidecar &&
 | 
			
		||||
     other.tagImage == tagImage;
 | 
			
		||||
     other.tagImage == tagImage &&
 | 
			
		||||
     other.trash == trash;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  int get hashCode =>
 | 
			
		||||
@@ -75,10 +79,11 @@ class ServerFeaturesDto {
 | 
			
		||||
    (reverseGeocoding.hashCode) +
 | 
			
		||||
    (search.hashCode) +
 | 
			
		||||
    (sidecar.hashCode) +
 | 
			
		||||
    (tagImage.hashCode);
 | 
			
		||||
    (tagImage.hashCode) +
 | 
			
		||||
    (trash.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'ServerFeaturesDto[clipEncode=$clipEncode, configFile=$configFile, facialRecognition=$facialRecognition, map=$map, oauth=$oauth, oauthAutoLaunch=$oauthAutoLaunch, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, search=$search, sidecar=$sidecar, tagImage=$tagImage]';
 | 
			
		||||
  String toString() => 'ServerFeaturesDto[clipEncode=$clipEncode, configFile=$configFile, facialRecognition=$facialRecognition, map=$map, oauth=$oauth, oauthAutoLaunch=$oauthAutoLaunch, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, search=$search, sidecar=$sidecar, tagImage=$tagImage, trash=$trash]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
@@ -93,6 +98,7 @@ class ServerFeaturesDto {
 | 
			
		||||
      json[r'search'] = this.search;
 | 
			
		||||
      json[r'sidecar'] = this.sidecar;
 | 
			
		||||
      json[r'tagImage'] = this.tagImage;
 | 
			
		||||
      json[r'trash'] = this.trash;
 | 
			
		||||
    return json;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -115,6 +121,7 @@ class ServerFeaturesDto {
 | 
			
		||||
        search: mapValueOfType<bool>(json, r'search')!,
 | 
			
		||||
        sidecar: mapValueOfType<bool>(json, r'sidecar')!,
 | 
			
		||||
        tagImage: mapValueOfType<bool>(json, r'tagImage')!,
 | 
			
		||||
        trash: mapValueOfType<bool>(json, r'trash')!,
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
@@ -173,6 +180,7 @@ class ServerFeaturesDto {
 | 
			
		||||
    'search',
 | 
			
		||||
    'sidecar',
 | 
			
		||||
    'tagImage',
 | 
			
		||||
    'trash',
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								mobile/openapi/lib/model/system_config_dto.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										14
									
								
								mobile/openapi/lib/model/system_config_dto.dart
									
									
									
										generated
									
									
									
								
							@@ -22,6 +22,7 @@ class SystemConfigDto {
 | 
			
		||||
    required this.reverseGeocoding,
 | 
			
		||||
    required this.storageTemplate,
 | 
			
		||||
    required this.thumbnail,
 | 
			
		||||
    required this.trash,
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  SystemConfigFFmpegDto ffmpeg;
 | 
			
		||||
@@ -42,6 +43,8 @@ class SystemConfigDto {
 | 
			
		||||
 | 
			
		||||
  SystemConfigThumbnailDto thumbnail;
 | 
			
		||||
 | 
			
		||||
  SystemConfigTrashDto trash;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigDto &&
 | 
			
		||||
     other.ffmpeg == ffmpeg &&
 | 
			
		||||
@@ -52,7 +55,8 @@ class SystemConfigDto {
 | 
			
		||||
     other.passwordLogin == passwordLogin &&
 | 
			
		||||
     other.reverseGeocoding == reverseGeocoding &&
 | 
			
		||||
     other.storageTemplate == storageTemplate &&
 | 
			
		||||
     other.thumbnail == thumbnail;
 | 
			
		||||
     other.thumbnail == thumbnail &&
 | 
			
		||||
     other.trash == trash;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  int get hashCode =>
 | 
			
		||||
@@ -65,10 +69,11 @@ class SystemConfigDto {
 | 
			
		||||
    (passwordLogin.hashCode) +
 | 
			
		||||
    (reverseGeocoding.hashCode) +
 | 
			
		||||
    (storageTemplate.hashCode) +
 | 
			
		||||
    (thumbnail.hashCode);
 | 
			
		||||
    (thumbnail.hashCode) +
 | 
			
		||||
    (trash.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'SystemConfigDto[ffmpeg=$ffmpeg, job=$job, machineLearning=$machineLearning, map=$map, oauth=$oauth, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, storageTemplate=$storageTemplate, thumbnail=$thumbnail]';
 | 
			
		||||
  String toString() => 'SystemConfigDto[ffmpeg=$ffmpeg, job=$job, machineLearning=$machineLearning, map=$map, oauth=$oauth, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, storageTemplate=$storageTemplate, thumbnail=$thumbnail, trash=$trash]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
@@ -81,6 +86,7 @@ class SystemConfigDto {
 | 
			
		||||
      json[r'reverseGeocoding'] = this.reverseGeocoding;
 | 
			
		||||
      json[r'storageTemplate'] = this.storageTemplate;
 | 
			
		||||
      json[r'thumbnail'] = this.thumbnail;
 | 
			
		||||
      json[r'trash'] = this.trash;
 | 
			
		||||
    return json;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -101,6 +107,7 @@ class SystemConfigDto {
 | 
			
		||||
        reverseGeocoding: SystemConfigReverseGeocodingDto.fromJson(json[r'reverseGeocoding'])!,
 | 
			
		||||
        storageTemplate: SystemConfigStorageTemplateDto.fromJson(json[r'storageTemplate'])!,
 | 
			
		||||
        thumbnail: SystemConfigThumbnailDto.fromJson(json[r'thumbnail'])!,
 | 
			
		||||
        trash: SystemConfigTrashDto.fromJson(json[r'trash'])!,
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
@@ -157,6 +164,7 @@ class SystemConfigDto {
 | 
			
		||||
    'reverseGeocoding',
 | 
			
		||||
    'storageTemplate',
 | 
			
		||||
    'thumbnail',
 | 
			
		||||
    'trash',
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -10,58 +10,58 @@
 | 
			
		||||
 | 
			
		||||
part of openapi.api;
 | 
			
		||||
 | 
			
		||||
class DeleteAssetResponseDto {
 | 
			
		||||
  /// Returns a new [DeleteAssetResponseDto] instance.
 | 
			
		||||
  DeleteAssetResponseDto({
 | 
			
		||||
    required this.id,
 | 
			
		||||
    required this.status,
 | 
			
		||||
class SystemConfigTrashDto {
 | 
			
		||||
  /// Returns a new [SystemConfigTrashDto] instance.
 | 
			
		||||
  SystemConfigTrashDto({
 | 
			
		||||
    required this.days,
 | 
			
		||||
    required this.enabled,
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  String id;
 | 
			
		||||
  int days;
 | 
			
		||||
 | 
			
		||||
  DeleteAssetStatus status;
 | 
			
		||||
  bool enabled;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is DeleteAssetResponseDto &&
 | 
			
		||||
     other.id == id &&
 | 
			
		||||
     other.status == status;
 | 
			
		||||
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigTrashDto &&
 | 
			
		||||
     other.days == days &&
 | 
			
		||||
     other.enabled == enabled;
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  int get hashCode =>
 | 
			
		||||
    // ignore: unnecessary_parenthesis
 | 
			
		||||
    (id.hashCode) +
 | 
			
		||||
    (status.hashCode);
 | 
			
		||||
    (days.hashCode) +
 | 
			
		||||
    (enabled.hashCode);
 | 
			
		||||
 | 
			
		||||
  @override
 | 
			
		||||
  String toString() => 'DeleteAssetResponseDto[id=$id, status=$status]';
 | 
			
		||||
  String toString() => 'SystemConfigTrashDto[days=$days, enabled=$enabled]';
 | 
			
		||||
 | 
			
		||||
  Map<String, dynamic> toJson() {
 | 
			
		||||
    final json = <String, dynamic>{};
 | 
			
		||||
      json[r'id'] = this.id;
 | 
			
		||||
      json[r'status'] = this.status;
 | 
			
		||||
      json[r'days'] = this.days;
 | 
			
		||||
      json[r'enabled'] = this.enabled;
 | 
			
		||||
    return json;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /// Returns a new [DeleteAssetResponseDto] instance and imports its values from
 | 
			
		||||
  /// Returns a new [SystemConfigTrashDto] instance and imports its values from
 | 
			
		||||
  /// [value] if it's a [Map], null otherwise.
 | 
			
		||||
  // ignore: prefer_constructors_over_static_methods
 | 
			
		||||
  static DeleteAssetResponseDto? fromJson(dynamic value) {
 | 
			
		||||
  static SystemConfigTrashDto? fromJson(dynamic value) {
 | 
			
		||||
    if (value is Map) {
 | 
			
		||||
      final json = value.cast<String, dynamic>();
 | 
			
		||||
 | 
			
		||||
      return DeleteAssetResponseDto(
 | 
			
		||||
        id: mapValueOfType<String>(json, r'id')!,
 | 
			
		||||
        status: DeleteAssetStatus.fromJson(json[r'status'])!,
 | 
			
		||||
      return SystemConfigTrashDto(
 | 
			
		||||
        days: mapValueOfType<int>(json, r'days')!,
 | 
			
		||||
        enabled: mapValueOfType<bool>(json, r'enabled')!,
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
    return null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static List<DeleteAssetResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final result = <DeleteAssetResponseDto>[];
 | 
			
		||||
  static List<SystemConfigTrashDto> listFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final result = <SystemConfigTrashDto>[];
 | 
			
		||||
    if (json is List && json.isNotEmpty) {
 | 
			
		||||
      for (final row in json) {
 | 
			
		||||
        final value = DeleteAssetResponseDto.fromJson(row);
 | 
			
		||||
        final value = SystemConfigTrashDto.fromJson(row);
 | 
			
		||||
        if (value != null) {
 | 
			
		||||
          result.add(value);
 | 
			
		||||
        }
 | 
			
		||||
@@ -70,12 +70,12 @@ class DeleteAssetResponseDto {
 | 
			
		||||
    return result.toList(growable: growable);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static Map<String, DeleteAssetResponseDto> mapFromJson(dynamic json) {
 | 
			
		||||
    final map = <String, DeleteAssetResponseDto>{};
 | 
			
		||||
  static Map<String, SystemConfigTrashDto> mapFromJson(dynamic json) {
 | 
			
		||||
    final map = <String, SystemConfigTrashDto>{};
 | 
			
		||||
    if (json is Map && json.isNotEmpty) {
 | 
			
		||||
      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
 | 
			
		||||
      for (final entry in json.entries) {
 | 
			
		||||
        final value = DeleteAssetResponseDto.fromJson(entry.value);
 | 
			
		||||
        final value = SystemConfigTrashDto.fromJson(entry.value);
 | 
			
		||||
        if (value != null) {
 | 
			
		||||
          map[entry.key] = value;
 | 
			
		||||
        }
 | 
			
		||||
@@ -84,14 +84,14 @@ class DeleteAssetResponseDto {
 | 
			
		||||
    return map;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // maps a json object with a list of DeleteAssetResponseDto-objects as value to a dart map
 | 
			
		||||
  static Map<String, List<DeleteAssetResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final map = <String, List<DeleteAssetResponseDto>>{};
 | 
			
		||||
  // maps a json object with a list of SystemConfigTrashDto-objects as value to a dart map
 | 
			
		||||
  static Map<String, List<SystemConfigTrashDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
 | 
			
		||||
    final map = <String, List<SystemConfigTrashDto>>{};
 | 
			
		||||
    if (json is Map && json.isNotEmpty) {
 | 
			
		||||
      // ignore: parameter_assignments
 | 
			
		||||
      json = json.cast<String, dynamic>();
 | 
			
		||||
      for (final entry in json.entries) {
 | 
			
		||||
        map[entry.key] = DeleteAssetResponseDto.listFromJson(entry.value, growable: growable,);
 | 
			
		||||
        map[entry.key] = SystemConfigTrashDto.listFromJson(entry.value, growable: growable,);
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return map;
 | 
			
		||||
@@ -99,8 +99,8 @@ class DeleteAssetResponseDto {
 | 
			
		||||
 | 
			
		||||
  /// The list of required keys that must be present in a JSON.
 | 
			
		||||
  static const requiredKeys = <String>{
 | 
			
		||||
    'id',
 | 
			
		||||
    'status',
 | 
			
		||||
    'days',
 | 
			
		||||
    'enabled',
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										25
									
								
								mobile/openapi/test/asset_api_test.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										25
									
								
								mobile/openapi/test/asset_api_test.dart
									
									
									
										generated
									
									
									
								
							@@ -38,8 +38,8 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future<List<DeleteAssetResponseDto>> deleteAsset(DeleteAssetDto deleteAssetDto) async
 | 
			
		||||
    test('test deleteAsset', () async {
 | 
			
		||||
    //Future deleteAssets(AssetBulkDeleteDto assetBulkDeleteDto) async
 | 
			
		||||
    test('test deleteAssets', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
@@ -53,6 +53,11 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future emptyTrash() async
 | 
			
		||||
    test('test emptyTrash', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // Get all AssetEntity belong to the user
 | 
			
		||||
    //
 | 
			
		||||
    //Future<List<AssetResponseDto>> getAllAssets({ String userId, bool isFavorite, bool isArchived, num skip, DateTime updatedAfter, String ifNoneMatch }) async
 | 
			
		||||
@@ -72,7 +77,7 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future<AssetStatsResponseDto> getAssetStats({ bool isArchived, bool isFavorite }) async
 | 
			
		||||
    //Future<AssetStatsResponseDto> getAssetStats({ bool isArchived, bool isFavorite, bool isTrashed }) async
 | 
			
		||||
    test('test getAssetStats', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
@@ -82,7 +87,7 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future<List<AssetResponseDto>> getByTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, String key }) async
 | 
			
		||||
    //Future<List<AssetResponseDto>> getByTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, String key }) async
 | 
			
		||||
    test('test getByTimeBucket', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
@@ -117,7 +122,7 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future<List<TimeBucketResponseDto>> getTimeBuckets(TimeBucketSize size, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, String key }) async
 | 
			
		||||
    //Future<List<TimeBucketResponseDto>> getTimeBuckets(TimeBucketSize size, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, String key }) async
 | 
			
		||||
    test('test getTimeBuckets', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
@@ -134,6 +139,16 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future restoreAssets(BulkIdsDto bulkIdsDto) async
 | 
			
		||||
    test('test restoreAssets', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future restoreTrash() async
 | 
			
		||||
    test('test restoreTrash', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //Future runAssetJobs(AssetJobsDto assetJobsDto) async
 | 
			
		||||
    test('test runAssetJobs', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,16 @@
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
import 'package:test/test.dart';
 | 
			
		||||
 | 
			
		||||
// tests for DeleteAssetDto
 | 
			
		||||
// tests for AssetBulkDeleteDto
 | 
			
		||||
void main() {
 | 
			
		||||
  // final instance = DeleteAssetDto();
 | 
			
		||||
  // final instance = AssetBulkDeleteDto();
 | 
			
		||||
 | 
			
		||||
  group('test AssetBulkDeleteDto', () {
 | 
			
		||||
    // bool force
 | 
			
		||||
    test('to test the property `force`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
  group('test DeleteAssetDto', () {
 | 
			
		||||
    // List<String> ids (default value: const [])
 | 
			
		||||
    test('to test the property `ids`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
							
								
								
									
										5
									
								
								mobile/openapi/test/asset_response_dto_test.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								mobile/openapi/test/asset_response_dto_test.dart
									
									
									
										generated
									
									
									
								
							@@ -82,6 +82,11 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // bool isTrashed
 | 
			
		||||
    test('to test the property `isTrashed`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // String libraryId
 | 
			
		||||
    test('to test the property `libraryId`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								mobile/openapi/test/delete_asset_status_test.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										21
									
								
								mobile/openapi/test/delete_asset_status_test.dart
									
									
									
										generated
									
									
									
								
							@@ -1,21 +0,0 @@
 | 
			
		||||
//
 | 
			
		||||
// AUTO-GENERATED FILE, DO NOT MODIFY!
 | 
			
		||||
//
 | 
			
		||||
// @dart=2.12
 | 
			
		||||
 | 
			
		||||
// ignore_for_file: unused_element, unused_import
 | 
			
		||||
// ignore_for_file: always_put_required_named_parameters_first
 | 
			
		||||
// ignore_for_file: constant_identifier_names
 | 
			
		||||
// ignore_for_file: lines_longer_than_80_chars
 | 
			
		||||
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
import 'package:test/test.dart';
 | 
			
		||||
 | 
			
		||||
// tests for DeleteAssetStatus
 | 
			
		||||
void main() {
 | 
			
		||||
 | 
			
		||||
  group('test DeleteAssetStatus', () {
 | 
			
		||||
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								mobile/openapi/test/server_config_dto_test.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								mobile/openapi/test/server_config_dto_test.dart
									
									
									
										generated
									
									
									
								
							@@ -31,6 +31,11 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // int trashDays
 | 
			
		||||
    test('to test the property `trashDays`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -71,6 +71,11 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // bool trash
 | 
			
		||||
    test('to test the property `trash`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								mobile/openapi/test/system_config_dto_test.dart
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								mobile/openapi/test/system_config_dto_test.dart
									
									
									
										generated
									
									
									
								
							@@ -61,6 +61,11 @@ void main() {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // SystemConfigTrashDto trash
 | 
			
		||||
    test('to test the property `trash`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,18 +11,18 @@
 | 
			
		||||
import 'package:openapi/api.dart';
 | 
			
		||||
import 'package:test/test.dart';
 | 
			
		||||
 | 
			
		||||
// tests for DeleteAssetResponseDto
 | 
			
		||||
// tests for SystemConfigTrashDto
 | 
			
		||||
void main() {
 | 
			
		||||
  // final instance = DeleteAssetResponseDto();
 | 
			
		||||
  // final instance = SystemConfigTrashDto();
 | 
			
		||||
 | 
			
		||||
  group('test DeleteAssetResponseDto', () {
 | 
			
		||||
    // String id
 | 
			
		||||
    test('to test the property `id`', () async {
 | 
			
		||||
  group('test SystemConfigTrashDto', () {
 | 
			
		||||
    // int days
 | 
			
		||||
    test('to test the property `days`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // DeleteAssetStatus status
 | 
			
		||||
    test('to test the property `status`', () async {
 | 
			
		||||
    // bool enabled
 | 
			
		||||
    test('to test the property `enabled`', () async {
 | 
			
		||||
      // TODO
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
@@ -24,6 +24,7 @@ void main() {
 | 
			
		||||
        fileName: '',
 | 
			
		||||
        isFavorite: false,
 | 
			
		||||
        isArchived: false,
 | 
			
		||||
        isTrashed: false,
 | 
			
		||||
      ),
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -34,6 +34,7 @@ void main() {
 | 
			
		||||
      fileName: localId ?? remoteId ?? "",
 | 
			
		||||
      isFavorite: false,
 | 
			
		||||
      isArchived: false,
 | 
			
		||||
      isTrashed: false,
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user