From 2190c88b346a109aa5f61c1b7f7bf8e8ef3ce88c Mon Sep 17 00:00:00 2001
From: Victoria <kaysa.vps@gmail.com>
Date: Thu, 7 Nov 2024 13:58:06 +0100
Subject: [PATCH 01/32] Support sharing images from external apps

---
 android/app/src/main/AndroidManifest.xml      | 10 +++
 l10n/app_en.arb                               | 10 +++
 lib/app.dart                                  | 61 +++++++++++++++----
 lib/components/modals/move_or_copy_modal.dart |  8 +--
 lib/main.dart                                 |  2 +
 lib/services/receive_sharing.dart             | 30 +++++++++
 lib/utils/album_actions.dart                  |  2 +-
 lib/utils/image_actions.dart                  |  2 +-
 lib/views/settings/auto_upload_page.dart      |  2 +-
 lib/views/upload/upload_page.dart             | 40 +++++++++++-
 pubspec.lock                                  |  8 +++
 pubspec.yaml                                  |  1 +
 12 files changed, 155 insertions(+), 21 deletions(-)
 create mode 100644 lib/services/receive_sharing.dart

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ccbff49..90db409 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -38,6 +38,16 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
 
         <!-- Don't delete the meta-data below.
diff --git a/l10n/app_en.arb b/l10n/app_en.arb
index 9ee37e3..0013c53 100644
--- a/l10n/app_en.arb
+++ b/l10n/app_en.arb
@@ -313,6 +313,16 @@
     "moveCategoryError_title": "Move Fail",
     "moveCategoryError_message": "Failed to move your album",
 
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message" : {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
+
 
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
diff --git a/lib/app.dart b/lib/app.dart
index 8224c75..bf048c2 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -5,6 +5,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:piwigo_ng/services/app_providers.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
+import 'package:piwigo_ng/services/receive_sharing.dart';
 import 'package:piwigo_ng/utils/overscroll_behavior.dart';
 import 'package:piwigo_ng/utils/themes.dart';
 import 'package:piwigo_ng/views/album/album_page.dart';
@@ -92,10 +93,9 @@ class App extends StatelessWidget {
 }
 
 Route<dynamic> generateRoute(RouteSettings settings) {
+  String? routeName;
   Map<String, dynamic> arguments = {};
-  if (settings.arguments != null) {
-    arguments = settings.arguments as Map<String, dynamic>;
-  }
+  bool externalAppSharedFiles = SharedIntent.sharedFiles != null && SharedIntent.sharedFiles!.isNotEmpty;
 
   bool isAdmin = appPreferences.getBool(Preferences.isAdminKey) ?? false;
 
@@ -107,7 +107,14 @@ Route<dynamic> generateRoute(RouteSettings settings) {
     );
   }
 
