Added native heic support for Piwigo 14

Piwigo · Oct 12, 2023 · 7a7da9d · 7a7da9d
1 parent 89ee0dc
commit 7a7da9d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     compileOptions {
         // Flag to enable support for the new language APIs
@@ -55,7 +55,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.piwigo.piwigo_ng"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/lib/services/preferences_service.dart b/lib/services/preferences_service.dart
@@ -62,6 +62,9 @@ class Preferences {
   static const String isAdminKey = 'IS_USER_ADMIN';
   static const String uploadChunkSizeKey = 'UPLOAD_FORM_CHUNK_SIZE';
   static const String fileTypesKey = 'FILE_TYPES';
+  static List<String> get getAvailableFileTypes {
+    return appPreferences.getString(fileTypesKey)?.split(',') ?? [];
+  }
 
   // ------------ Settings ------------
 

diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart
@@ -107,15 +107,19 @@ Future<List<XFile>?> onPickFiles() async {
 
 Future<List<XFile>?> onPickImages() async {
   try {
-    List<XFile> files = await _picker.pickMultipleMedia(
+    List<XFile> pickedFiles = await _picker.pickMultipleMedia(
       imageQuality: (Preferences.getUploadQuality * 100).round(),
       requestFullMetadata: !Preferences.getRemoveMetadata,
     );
-    for (var file in files) {
-      if (file.name.endsWith('.heic')) {
+    List<XFile> files = [];
+    for (var file in pickedFiles) {
+      if (Preferences.getAvailableFileTypes
+          .contains(file.name.split('.').last)) {
+        files.add(file);
+      } else if (file.name.endsWith('.heic')) {
         String? jpgPath = await HeicToJpg.convert(file.path);
         if (jpgPath != null) {
-          files[files.indexWhere((f) => f == file)] = XFile(jpgPath);
+          files.add(XFile(jpgPath));
         }
       }
     }

diff --git a/lib/views/settings/settings_page.dart b/lib/views/settings/settings_page.dart
@@ -230,8 +230,7 @@ class _SettingsPageState extends State<SettingsPage> {
         ],
       );
   Widget get _supportedFilesSection {
-    String fileTypes =
-        appPreferences.getString('FILE_TYPES')?.replaceAll(',', ', ') ?? '';
+    String fileTypes = Preferences.getAvailableFileTypes.join(', ') ?? '';
     return SettingsSection(
       color: Colors.transparent,
       children: [