Merge branch 'Settings/More_preferences'

# Conflicts:
#	lib/services/upload/Uploader.dart

Author: remi-martin

lib/api/SessionAPI.dart

@@ -111,6 +111,7 @@ void savePreferences(Map<String, dynamic> status, {
   if(API.prefs.getDouble("portrait_image_count") == null) API.prefs.setDouble("portrait_image_count", 4);
   if(API.prefs.getDouble("landscape_image_count") == null) API.prefs.setDouble("landscape_image_count", 6);
   if(API.prefs.getBool("show_thumbnail_title") == null) API.prefs.setBool("show_thumbnail_title", false);
+  if(API.prefs.getBool("remove_metadata") == null) API.prefs.setBool("remove_metadata", false);
   saveStatus(status);
 }
 

lib/services/upload/Uploader.dart

@@ -66,8 +66,12 @@ class Uploader {
       for(var element in photos) {
         uploadStatusProvider.status = true;
 
-
-        XFile photo = await testCompressAndGetFile(element);
+        XFile photo;
+        if (API.prefs.getBool("remove_metadata")) {
+          photo = await testCompressAndGetFile(element);
+        } else {
+          photo = element;
+        }
 
         Response response = await uploadChunk(context, photo, category, info,
             (progress) {
@@ -86,7 +90,7 @@ class Uploader {
         uploadStatusProvider.current++;
       }
       uploadStatusProvider.reset();
-    } on DioError catch (e) {
+    } catch (e) {
       debugPrint(e.message);
       uploadStatusProvider.reset();
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
@@ -147,24 +151,17 @@ class Uploader {
       ),
     ));
 
-    try {
-      return await chunkedUploader.upload(
-        context: context,
-        path: "/ws.php",
-        filePath: await FlutterAbsolutePath.getAbsolutePath(photo.path),
-        maxChunkSize: API.prefs.getInt("upload_form_chunk_size")*1000,
-        params: queries,
-        method: 'POST',
-        data: fields,
-        contentType: Headers.formUrlEncodedContentType,
-        onUploadProgress: (value) => onProgress(value),
-      );
-    } on DioError catch (e) {
-      debugPrint('Dio upload chunk error $e');
-      ScaffoldMessenger.of(context).hideCurrentSnackBar();
-      ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, appStrings(context).uploadError_title));
-      return Future.value(null);
-    }
+    return await chunkedUploader.upload(
+      context: context,
+      path: "/ws.php",
+      filePath: await FlutterAbsolutePath.getAbsolutePath(photo.path),
+      maxChunkSize: API.prefs.getInt("upload_form_chunk_size")*1000,
+      params: queries,
+      method: 'POST',
+      data: fields,
+      contentType: Headers.formUrlEncodedContentType,
+      onUploadProgress: (value) => onProgress(value),
+    );
   }
 }