-  switch (settings.name) {
+  if (externalAppSharedFiles) {
+    routeName = UploadPage.routeName;
+  } else {
+    routeName = settings.name;
+    arguments = _extractArguments(settings);
+  }
+
+  switch (routeName) {
     case LoginPage.routeName:
       return MaterialPageRoute(
         builder: (_) => const LoginPage(),
@@ -164,13 +171,7 @@ Route<dynamic> generateRoute(RouteSettings settings) {
         settings: settings,
       );
     case UploadPage.routeName:
-      return MaterialPageRoute(
-        builder: (_) => UploadPage(
-          imageList: arguments["images"] ?? <XFile>[],
-          albumId: arguments["category"],
-        ),
-        settings: settings,
-      );
+      return _createUploadPageRoute(settings, externalAppSharedFiles);
     case UploadStatusPage.routeName:
       return MaterialPageRoute(
         builder: (_) => UploadStatusPage(),
@@ -228,3 +229,41 @@ Route<dynamic> generateRoute(RouteSettings settings) {
       );
   }
 }
+
+Map<String, dynamic> _extractArguments(RouteSettings settings) {
+  if (settings.arguments != null) {
+    return settings.arguments as Map<String, dynamic>;
+  }
+  return {};
+}
+
+MaterialPageRoute<dynamic> _createUploadPageRoute(RouteSettings settings, bool externalAppSharedFiles) {
+  Map<String, dynamic> arguments = {};
+
+  if (externalAppSharedFiles) {
+    arguments['images'] = SharedIntent.sharedFiles;
+    SharedIntent.cleanupSharedFiles();
+
+    // Create new RouteSettings with updated arguments
+    return MaterialPageRoute(
+      builder: (_) => UploadPage(
+        imageList: arguments["images"] ?? <XFile>[],
+        albumId: arguments["category"],
+      ),
+      settings: RouteSettings( // Create new RouteSettings here
+        name: UploadPage.routeName,
+        arguments: arguments,
+      ),
+    );
+  } else {
+    // For other cases, use original settings
+    arguments = _extractArguments(settings);
+    return MaterialPageRoute(
+      builder: (_) => UploadPage(
+        imageList: arguments["images"] ?? <XFile>[],
+        albumId: arguments["category"],
+      ),
+      settings: settings,
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/components/modals/move_or_copy_modal.dart b/lib/components/modals/move_or_copy_modal.dart
index f52a667..d08b3a6 100644
--- a/lib/components/modals/move_or_copy_modal.dart
+++ b/lib/components/modals/move_or_copy_modal.dart
@@ -5,8 +5,8 @@ import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
 
-class MoveOrCopyModal extends StatefulWidget {
-  const MoveOrCopyModal({
+class SelectMoveOrCopyModal extends StatefulWidget {
+  const SelectMoveOrCopyModal({
     Key? key,
     this.album,
     this.isImage = false,
@@ -22,10 +22,10 @@ class MoveOrCopyModal extends StatefulWidget {
   final Future<dynamic> Function(AlbumModel)? onSelected;
 
   @override
-  _MoveOrCopyModalState createState() => _MoveOrCopyModalState();
+  _SelectMoveOrCopyModalState createState() => _SelectMoveOrCopyModalState();
 }
 
-class _MoveOrCopyModalState extends State<MoveOrCopyModal> {
+class _SelectMoveOrCopyModalState extends State<SelectMoveOrCopyModal> {
   late final Future<ApiResponse<List<AlbumModel>>> _albumFuture;
   late final List<int> _disabledAlbums;
 
diff --git a/lib/main.dart b/lib/main.dart
index 18fceca..796ef02 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,12 +8,14 @@ import 'package:piwigo_ng/network/api_client.dart';
 import 'package:piwigo_ng/services/auto_upload_manager.dart';
 import 'package:piwigo_ng/services/notification_service.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
+import 'package:piwigo_ng/services/receive_sharing.dart';
 import 'package:piwigo_ng/services/theme_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   _setUITheme();
+  await SharedIntent.receiveSharedData();
   HttpOverrides.global = SSLHttpOverrides();
   appPreferences = await SharedPreferences.getInstance();
   runApp(const App());
diff --git a/lib/services/receive_sharing.dart b/lib/services/receive_sharing.dart
new file mode 100644
index 0000000..7d3bf84
--- /dev/null
+++ b/lib/services/receive_sharing.dart
@@ -0,0 +1,30 @@
+import 'package:image_picker/image_picker.dart';
+import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+
+
+class SharedIntent {
+  static List<XFile>? sharedFiles;
+  static Future<List<XFile>?> receiveSharedData() async {
+    try {
+      // Get the instance of ReceiveSharingIntent
+      ReceiveSharingIntent receiveSharingIntent = await ReceiveSharingIntent.instance;
+
+      // Get the initial shared data
+      List<SharedMediaFile> receivedFiles = await receiveSharingIntent.getInitialMedia();
+
+      if (receivedFiles.isNotEmpty) {
+        // Transform SharedMediaFile to XFile
+        sharedFiles = receivedFiles.map((sharedFile) => XFile(sharedFile.path)).toList();
+        return sharedFiles;
+      } else {
+        return null;
+      }
+    } catch (e) {
+      print('Error receiving shared data: $e');
+      return null;
+    }
+  }
+  static void cleanupSharedFiles() {
+    sharedFiles = null;
+  }
+}
diff --git a/lib/utils/album_actions.dart b/lib/utils/album_actions.dart
index 12f9e0e..a4cc67d 100644
--- a/lib/utils/album_actions.dart
+++ b/lib/utils/album_actions.dart
@@ -43,7 +43,7 @@ Future<void> onEditAlbum(BuildContext context, AlbumModel album) async {
 Future<void> onMoveAlbum(BuildContext context, AlbumModel album) async {
   await showPiwigoModal(
     context: context,
-    builder: (_) => MoveOrCopyModal(
+    builder: (_) => SelectMoveOrCopyModal(
       title: appStrings.moveCategory,
       subtitle: appStrings.moveCategory_select(album.name),
       album: album,
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
index 4e16d09..0ea61ce 100644
--- a/lib/utils/image_actions.dart
+++ b/lib/utils/image_actions.dart
@@ -184,7 +184,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images,
   }
   return showPiwigoModal(
     context: context,
-    builder: (_) => MoveOrCopyModal(
+    builder: (_) => SelectMoveOrCopyModal(
       title: appStrings.moveImage_title,
       subtitle: appStrings.moveImage_selectAlbum(
         images.length,
diff --git a/lib/views/settings/auto_upload_page.dart b/lib/views/settings/auto_upload_page.dart
index ede9167..69ec84e 100644
--- a/lib/views/settings/auto_upload_page.dart
+++ b/lib/views/settings/auto_upload_page.dart
@@ -96,7 +96,7 @@ class _AutoUploadPageState extends State<AutoUploadPage> {
                 onPressed: () async {
                   await showPiwigoModal(
                     context: context,
-                    builder: (_) => MoveOrCopyModal(
+                    builder: (_) => SelectMoveOrCopyModal(
                       title: appStrings.settings_autoUploadDestination,
                       subtitle: appStrings.settings_autoUploadDestinationInfo,
                       isImage: true,
diff --git a/lib/views/upload/upload_page.dart b/lib/views/upload/upload_page.dart
index 76ef769..76bf9bb 100644
--- a/lib/views/upload/upload_page.dart
+++ b/lib/views/upload/upload_page.dart
@@ -8,7 +8,10 @@ import 'package:mime_type/mime_type.dart';
 import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart';
 import 'package:piwigo_ng/components/cards/image_details_card.dart';
 import 'package:piwigo_ng/components/cards/piwigo_chip.dart';
+import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/fields/app_field.dart';
+import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/modals/select_tags_modal.dart';
 import 'package:piwigo_ng/components/sections/form_section.dart';
 import 'package:piwigo_ng/models/tag_model.dart';
@@ -22,11 +25,11 @@ import 'package:rounded_loading_button/rounded_loading_button.dart';
 import 'package:video_player/video_player.dart';
 
 class UploadPage extends StatefulWidget {
-  const UploadPage({Key? key, required this.imageList, required this.albumId}) : super(key: key);
+  const UploadPage({Key? key, required this.imageList, this.albumId}) : super(key: key);
 
   static const String routeName = '/upload';
   final List<XFile> imageList;
-  final int albumId;
+  final int? albumId;
 
   @override
   State<UploadPage> createState() => _UploadGalleryViewPage();
@@ -45,12 +48,38 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
   List<XFile> _imageList = [];
   List<String> _imageExistList = [];
   int? _privacyLevel;
+  late int _albumDestination;
+
+  Future<void> _selectAlbum() async {
+    await showPiwigoModal(
+      context: context,
+      builder: (_) => SelectMoveOrCopyModal(
+        title: appStrings.selectCategory,
+        subtitle: appStrings.selectCategory_select,
+        isImage: true,
+        onSelected: (album) async {
+          if (!await showConfirmDialog(context,
+          title: appStrings.selectCategory,
+          message: appStrings.selectCategory_message(
+            widget.imageList.length,
+            album.name,
+          ),
+          )) return false;
+          setState(() {
+            _albumDestination = album.id;
+          });
+          return true;
+        },
+      ),
+    );
+  }
 
   @override
   void initState() {
     _imageList = List.from(widget.imageList);
     _authorController = TextEditingController(text: Preferences.getUploadAuthor);
     super.initState();
+
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       setState(() {
         PrivacyLevel.values.forEach((privacy) {
@@ -63,6 +92,11 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
           ));
         });
       });
+      if (widget.albumId != null) {
+        _albumDestination = widget.albumId!;
+      } else {
+        _selectAlbum();
+      }
       checkImageExist();
     });
   }
@@ -126,7 +160,7 @@ class _UploadGalleryViewPage extends State<UploadPage> with SingleTickerProvider
     _btnController.start();
     List<int> tagIds = _tags.map<int>((tag) => tag.id).toList();
     List<XFile> filesToUpload = _imageList.where((e) => !_imageExistList.contains(e.path)).toList();
-    var result = await uploadPhotos(filesToUpload, widget.albumId, info: {
+    var result = await uploadPhotos(filesToUpload, _albumDestination, info: {
       'name': _titleController.text,
       'comment': _descriptionController.text,
       'author': _authorController.text,
diff --git a/pubspec.lock b/pubspec.lock
index 281ab80..cab78a9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -925,6 +925,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  receive_sharing_intent:
+    dependency: "direct main"
+    description:
+      name: receive_sharing_intent
+      sha256: f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.0"
   rounded_loading_button:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 72276af..6354251 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -64,6 +64,7 @@ dependencies:
   flutter_cache_manager: ^3.3.0 # Handles network image cache
   heic_to_jpg: ^0.2.0 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes
+  receive_sharing_intent: ^1.4.0 # Receive sharing from other apps
 
   # Translations
   flutter_localizations:

From 5d3cc2b45d0703ad10a3b5f6751aaaeecadc95f2 Mon Sep 17 00:00:00 2001
From: Victoria <kaysa.vps@gmail.com>
Date: Thu, 7 Nov 2024 14:01:31 +0100
Subject: [PATCH 02/32] Rename move_or copy modal file to reflect the new
 Select action

---
 .../{move_or_copy_modal.dart => select_move_or_copy_modal.dart} | 0
 lib/utils/album_actions.dart                                    | 2 +-
 lib/utils/image_actions.dart                                    | 2 +-
 lib/views/settings/auto_upload_page.dart                        | 2 +-
 lib/views/upload/upload_page.dart                               | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/components/modals/{move_or_copy_modal.dart => select_move_or_copy_modal.dart} (100%)

diff --git a/lib/components/modals/move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
similarity index 100%
rename from lib/components/modals/move_or_copy_modal.dart
rename to lib/components/modals/select_move_or_copy_modal.dart
diff --git a/lib/utils/album_actions.dart b/lib/utils/album_actions.dart
index a4cc67d..4cba2eb 100644
--- a/lib/utils/album_actions.dart
+++ b/lib/utils/album_actions.dart
@@ -3,7 +3,7 @@ import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/modals/create_album_modal.dart';
 import 'package:piwigo_ng/components/modals/delete_album_mode_modal.dart';
 import 'package:piwigo_ng/components/modals/edit_album_modal.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/models/album_model.dart';
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
index 0ea61ce..13b9616 100644
--- a/lib/utils/image_actions.dart
+++ b/lib/utils/image_actions.dart
@@ -10,7 +10,7 @@ import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/modals/choose_camera_picker_modal.dart';
 import 'package:piwigo_ng/components/modals/choose_move_option_modal.dart';
 import 'package:piwigo_ng/components/modals/delete_images_modal.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/models/album_model.dart';
diff --git a/lib/views/settings/auto_upload_page.dart b/lib/views/settings/auto_upload_page.dart
index 69ec84e..bb51fc6 100644
--- a/lib/views/settings/auto_upload_page.dart
+++ b/lib/views/settings/auto_upload_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/sections/settings_section.dart';
 import 'package:piwigo_ng/models/album_model.dart';
diff --git a/lib/views/upload/upload_page.dart b/lib/views/upload/upload_page.dart
index 76bf9bb..4524081 100644
--- a/lib/views/upload/upload_page.dart
+++ b/lib/views/upload/upload_page.dart
@@ -10,7 +10,7 @@ import 'package:piwigo_ng/components/cards/image_details_card.dart';
 import 'package:piwigo_ng/components/cards/piwigo_chip.dart';
 import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/components/fields/app_field.dart';
-import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
+import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/modals/piwigo_modal.dart';
 import 'package:piwigo_ng/components/modals/select_tags_modal.dart';
 import 'package:piwigo_ng/components/sections/form_section.dart';

From 187701901d8c903c14ec12ea379cebb73a9ea3e9 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Thu, 10 Jul 2025 10:01:58 +0200
Subject: [PATCH 03/32] Bump flutter version to fix vulkan imp crash on API 31

---
 .fvmrc       | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.fvmrc b/.fvmrc
index 0251c4a..7d2a608 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.5"
+  "flutter": "3.32.6"
 }
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index dc28178..0e4f647 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ version: 2.4.0+240
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: 3.32.5
+  flutter: 3.32.6
 
 dependencies:
   flutter:

From 19b2b8c8f5c260932aa3ccba9041282a6bf830f2 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Thu, 10 Jul 2025 13:27:29 +0200
Subject: [PATCH 04/32] Replace `receive_sharing_intent` by
 `listen_sharing_intent`

---
 lib/services/receive_sharing.dart |  3 +--
 pubspec.lock                      | 22 +++++++++++-----------
 pubspec.yaml                      |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/services/receive_sharing.dart b/lib/services/receive_sharing.dart
index 7d3bf84..e570dd9 100644
--- a/lib/services/receive_sharing.dart
+++ b/lib/services/receive_sharing.dart
@@ -1,6 +1,5 @@
 import 'package:image_picker/image_picker.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-
+import 'package:listen_sharing_intent/listen_sharing_intent.dart';
 
 class SharedIntent {
   static List<XFile>? sharedFiles;
diff --git a/pubspec.lock b/pubspec.lock
index 82bf90c..e32d818 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "01949bf52ad33f0e0f74f881fbaac4f348c556531951d92c8d16f1262aa19ff8"
+      sha256: d10f9c2bf877706e39e9cc94d89ba28c7084f6e3529b4a2a96bb474fd0323647
       url: "https://pub.dev"
     source: hosted
-    version: "7.5.4"
+    version: "7.5.5"
   args:
     dependency: transitive
     description:
@@ -733,6 +733,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  listen_sharing_intent:
+    dependency: "direct main"
+    description:
+      name: listen_sharing_intent
+      sha256: df12e6c78666018985c39df494fc12412ece6510c38c79fe1230f2abef0965fa
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.2"
   logging:
     dependency: transitive
     description:
@@ -1013,14 +1021,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  receive_sharing_intent:
-    dependency: "direct main"
-    description:
-      name: receive_sharing_intent
-      sha256: f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.0"
   rounded_loading_button:
     dependency: "direct main"
     description:
@@ -1485,4 +1485,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.5"
+  flutter: ">=3.32.6"
diff --git a/pubspec.yaml b/pubspec.yaml
index 0e4f647..c82b14c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -64,7 +64,7 @@ dependencies:
   flutter_cache_manager: ^3.3.0 # Handles network image cache
   heif_converter: ^1.0.1 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes
-  receive_sharing_intent: ^1.4.0 # Receive sharing from other apps
+  listen_sharing_intent: ^1.9.2 # Receive sharing from other apps
 
   # Translations
   flutter_localizations:

From b5207401298d098baab2fd440a6371075231fa06 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 29 Jul 2025 08:09:03 +0200
Subject: [PATCH 05/32] Make keystore properties cast nullable

In groovy there is no need to cast to string but in kotlin you cast keystoreProperties["XXXX"] to String which fail on null, there is two solution force every user who want to contribute to have a keystore or allow nullable keystoreProperties.
I went with the latter to limit contributor friction.
---
 android/app/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 49d814a..c79921b 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -45,10 +45,10 @@ android {
 
     signingConfigs {
         create("release") {
-            keyAlias = keystoreProperties["keyAlias"] as String
-            keyPassword = keystoreProperties["keyPassword"] as String
+            keyAlias = keystoreProperties["keyAlias"] as? String
+            keyPassword = keystoreProperties["keyPassword"] as? String
             storeFile = keystoreProperties["storeFile"]?.let { file(it) }
-            storePassword = keystoreProperties["storePassword"] as String
+            storePassword = keystoreProperties["storePassword"] as? String
         }
     }
 

From b2a29109ce0c40a3c7f151154e739e19cdc6d9bd Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 29 Jul 2025 08:31:02 +0200
Subject: [PATCH 06/32] Bump flutter to 3.32.8

- https://github.com/flutter/flutter/blob/master/CHANGELOG.md#3328
---
 .fvmrc       | 2 +-
 pubspec.lock | 2 +-
 pubspec.yaml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.fvmrc b/.fvmrc
index 7d2a608..3ca65ff 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.6"
+  "flutter": "3.32.8"
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index e32d818..807de4d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1485,4 +1485,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.6"
+  flutter: ">=3.32.8"
diff --git a/pubspec.yaml b/pubspec.yaml
index c82b14c..1fc49d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,11 +3,11 @@ description: A Piwigo Android application
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 2.4.0+240
+version: 2.4.1+241
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: 3.32.6
+  flutter: 3.32.8
 
 dependencies:
   flutter:

From 5fab22e984836d630e9fb56ea5d49b5c2bc246f4 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 29 Jul 2025 08:36:32 +0200
Subject: [PATCH 07/32] Bump dependencies ( pub upgrade )

Changes :

  _fe_analyzer_shared 85.0.0 (86.0.0 available)
> analyzer 7.7.1 (was 7.5.5) (8.0.0 available)
  characters 1.4.0 (1.4.1 available)
> flutter_local_notifications 19.4.0 (was 19.3.0)
> flutter_local_notifications_windows 1.0.2 (was 1.0.0)
  flutter_secure_storage_linux 1.2.3 (2.0.1 available)
  flutter_secure_storage_macos 3.1.3 (4.0.0 available)
  flutter_secure_storage_platform_interface 1.1.2 (2.0.1 available)
  flutter_secure_storage_web 1.2.1 (2.0.0 available)
  flutter_secure_storage_windows 3.1.2 (4.0.0 available)
> gal 2.3.2 (was 2.3.1)
> image_picker_android 0.8.12+24 (was 0.8.12+23)
  js 0.6.7 (0.7.2 available)
  leak_tracker 10.0.9 (11.0.1 available)
  leak_tracker_flutter_testing 3.0.9 (3.0.10 available)
  leak_tracker_testing 3.0.1 (3.0.2 available)
  material_color_utilities 0.11.1 (0.13.0 available)
  meta 1.16.0 (1.17.0 available)
  petitparser 6.1.0 (7.0.0 available)
  rxdart 0.27.7 (0.28.0 available)
  test_api 0.7.4 (0.7.7 available)
> url_launcher 6.3.2 (was 6.3.1)
  vector_math 2.1.4 (2.2.0 available)
> video_player_android 2.8.9 (was 2.8.7)
> video_player_avfoundation 2.8.0 (was 2.7.2)
> video_player_web 2.4.0 (was 2.3.5)
  vm_service 15.0.0 (15.0.2 available)
> webview_flutter_android 4.8.2 (was 4.7.0)
> webview_flutter_wkwebview 3.22.1 (was 3.22.0)
  workmanager 0.6.0 (0.8.0 available)
  xml 6.5.0 (6.6.0 available)
---
 pubspec.lock | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 807de4d..e7f5385 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: d10f9c2bf877706e39e9cc94d89ba28c7084f6e3529b4a2a96bb474fd0323647
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
       url: "https://pub.dev"
     source: hosted
-    version: "7.5.5"
+    version: "7.7.1"
   args:
     dependency: transitive
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: edae0c34573233ab03f5ba1f07465e55c384743893042cb19e010b4ee8541c12
+      sha256: "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae"
       url: "https://pub.dev"
     source: hosted
-    version: "19.3.0"
+    version: "19.4.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -442,10 +442,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_windows
-      sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
+      sha256: ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -553,10 +553,10 @@ packages:
     dependency: "direct main"
     description:
       name: gal
-      sha256: "2771519c8b29f784d5e27f4efc2667667eef51c6c47cccaa0435a8fe8aa208e4"
+      sha256: "969598f986789127fd407a750413249e1352116d4c2be66e81837ffeeaafdfee"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   glob:
     dependency: transitive
     description:
@@ -617,10 +617,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb"
+      sha256: "6fae381e6af2bbe0365a5e4ce1db3959462fa0c4d234facf070746024bb80c8d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+23"
+    version: "0.8.12+24"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -1247,10 +1247,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1335,18 +1335,18 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "4a5135754a62dbc827a64a42ef1f8ed72c962e191c97e2d48744225c2b9ebb73"
+      sha256: "9d5af2d233ba69df803dcf2f31e66d9a4c6206f2d96178df06b09b0ec3056b39"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.7"
+    version: "2.8.9"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "0d47db6cbf72db61d86369219efd35c7f9d93515e1319da941ece81b1f21c49c"
+      sha256: "9fedd55023249f3a02738c195c906b4e530956191febf0838e37d0dac912f953"
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.2"
+    version: "2.8.0"
   video_player_platform_interface:
     dependency: transitive
     description:
@@ -1359,10 +1359,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba
+      sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   vm_service:
     dependency: transitive
     description:
@@ -1415,10 +1415,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678
+      sha256: "9573ad97890d199ac3ab32399aa33a5412163b37feb573eb5b0a76b35e9ffe41"
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.8.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1431,10 +1431,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3
+      sha256: "71523b9048cf510cfa1fd4e0a3fa5e476a66e0884d5df51d59d5023dba237107"
       url: "https://pub.dev"
     source: hosted
-    version: "3.22.0"
+    version: "3.22.1"
   win32:
     dependency: transitive
     description:

From 2036f0814bb837c27e16ad0266b566c40a79c963 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 29 Jul 2025 08:42:13 +0200
Subject: [PATCH 08/32] Upgrade workmanager from 0.6 to 0.8

Changelog : https://pub.dev/packages/workmanager/changelog#080

We don't use any feature subjected to a breaking change so the upgrade only required testing.
---
 pubspec.lock | 28 ++++++++++++++++++++++++++--
 pubspec.yaml |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index e7f5385..4f65c87 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1455,10 +1455,34 @@ packages:
     dependency: "direct main"
     description:
       name: workmanager
-      sha256: f3c3ce6d79cce53eee4a29dd2e8328c25db5ba5d9062fcc5e8f3c71e0af9b7e4
+      sha256: dffcbbfd99af17271ca52d8a3767ba8a1000b357f2774db8ed5d58879cb9783a
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.8.0"
+  workmanager_android:
+    dependency: transitive
+    description:
+      name: workmanager_android
+      sha256: a6447816c41aa0ad8f6fa29b62d09a528891cf0737296397e1caae2523ced7dc
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.0"
+  workmanager_apple:
+    dependency: transitive
+    description:
+      name: workmanager_apple
+      sha256: "9c99003682a8423bdc122ff4bae891e24574d1e676ea302d2ef0493266228461"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.0"
+  workmanager_platform_interface:
+    dependency: transitive
+    description:
+      name: workmanager_platform_interface
+      sha256: b1f0a868f1117511a23b0eb4220f08134152433b51a83eed479b1d68bbe23789
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 1fc49d9..83524b9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
   device_info_plus: ^11.5.0 # Get device info (version
   flutter_local_notifications: ^19.1.0 # Throws notifications on download or upload
   open_filex: ^4.4.0 # Open files with devices apps
-  workmanager: ^0.6.0 # Background processes (auto upload)
+  workmanager: ^0.8.0 # Background processes (auto upload)
   gal: ^2.3.1 # Download images
 
   # Utils

From c79a62e8f69ab3e0f6a46fe87c7a6fafe975d2a8 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Mon, 4 Aug 2025 12:42:20 +0200
Subject: [PATCH 09/32] Bump AGP and migrate deprecated JvmTarget to the new
 toolchain option.

AGP 8.10.1 -> 8.11.1
Koltin 2.0.21 -> 2.2.0
Grale 8.11 -> 8.13

Remove kotlin option in favor of java toolchain see :

- https://docs.gradle.org/current/userguide/toolchains.html
- https://docs.gradle.org/current/userguide/upgrading_version_7.html#kotlin_dsl_plugin_toolchains
- https://docs.gradle.org/current/userguide/kotlin_dsl.html#sec:kotlin-dsl_plugin
---
 android/app/build.gradle.kts                     | 9 +++++----
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 android/settings.gradle.kts                      | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index c79921b..334d35b 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -8,6 +8,11 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 // https://docs.flutter.dev/deployment/android#configure-signing-in-gradle
 val keystoreProperties = Properties()
 val keystorePropertiesFile = rootProject.file("key.properties")
@@ -30,10 +35,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     defaultConfig {
         applicationId = "com.piwigo.piwigo_ng"
         multiDexEnabled = true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 9162f10..8f3239a 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 3e29a10..d0fae2c 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.10.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
 }
 
 include(":app")
\ No newline at end of file

From 58d1e806e07e2b7853ce9b14367198c78269c802 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 5 Aug 2025 15:15:06 +0200
Subject: [PATCH 10/32] Fix modal (V0)

This commit is meant to speedup 2.4.1 release and the modal will be changed in a later version.
---
 lib/components/modals/select_move_or_copy_modal.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index b3c584c..9887081 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -209,7 +209,7 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      "${List.generate(widget.index, (index) => '.').join()}${widget.index > 0 ? ' ' : ''}${widget.album.name}",
+                      "${List.generate(widget.index, (index) => '   ').join()} > ${widget.index > 0 ? ' ' : ''}${widget.album.name}",
                       overflow: TextOverflow.ellipsis,
                       style: _disabled ? Theme.of(context).textTheme.bodySmall : Theme.of(context).textTheme.bodyMedium,
                     ),

From 59fabc88012affcc21e0a889350d8e57151eb192 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Wed, 6 Aug 2025 11:08:17 +0200
Subject: [PATCH 11/32] Remove text trick and display album index instead. Need
 to refactor child scaffold

---
 lib/components/modals/select_move_or_copy_modal.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 9887081..68ce123 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -209,7 +209,7 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      "${List.generate(widget.index, (index) => '   ').join()} > ${widget.index > 0 ? ' ' : ''}${widget.album.name}",
+                      "${widget.index} ${widget.album.name}",
                       overflow: TextOverflow.ellipsis,
                       style: _disabled ? Theme.of(context).textTheme.bodySmall : Theme.of(context).textTheme.bodyMedium,
                     ),

From de2613ad390284566d07dd67b19317c25a5ccc51 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 19 Aug 2025 10:44:19 +0200
Subject: [PATCH 12/32] Bump AGP to check if it create toolchain cleanly

---
 android/settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index d0fae2c..0b049c7 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.11.1" apply false
+    id("com.android.application") version "8.12.1" apply false
     id("org.jetbrains.kotlin.android") version "2.2.0" apply false
 }
 

From 7f3b30eabaa1d13fd5a7c7ef889bf1b3cc6e8687 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Thu, 21 Aug 2025 09:41:13 +0200
Subject: [PATCH 13/32] Add foojay resolver to fix missing gradle SDK

---
 android/settings.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 0b049c7..e65186f 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -17,6 +17,7 @@ pluginManagement {
 }
 
 plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.12.1" apply false
     id("org.jetbrains.kotlin.android") version "2.2.0" apply false

From 3705324cc7791ff580e8ac321ac4da519bbe142a Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:39 +0200
Subject: [PATCH 14/32] New translations app_en.arb (French)

---
 l10n/app_fr.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_fr.arb b/l10n/app_fr.arb
index d1d30ca..0186d3f 100644
--- a/l10n/app_fr.arb
+++ b/l10n/app_fr.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album déplacé",
     "moveCategoryError_title": "Echec",
     "moveCategoryError_message": "Impossible de déplacer votre album",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "Gérer les permissions",
     "categoryPrivacy_subtitle": "Gérer les permissions d'accès à \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

From c2c2e8d55e80579acaba5360058c43f60c7afd17 Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:41 +0200
Subject: [PATCH 15/32] New translations app_en.arb (Spanish)

---
 l10n/app_es.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_es.arb b/l10n/app_es.arb
index 5f64608..bc87656 100644
--- a/l10n/app_es.arb
+++ b/l10n/app_es.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album Moved",
     "moveCategoryError_title": "Move Fail",
     "moveCategoryError_message": "Failed to move your album",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

From 06c48b93c6d12cb4d998431babb6d1a2fcf160e2 Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:42 +0200
Subject: [PATCH 16/32] New translations app_en.arb (German)

---
 l10n/app_de.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_de.arb b/l10n/app_de.arb
index d375567..d1e7db0 100644
--- a/l10n/app_de.arb
+++ b/l10n/app_de.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album verschoben",
     "moveCategoryError_title": "Verschieben fehlgeschlagen",
     "moveCategoryError_message": "Fehler beim Verschieben Ihres Albums",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

From 4e0f7501027e16df58bc699b9c08ed3427b0ef85 Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:43 +0200
Subject: [PATCH 17/32] New translations app_en.arb (Lithuanian)

---
 l10n/app_lt.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_lt.arb b/l10n/app_lt.arb
index 465f2d5..d1fbca8 100644
--- a/l10n/app_lt.arb
+++ b/l10n/app_lt.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Albumas perkeltas",
     "moveCategoryError_title": "Perkelti nepavyko",
     "moveCategoryError_message": "Nepavyko perkelti albumo",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

From 9284e97f46e977045fb8775aa3cf72701873cf24 Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:44 +0200
Subject: [PATCH 18/32] New translations app_en.arb (Slovak)

---
 l10n/app_sk.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_sk.arb b/l10n/app_sk.arb
index 8b698a1..38240eb 100644
--- a/l10n/app_sk.arb
+++ b/l10n/app_sk.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "Album presunutý",
     "moveCategoryError_title": "Presunutie zlyhalo",
     "moveCategoryError_message": "Nepodarilo sa presunúť tvoj album",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "Manage Permissions",
     "categoryPrivacy_subtitle": "Manage access permissions of \"{album_name}\".",
     "@categoryPrivacy_subtitle": {

From c9dd2c6241068f9b6dfb762731d7fdc283431f14 Mon Sep 17 00:00:00 2001
From: Remi Martin <71256855+remi-martin@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:57:45 +0200
Subject: [PATCH 19/32] New translations app_en.arb (Chinese Simplified)

---
 l10n/app_zh.arb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/l10n/app_zh.arb b/l10n/app_zh.arb
index a2041df..0bdae09 100644
--- a/l10n/app_zh.arb
+++ b/l10n/app_zh.arb
@@ -242,6 +242,15 @@
     "moveCategoryHUD_moved": "相册已移动",
     "moveCategoryError_title": "移动失败",
     "moveCategoryError_message": "移动相册失败",
+    "selectCategory": "Select Album",
+    "selectCategory_select": "Please select an album or sub-album.",
+    "selectCategory_message": "{count, plural, =1{Are you sure you want to upload the image into the album {parent} ?} other{Are you sure you want to upload the images into the album {parent} ?}}",
+    "@selectCategory_message": {
+        "placeholders": {
+            "count": {},
+            "parent": {}
+        }
+    },
     "categoryPrivacy": "管理权限",
     "categoryPrivacy_subtitle": "管理 \"{album_name}\" 的访问权限",
     "@categoryPrivacy_subtitle": {

From 49933553ebd98c98ed8d64e0d1effa6d040bd92f Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Wed, 6 Aug 2025 11:08:17 +0200
Subject: [PATCH 20/32] Remove text trick and display album index instead. Need
 to refactor child scaffold

---
 lib/components/modals/select_move_or_copy_modal.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 9887081..68ce123 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -209,7 +209,7 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      "${List.generate(widget.index, (index) => '   ').join()} > ${widget.index > 0 ? ' ' : ''}${widget.album.name}",
+                      "${widget.index} ${widget.album.name}",
                       overflow: TextOverflow.ellipsis,
                       style: _disabled ? Theme.of(context).textTheme.bodySmall : Theme.of(context).textTheme.bodyMedium,
                     ),

From c90bdfdbc0ef99629b32631679c5c41041fc481a Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Mon, 4 Aug 2025 13:42:19 +0200
Subject: [PATCH 21/32] Upgrade player - ported from receive-image-share

Need specific fix from image-share branch, does not compile !!!
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 83524b9..b407d8d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -56,7 +56,7 @@ dependencies:
 
   # Utils
   mime_type: ^1.0.0 # Check mime type of files (differentiate photos from videos)
-  video_player: ^2.4.7 # Read video files in fullscreen mode
+  video_player: ^2.10.0 # Read video files in fullscreen mode
   chewie: ^1.8.1 # Video player with options
   flutter_image_compress: ^2.4.0 # Remove metadata
   permission_handler: ^12.0.0+1 # Check and asks for permissions

From 4e1600bc3fdf11a69952c960dc85d6711e2a2f51 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Mon, 4 Aug 2025 13:42:19 +0200
Subject: [PATCH 22/32] Cherry Pick commit from VLC and upgrade dependencies

connectivity_plus > 7.0.0
font_awesome_flutter > 10.10.0
package_info_plus > 9.0.0
device_info_plus > 12.1.0
workmanager > 0.9.0+3
share_plus > 12.0.0

All changelogs state an AGB upgrade is required
---
 .fvmrc       |   2 +-
 pubspec.lock | 228 +++++++++++++++++++++++++--------------------------
 pubspec.yaml |  12 +--
 3 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/.fvmrc b/.fvmrc
index 3ca65ff..1d108d2 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.8"
+  "flutter": "3.35.5"
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 4f65c87..68bcd60 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: "direct main"
     description:
       name: chewie
-      sha256: "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984"
+      sha256: "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.1"
+    version: "1.13.0"
   clock:
     dependency: transitive
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99"
+      sha256: "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -205,10 +205,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
+      sha256: "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6"
       url: "https://pub.dev"
     source: hosted
-    version: "11.5.0"
+    version: "12.1.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -221,18 +221,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0+1"
+    version: "5.9.0"
   dio_cookie_manager:
     dependency: "direct main"
     description:
       name: dio_cookie_manager
-      sha256: "47cacbf6a783c263bfa7cd7d08101e93127d87760ddb003ba289162f7be0f679"
+      sha256: d39c16abcc711c871b7b29bd51c6b5f3059ef39503916c6a9df7e22c4fc595e0
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.3.0"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -293,10 +293,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a
+      sha256: f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.0"
+    version: "10.3.3"
   file_selector_linux:
     dependency: transitive
     description:
@@ -309,10 +309,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711"
+      sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.4+3"
+    version: "0.9.4+4"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae"
+      sha256: "7ed76be64e8a7d01dfdf250b8434618e2a028c9dfa2a3c41dc9b531d4b3fc8a5"
       url: "https://pub.dev"
     source: hosted
-    version: "19.4.0"
+    version: "19.4.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -442,10 +442,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_windows
-      sha256: ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98
+      sha256: "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -455,10 +455,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
+      sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.28"
+    version: "2.0.30"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -511,10 +511,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_slidable
-      sha256: ab7dbb16f783307c9d7762ede2593ce32c220ba2ba0fd540a3db8e9a3acba71a
+      sha256: ea369262929d3cc6ebf9d8a00c196127966f117fe433a5e5cb47fb08008ca203
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.3"
   flutter_speed_dial:
     dependency: "direct main"
     description:
@@ -527,10 +527,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_spinkit
-      sha256: d2696eed13732831414595b98863260e33e8882fc069ee80ec35d4ac9ddb0472
+      sha256: "77850df57c00dc218bfe96071d576a8babec24cf58b2ed121c83cca4a2fdce7f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.2.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -545,10 +545,10 @@ packages:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: d3a89184101baec7f4600d58840a764d2ef760fe1c5a20ef9e6b0e9b24a07a3a
+      sha256: "27af5982e6c510dec1ba038eff634fa284676ee84e3fd807225c80c4ad869177"
       url: "https://pub.dev"
     source: hosted
-    version: "10.8.0"
+    version: "10.10.0"
   gal:
     dependency: "direct main"
     description:
@@ -593,10 +593,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   http_parser:
     dependency: transitive
     description:
@@ -609,66 +609,66 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
+      sha256: "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "6fae381e6af2bbe0365a5e4ce1db3959462fa0c4d234facf070746024bb80c8d"
+      sha256: "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+24"
+    version: "0.8.13+3"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83"
+      sha256: "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100"
+      sha256: eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+2"
+    version: "0.8.13"
   image_picker_linux:
     dependency: transitive
     description:
       name: image_picker_linux
-      sha256: "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9"
+      sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+2"
+    version: "0.2.2"
   image_picker_macos:
     dependency: transitive
     description:
       name: image_picker_macos
-      sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1"
+      sha256: d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+2"
+    version: "0.2.2"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0"
+      sha256: "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.1"
+    version: "2.11.0"
   image_picker_windows:
     dependency: transitive
     description:
       name: image_picker_windows
-      sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
+      sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.2"
   intl:
     dependency: "direct main"
     description:
@@ -705,26 +705,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -841,18 +841,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   path:
     dependency: "direct main"
     description:
@@ -873,18 +873,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.18"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -961,10 +961,10 @@ packages:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "7.0.1"
   photo_view:
     dependency: "direct main"
     description:
@@ -993,10 +993,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.5+1"
   pub_semver:
     dependency: transitive
     description:
@@ -1042,18 +1042,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0
+      sha256: "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.0"
+    version: "12.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef"
+      sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1066,10 +1066,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      sha256: "0b0f98d535319cb5cdd4f65783c2a54ee6d417a2f093dbb18be3e36e4c3d181f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.14"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1143,18 +1143,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_android
-      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
+      sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2+2"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b"
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   sqflite_darwin:
     dependency: transitive
     description:
@@ -1215,10 +1215,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   timezone:
     dependency: transitive
     description:
@@ -1255,18 +1255,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
+      sha256: c0fb544b9ac7efa10254efaf00a951615c362d1ea1877472f8f6c0fa00fcf15b
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.16"
+    version: "6.3.23"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
+      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1279,10 +1279,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1319,10 +1319,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   video_player:
     dependency: "direct main"
     description:
@@ -1335,18 +1335,18 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "9d5af2d233ba69df803dcf2f31e66d9a4c6206f2d96178df06b09b0ec3056b39"
+      sha256: "6cfe0b1e102522eda1e139b82bf00602181c5844fd2885340f595fb213d74842"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.9"
+    version: "2.8.14"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "9fedd55023249f3a02738c195c906b4e530956191febf0838e37d0dac912f953"
+      sha256: f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.8.4"
   video_player_platform_interface:
     dependency: transitive
     description:
@@ -1367,34 +1367,34 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
   wakelock_plus:
     dependency: transitive
     description:
       name: wakelock_plus
-      sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
+      sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
+      sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.4"
   web:
     dependency: transitive
     description:
@@ -1415,26 +1415,26 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "9573ad97890d199ac3ab32399aa33a5412163b37feb573eb5b0a76b35e9ffe41"
+      sha256: "21507ea5a326ceeba4d29dea19e37d92d53d9959cfc746317b9f9f7a57418d87"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.2"
+    version: "4.10.3"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147
+      sha256: "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.1"
+    version: "2.14.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "71523b9048cf510cfa1fd4e0a3fa5e476a66e0884d5df51d59d5023dba237107"
+      sha256: fea63576b3b7e02b2df8b78ba92b48ed66caec2bb041e9a0b1cbd586d5d80bfd
       url: "https://pub.dev"
     source: hosted
-    version: "3.22.1"
+    version: "3.23.1"
   win32:
     dependency: transitive
     description:
@@ -1455,34 +1455,34 @@ packages:
     dependency: "direct main"
     description:
       name: workmanager
-      sha256: dffcbbfd99af17271ca52d8a3767ba8a1000b357f2774db8ed5d58879cb9783a
+      sha256: "065673b2a465865183093806925419d311a9a5e0995aa74ccf8920fd695e2d10"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.9.0+3"
   workmanager_android:
     dependency: transitive
     description:
       name: workmanager_android
-      sha256: a6447816c41aa0ad8f6fa29b62d09a528891cf0737296397e1caae2523ced7dc
+      sha256: "9ae744db4ef891f5fcd2fb8671fccc712f4f96489a487a1411e0c8675e5e8cb7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.9.0+2"
   workmanager_apple:
     dependency: transitive
     description:
       name: workmanager_apple
-      sha256: "9c99003682a8423bdc122ff4bae891e24574d1e676ea302d2ef0493266228461"
+      sha256: "1cc12ae3cbf5535e72f7ba4fde0c12dd11b757caf493a28e22d684052701f2ca"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.9.1+2"
   workmanager_platform_interface:
     dependency: transitive
     description:
       name: workmanager_platform_interface
-      sha256: b1f0a868f1117511a23b0eb4220f08134152433b51a83eed479b1d68bbe23789
+      sha256: f40422f10b970c67abb84230b44da22b075147637532ac501729256fcea10a47
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.9.1+1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1495,10 +1495,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.6.1"
   yaml:
     dependency: transitive
     description:
@@ -1508,5 +1508,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.8"
+  dart: ">=3.9.0 <4.0.0"
+  flutter: ">=3.35.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index b407d8d..f27ace5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,12 +19,12 @@ dependencies:
   dio: ^5.4.3+1 # Requests to API
   dio_cookie_manager: ^3.2.0 # Compatibility between dio and cookie_jar
   cookie_jar: ^4.0.8 # Handles cookies
-  connectivity_plus: ^6.0.2 # Check if Wifi is enabled
+  connectivity_plus: ^7.0.0 # Check if Wifi is enabled
 
   # UI
   auto_size_text: ^3.0.0 # Text that auto-sizes (image thumbnail title)
   cupertino_icons: ^1.0.2 # iOS style icons (might be useless)
-  font_awesome_flutter: ^10.1.0 # Font awesome icons (might be useless)
+  font_awesome_flutter: ^10.10.0 # Font awesome icons (might be useless)
   flutter_slidable: ^4.0.0 # Album card's sliding cations
   drag_select_grid_view: ^0.6.1 # Drag to select image grid
   rounded_loading_button: # Loading button animation
@@ -40,7 +40,7 @@ dependencies:
   flutter_easyloading: ^3.0.5 # Show loading dialog
 
   # Storage
-  package_info_plus: ^8.0.0 # Get project info (version)
+  package_info_plus: ^9.0.0 # Get project info (version)
   path_provider: ^2.0.11 # Get application documents
   shared_preferences: ^2.0.15 # Base local storage
   flutter_secure_storage: ^9.2.4 # Local storage secured for logins
@@ -48,10 +48,10 @@ dependencies:
   file_picker: ^10.1.2 # Pick images and videos at a time for upload
 
   # Device
-  device_info_plus: ^11.5.0 # Get device info (version
+  device_info_plus: ^12.1.0 # Get device info (version
   flutter_local_notifications: ^19.1.0 # Throws notifications on download or upload
   open_filex: ^4.4.0 # Open files with devices apps
-  workmanager: ^0.8.0 # Background processes (auto upload)
+  workmanager: ^0.9.0+3 # Background processes (auto upload)
   gal: ^2.3.1 # Download images
 
   # Utils
@@ -60,7 +60,7 @@ dependencies:
   chewie: ^1.8.1 # Video player with options
   flutter_image_compress: ^2.4.0 # Remove metadata
   permission_handler: ^12.0.0+1 # Check and asks for permissions
-  share_plus: ^11.0.0 # Share files
+  share_plus: ^12.0.0 # Share files
   flutter_cache_manager: ^3.3.0 # Handles network image cache
   heif_converter: ^1.0.1 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes

From fe820bbadaeca2e05dbf506dc96f79ea2595d7dc Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 7 Oct 2025 09:18:16 +0200
Subject: [PATCH 23/32] Android build system upgrades and removing android
 jetifier

Upgrades :
- AGP to 8.13.0
- kotlin to 2.2.20
- AndroidX.window to 1.5.0

Removed jetifier since all dependencies have migrated to AndroidX tooling, this include remove whitelist for BouncyCastle Provider (bcprov-jdk15on)

Android build and Flutter build are now faster by skipping jetifier warper
---
 android/app/build.gradle.kts | 2 +-
 android/gradle.properties    | 2 --
 android/settings.gradle.kts  | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 334d35b..1e8f927 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -65,6 +65,6 @@ flutter {
 }
 
 dependencies {
-    implementation("androidx.window:window:1.4.0")
+    implementation("androidx.window:window:1.5.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 9e0749c..8343358 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,8 +11,6 @@
 # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 #Tue Apr 22 14:46:56 CEST 2025
-android.enableJetifier=true
-android.jetifier.ignorelist=bcprov-jdk15on
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index e65186f..d91423d 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -19,8 +19,8 @@ pluginManagement {
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.12.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("com.android.application") version "8.13.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")
\ No newline at end of file

From 86a1afc8e1e1e8cb0da91ecd77446d055d1e503f Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 22 Aug 2025 15:01:04 +0200
Subject: [PATCH 24/32] Finish cherry picking updates from VLC branch

---
 l10n.yaml    | 1 -
 pubspec.lock | 2 +-
 pubspec.yaml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/l10n.yaml b/l10n.yaml
index 96d3298..9c5154c 100644
--- a/l10n.yaml
+++ b/l10n.yaml
@@ -1,4 +1,3 @@
-synthetic-package: false
 arb-dir: l10n
 template-arb-file: app_en.arb
 untranslated-messages-file: l10n/untranslated.json
diff --git a/pubspec.lock b/pubspec.lock
index 68bcd60..41fb89f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1509,4 +1509,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.9.0 <4.0.0"
-  flutter: ">=3.35.0"
+  flutter: ">=3.35.5"
diff --git a/pubspec.yaml b/pubspec.yaml
index f27ace5..2b3e5a0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ version: 2.4.1+241
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: 3.32.8
+  flutter: 3.35.5
 
 dependencies:
   flutter:

From c6a67c676614121e8fc8778501b7553082006630 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 7 Oct 2025 10:17:05 +0200
Subject: [PATCH 25/32] Remove Heic/Heif conversion

---
 lib/services/auto_upload_manager.dart | 12 ------------
 lib/utils/image_actions.dart          | 12 ------------
 pubspec.lock                          |  8 --------
 pubspec.yaml                          |  1 -
 4 files changed, 33 deletions(-)

diff --git a/lib/services/auto_upload_manager.dart b/lib/services/auto_upload_manager.dart
index ca9a94c..a5e3b25 100644
--- a/lib/services/auto_upload_manager.dart
+++ b/lib/services/auto_upload_manager.dart
@@ -7,7 +7,6 @@ import 'package:dio/dio.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:heif_converter/heif_converter.dart';
 import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/status_model.dart';
 import 'package:piwigo_ng/network/api_client.dart';
@@ -91,17 +90,6 @@ class AutoUploadManager {
     // Remove folders and links
     List<File> files = dirFiles.where((file) => file is File).map<File>((e) => e as File).toList();
 
-    // Convert heic/heif files to .jpg
-    for (File file in files) {
-      if (file.path.endsWith('.heic') || file.path.endsWith('.heif')) {
-        debugPrint("${file.path} is Heic/Heif ! Converting to jpg... ");
-        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
-        if (jpgPath != null) {
-          files.remove(file);
-          files.add(File(jpgPath));
-        }
-      }
-    }
     debugPrint("List files: ${files.toString()}");
     await autoUploadPhotos(files);
     return true;
diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
index 9225325..1f31f61 100644
--- a/lib/utils/image_actions.dart
+++ b/lib/utils/image_actions.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
-import 'package:heif_converter/heif_converter.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
@@ -71,11 +70,6 @@ Future<List<XFile>?> onPickImages() async {
       if (Preferences.getAvailableFileTypes
           .contains(file.name.split('.').last)) {
         files.add(file);
-      } else if (file.name.endsWith('.heic') || file.name.endsWith('.heif')) {
-        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
-        if (jpgPath != null) {
-          files.add(XFile(jpgPath));
-        }
       }
     }
     return files;
@@ -100,12 +94,6 @@ Future<XFile?> onTakePhoto(BuildContext context) async {
           imageQuality: (Preferences.getUploadQuality * 100).round(),
           requestFullMetadata: !Preferences.getRemoveMetadata,
         );
-        if (image != null) {
-          String? jpgPath = await HeifConverter.convert(image.path, format: 'jpg');
-          if (jpgPath != null) {
-            image = XFile(jpgPath);
-          }
-        }
         break;
       case 1:
         image = await _picker.pickVideo(source: ImageSource.camera);
diff --git a/pubspec.lock b/pubspec.lock
index 41fb89f..4772dab 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -565,14 +565,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
-  heif_converter:
-    dependency: "direct main"
-    description:
-      name: heif_converter
-      sha256: a2fbbf3f795b19753d84a52223c60d3bcf3cf2261d6c0d41857f0ec198e6eef3
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   html:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 2b3e5a0..5cce3e7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,7 +62,6 @@ dependencies:
   permission_handler: ^12.0.0+1 # Check and asks for permissions
   share_plus: ^12.0.0 # Share files
   flutter_cache_manager: ^3.3.0 # Handles network image cache
-  heif_converter: ^1.0.1 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes
   listen_sharing_intent: ^1.9.2 # Receive sharing from other apps
 

From e6e13f5619b8dd547483b1f6641fb380c567c474 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Tue, 2 Sep 2025 09:46:24 +0200
Subject: [PATCH 26/32] Remove deprecated WorkManager debug flag Add a section
 about debugging in CONTRIBUTING.md

---
 docs/CONTRIBUTING.md                  | 17 ++++++++++-------
 lib/services/auto_upload_manager.dart |  5 +----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 4288a87..c3edd84 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -18,15 +18,13 @@ flutter config --no-analytics
 
 Using [fvm](https://fvm.app/) :
 ```sh
-fvm install 2.27.4
+fvm install 3.27.4
 cd <Project-dir>
-fvm use 2.27.4
+fvm use 3.27.4
 ```
 
 ### Android Studio
 
-*(Optional - enable wayland support)* : Add `-Dawt.toolkit.name=WLToolkit` to the Custom VM Options.
-
 Install the flutter plugin and restart, then go to **Settings > Languages & Framework > Android SDK > SDK Tools** and install the following :
 
 - Android SDK Build-Tools
@@ -48,6 +46,13 @@ If Android studio doesn't pickup the path of the flutter toolchain or dart :
 In **Settings > Languages & Framework > Flutter** set the flutter SDK path using the absolute path of your install.  
 And in **Settings > Languages & Framework > Dart** specify the Dark SDK path `<Absolute-Flutter-Path>/bin/cache/dart-sdk`
 
+## Debugging
+
+By default running the app via Android Studio or `flutter run` will use the debug APK (located in `build/app/outputs/flutter-apk/app-debug.apk`).
+Background tasks are done with [workmanager](https://docs.page/fluttercommunity/flutter_workmanager) debugging must be enabled via the kotlin flag `WorkmanagerDebug.setCurrent(LoggingDebugHandler())`
+
+See more info in https://docs.page/fluttercommunity/flutter_workmanager/debugging
+
 ## Contributing guidelines
 
 Contribution must target the `develop` branch and must have documented changes.
@@ -56,6 +61,4 @@ if you are fixing an existing issue or bug, tag it in your merge request (exampl
 
 if you are doing maintenance work, be sure to add the changelog of the libraries you are updating.
 
-Translation are done via [crowdin](https://crowdin.com/project/piwigo-ng)
-
-
+Translation are done via [crowdin](https://crowdin.com/project/piwigo-ng)
\ No newline at end of file
diff --git a/lib/services/auto_upload_manager.dart b/lib/services/auto_upload_manager.dart
index a5e3b25..0c13e44 100644
--- a/lib/services/auto_upload_manager.dart
+++ b/lib/services/auto_upload_manager.dart
@@ -450,8 +450,5 @@ void callbackDispatcher() {
 }
 
 void initializeWorkManager() {
-  Workmanager().initialize(
-    callbackDispatcher, // The top level function, aka callbackDispatcher
-    isInDebugMode: kDebugMode,
-  );
+  Workmanager().initialize(callbackDispatcher); // The top level function, aka callbackDispatcher
 }

From 3ac8e709296109552fc5374c09effba0f961417c Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Thu, 9 Oct 2025 14:20:35 +0200
Subject: [PATCH 27/32] Fully move toolchain to Jvm and configure gradle to use
 up to 8G of ram

- Kotlin now use compilerOptions -> jvmTarget
- Gradle properties changed to use 8G of ram and removed kotlin specific limit
- Bumped NDK
---
 android/app/build.gradle.kts | 16 +++++++++++++---
 android/build.gradle.kts     |  4 +++-
 android/gradle.properties    |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 1e8f927..8663f02 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 import java.io.FileInputStream
 
@@ -25,14 +26,23 @@ android {
     //compileSdkVersion flutter.compileSdkVersion
     //ndkVersion = flutter.ndkVersion
     compileSdk = 36
-    ndkVersion = "29.0.13599879"
+    ndkVersion = "29.0.14206865 "
+
+    val compileJavaVersion = JavaVersion.VERSION_17
+    val kotlinJvmTarget = JvmTarget.JVM_17
 
     compileOptions {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
         // Sets Java compatibility to Java 17
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = compileJavaVersion
+        targetCompatibility = compileJavaVersion
+    }
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = kotlinJvmTarget
+        }
     }
 
     defaultConfig {
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 58af68c..c694b5b 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -5,7 +5,9 @@ allprojects {
     }
 }
 
-val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+val newBuildDir: Directory = rootProject.layout.buildDirectory
+    .dir("../../build")
+    .get()
 rootProject.layout.buildDirectory.value(newBuildDir)
 
 subprojects {
diff --git a/android/gradle.properties b/android/gradle.properties
index 8343358..ff0152f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -14,4 +14,4 @@
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
\ No newline at end of file

From bbd8bcc65804ef727666867cb418899398e1702d Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 10 Oct 2025 07:43:32 +0200
Subject: [PATCH 28/32] Migrate to radio group to fix accessibility issues and
 remove deprecated warning

---
 lib/views/album/album_privacy_page.dart | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/views/album/album_privacy_page.dart b/lib/views/album/album_privacy_page.dart
index 68d3d37..0038415 100644
--- a/lib/views/album/album_privacy_page.dart
+++ b/lib/views/album/album_privacy_page.dart
@@ -144,26 +144,26 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
                   padding: const EdgeInsets.symmetric(
                     vertical: 8.0,
                   ),
-                  child: Column(
-                    children: [
-                      RadioListTile<AlbumStatus>(
-                        value: AlbumStatus.public,
-                        groupValue: _selectedMode,
-                        activeColor: Theme.of(context).colorScheme.secondary,
-                        title: Text(appStrings.categoryPrivacyMode_public),
-                        subtitle: Text(appStrings.categoryPrivacyMode_publicMessage),
-                        onChanged: _onChangeMode,
-                      ),
-                      RadioListTile(
-                        value: AlbumStatus.private,
-                        groupValue: _selectedMode,
-                        activeColor: Theme.of(context).colorScheme.secondary,
-                        title: Text(appStrings.categoryPrivacyMode_private),
-                        subtitle: Text(appStrings.categoryPrivacyMode_privateMessage),
-                        onChanged: _onChangeMode,
-                      ),
-                    ],
-                  ),
+                  child: RadioGroup<AlbumStatus>(
+                      onChanged: _onChangeMode,
+                      groupValue: _selectedMode,
+                      child: Column(
+                        children: [
+                          RadioListTile<AlbumStatus>(
+                            value: AlbumStatus.public,
+                            activeColor: Theme.of(context).colorScheme.secondary,
+                            title: Text(appStrings.categoryPrivacyMode_public),
+                            subtitle: Text(appStrings.categoryPrivacyMode_publicMessage),
+                          ),
+                          RadioListTile(
+                            value: AlbumStatus.private,
+                            activeColor: Theme.of(context).colorScheme.secondary,
+                            title: Text(appStrings.categoryPrivacyMode_private),
+                            subtitle: Text(appStrings.categoryPrivacyMode_privateMessage),
+                          ),
+                        ],
+                      )
+                  )
                 ),
                 AnimatedSize(
                   duration: const Duration(milliseconds: 300),

From 33206447f3bb12d3c22375bcdb13f51cfe3b3d44 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 10 Oct 2025 10:30:28 +0200
Subject: [PATCH 29/32] Implement design using existing structure

- Need to fix padding
- Need to fix magic color number
---
 .../modals/select_move_or_copy_modal.dart     | 79 ++++++++++++-------
 1 file changed, 52 insertions(+), 27 deletions(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 68ce123..885bab1 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -38,7 +38,8 @@ class _SelectMoveOrCopyModalState extends State<SelectMoveOrCopyModal> {
     _disabledAlbums = [
       if (widget.album != null) widget.album!.id,
       if (parentAlbums.length == 1 || widget.isImage) 0,
-      if (!widget.isImage && parentAlbums.length > 1) int.parse(parentAlbums[parentAlbums.length - 2]),
+      if (!widget.isImage && parentAlbums.length > 1)
+        int.parse(parentAlbums[parentAlbums.length - 2]),
     ];
 
     super.initState();
@@ -203,48 +204,72 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
+              if (widget.album.children.isNotEmpty && !widget.isParent)
+                GestureDetector( // Add chevron
+                  behavior: HitTestBehavior.opaque,
+                  onTap: () => setState(() {
+                    _expanded = !_expanded;
+                  }),
+                  child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      child: AnimatedRotation(
+                        duration: const Duration(milliseconds: 200),
+                        turns: _expanded ? 0.25 : 0, //Rotate by 90°
+                        child: Icon(Icons.chevron_right),
+                      )),
+                ),
               Expanded(
                 child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16.0),
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
-                      "${widget.index} ${widget.album.name}",
+                      "${widget.album.name}",
                       overflow: TextOverflow.ellipsis,
-                      style: _disabled ? Theme.of(context).textTheme.bodySmall : Theme.of(context).textTheme.bodyMedium,
+                      style: _disabled
+                          ? Theme.of(context).textTheme.bodySmall
+                          : Theme.of(context).textTheme.bodyMedium,
                     ),
                   ),
                 ),
               ),
               if (widget.album.children.isNotEmpty && !widget.isParent)
-                GestureDetector(
-                  behavior: HitTestBehavior.opaque,
-                  onTap: () => setState(() {
-                    _expanded = !_expanded;
-                  }),
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        Center(
-                          child: Text(
-                            appStrings.albumCount(widget.album.nbCategories),
-                            style: TextStyle(
-                              color: Theme.of(context).primaryColor.withValues(alpha: 0.7),
-                              fontSize: 14,
+                Padding( //Folder box
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      Center(
+                        child: DecoratedBox(
+                          decoration: BoxDecoration(
+                              color: Color.fromARGB(255, 196, 196, 196),
+                              borderRadius: BorderRadius.circular(5)),
+                          child: Padding(
+                            padding:
+                                EdgeInsetsGeometry.symmetric(horizontal: 8),
+                            child: Row(
+                              spacing: 2.0,
+                              children: [
+                                Text(
+                                  '${widget.album.nbCategories}',
+                                  style: TextStyle(
+                                    color: Colors.white,
+                                    fontSize: 14,
+                                  ),
+                                ),
+                                Icon(
+                                  Icons.folder,
+                                  size: 15,
+                                  color: Colors.white,
+                                ),
+                              ],
                             ),
                           ),
                         ),
-                        AnimatedRotation(
-                          duration: const Duration(milliseconds: 200),
-                          turns: _expanded ? -0.25 : 0.25,
-                          child: Icon(Icons.chevron_right),
-                        ),
-                      ],
-                    ),
+                      ),
+                    ],
                   ),
-                ),
+                )
             ],
           ),
         ),

From bc5cbbe00d12840cf43a276133ea3745f2a2fce5 Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 10 Oct 2025 11:20:50 +0200
Subject: [PATCH 30/32] Fix padding rules

Draw Arbitrary number of spacing when index > 1
---
 .../modals/select_move_or_copy_modal.dart     | 117 ++++++++----------
 1 file changed, 51 insertions(+), 66 deletions(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 885bab1..986b78a 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -200,79 +200,64 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
           widget.onTap?.call(widget.album);
         },
         child: SizedBox(
-          height: 48.0,
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              if (widget.album.children.isNotEmpty && !widget.isParent)
-                GestureDetector( // Add chevron
-                  behavior: HitTestBehavior.opaque,
-                  onTap: () => setState(() {
-                    _expanded = !_expanded;
-                  }),
-                  child: Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
+            height: 48.0,
+            child: Row(
+              spacing: 2,
+              children: [
+                Padding(padding: EdgeInsetsGeometry.only(left: 10.0)),
+                if (widget.index > 1) ...[
+                  Padding(padding: EdgeInsetsGeometry.only(
+                      left: 30.0*(widget.index-1)
+                  ))
+                ],
+                if (widget.album.children.isNotEmpty && !widget.isParent) ...[
+                  GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () => setState(() {
+                            _expanded = !_expanded;
+                          }),
                       child: AnimatedRotation(
+                        turns: _expanded ? 0.25 : 0, //Rotate by 90°,
                         duration: const Duration(milliseconds: 200),
-                        turns: _expanded ? 0.25 : 0, //Rotate by 90°
                         child: Icon(Icons.chevron_right),
                       )),
-                ),
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Align(
-                    alignment: Alignment.centerLeft,
+                ],
+                Expanded(
                     child: Text(
-                      "${widget.album.name}",
-                      overflow: TextOverflow.ellipsis,
-                      style: _disabled
-                          ? Theme.of(context).textTheme.bodySmall
-                          : Theme.of(context).textTheme.bodyMedium,
-                    ),
-                  ),
-                ),
-              ),
-              if (widget.album.children.isNotEmpty && !widget.isParent)
-                Padding( //Folder box
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Center(
-                        child: DecoratedBox(
-                          decoration: BoxDecoration(
-                              color: Color.fromARGB(255, 196, 196, 196),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Padding(
-                            padding:
-                                EdgeInsetsGeometry.symmetric(horizontal: 8),
-                            child: Row(
-                              spacing: 2.0,
-                              children: [
-                                Text(
-                                  '${widget.album.nbCategories}',
-                                  style: TextStyle(
-                                    color: Colors.white,
-                                    fontSize: 14,
-                                  ),
-                                ),
-                                Icon(
-                                  Icons.folder,
-                                  size: 15,
-                                  color: Colors.white,
-                                ),
-                              ],
+                  "${widget.album.name}",
+                  overflow: TextOverflow.ellipsis,
+                  style: _disabled
+                      ? Theme.of(context).textTheme.bodySmall
+                      : Theme.of(context).textTheme.bodyMedium,
+                )),
+                if (widget.album.children.isNotEmpty && !widget.isParent) ...[
+                  DecoratedBox(
+                      decoration: BoxDecoration(
+                          color: Color.fromARGB(255, 196, 196, 196),
+                          borderRadius: BorderRadius.circular(5)),
+                      child: Padding(
+                        padding: EdgeInsetsGeometry.symmetric(
+                          horizontal: 8,
+                        ),
+                        child: Row(children: [
+                          Text(
+                            '${widget.album.nbCategories}',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 14,
                             ),
                           ),
-                        ),
-                      ),
-                    ],
-                  ),
-                )
-            ],
-          ),
-        ),
+                          Icon(
+                            Icons.folder,
+                            size: 15,
+                            color: Colors.white,
+                          ),
+                        ]),
+                      )),
+                  Padding(padding: EdgeInsetsGeometry.only(right: 8))
+                ],
+              ],
+            )),
       );
 
   Widget get _divider => Divider(

From c246472f81704d20b3c632808de06a03947dd30c Mon Sep 17 00:00:00 2001
From: Renarde-dev <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 10 Oct 2025 11:27:13 +0200
Subject: [PATCH 31/32] Fix spacing between icon and number

---
 lib/components/modals/select_move_or_copy_modal.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 986b78a..47518cc 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -206,9 +206,9 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
               children: [
                 Padding(padding: EdgeInsetsGeometry.only(left: 10.0)),
                 if (widget.index > 1) ...[
-                  Padding(padding: EdgeInsetsGeometry.only(
-                      left: 30.0*(widget.index-1)
-                  ))
+                  Padding(
+                      padding: EdgeInsetsGeometry.only(
+                          left: 30.0 * (widget.index - 1)))
                 ],
                 if (widget.album.children.isNotEmpty && !widget.isParent) ...[
                   GestureDetector(
@@ -239,7 +239,7 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                         padding: EdgeInsetsGeometry.symmetric(
                           horizontal: 8,
                         ),
-                        child: Row(children: [
+                        child: Row(spacing: 4, children: [
                           Text(
                             '${widget.album.nbCategories}',
                             style: TextStyle(

From 5a236232064c6e245b8d152867ba0ce9716a7183 Mon Sep 17 00:00:00 2001
From: Linty <lintydev@gmail.com>
Date: Fri, 10 Oct 2025 11:35:46 +0200
Subject: [PATCH 32/32] fix decorated box colors scheme

---
 lib/components/modals/select_move_or_copy_modal.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/components/modals/select_move_or_copy_modal.dart
index 47518cc..ac64c4c 100644
--- a/lib/components/modals/select_move_or_copy_modal.dart
+++ b/lib/components/modals/select_move_or_copy_modal.dart
@@ -4,6 +4,7 @@ import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/utils/resources.dart';
 
 class SelectMoveOrCopyModal extends StatefulWidget {
   const SelectMoveOrCopyModal({
@@ -233,7 +234,7 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                 if (widget.album.children.isNotEmpty && !widget.isParent) ...[
                   DecoratedBox(
                       decoration: BoxDecoration(
-                          color: Color.fromARGB(255, 196, 196, 196),
+                          color: Theme.of(context).colorScheme.surface,
                           borderRadius: BorderRadius.circular(5)),
                       child: Padding(
                         padding: EdgeInsetsGeometry.symmetric(
@@ -243,14 +244,14 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                           Text(
                             '${widget.album.nbCategories}',
                             style: TextStyle(
-                              color: Colors.white,
+                              color: Theme.of(context).colorScheme.inverseSurface,
                               fontSize: 14,
                             ),
                           ),
                           Icon(
                             Icons.folder,
                             size: 15,
-                            color: Colors.white,
+                            color: Theme.of(context).colorScheme.inverseSurface,
                           ),
                         ]),
                       )),