fixed upload error

Author: remi-martin

lib/api/ImageAPI.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:ext_storage/ext_storage.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:path_provider/path_provider.dart';

lib/services/UploadStatusProvider.dart

@@ -26,6 +26,13 @@ class UploadStatusNotifier extends ChangeNotifier {
     return "$_current/$_max";
   }
 
+  void reset() {
+    _max = 0;
+    _progress = 0;
+    _current = 0;
+    _status = false;
+  }
+
 
   set max(int value) {
     _max = value;

lib/services/upload/Uploader.dart

@@ -79,9 +79,10 @@ class Uploader {
         }
         uploadStatusProvider.current++;
       }
+      uploadStatusProvider.reset();
     } on DioError catch (e) {
       print(e.message);
-      uploadStatusProvider.status = false;
+      uploadStatusProvider.reset();
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, appStrings(context).uploadError_title));
     }
@@ -91,48 +92,11 @@ class Uploader {
       await communityUploadCompleted(uploadedImages, int.parse(category));
     } on DioError catch (e) {
       print(e.message);
-      uploadStatusProvider.status = false;
     }
 
-    uploadStatusProvider.status = false;
-    uploadStatusProvider.max = 0;
-    uploadStatusProvider.current = 0;
-
     await _showUploadNotification(result);
   }
 
-  void upload(XFile photo, String category) async {
-    Map<String, String> queries = {"format":"json", "method": "pwg.images.upload"};
-    List<int> imageData = await photo.readAsBytes();
-
-    Dio dio = new Dio(
-      BaseOptions(
-        baseUrl: API.prefs.getString("base_url"),
-      ),
-    );
-
-    FormData formData =  FormData.fromMap({
-      "category": category,
-      "pwg_token": API.prefs.getString("pwg_token"),
-      "file": MultipartFile.fromBytes(
-        imageData,
-        filename: photo.path.split('/').last,
-      ),
-      "name": photo.path.split('/').last,
-    });
-
-    Response response = await dio.post("ws.php",
-      data: formData,
-      queryParameters: queries,
-    );
-
-    if (response.statusCode == 200) {
-      print('Upload ${response.data}');
-      if(json.decode(response.data)["stat"] == "ok") {}
-    } else {
-      print("Request failed: ${response.statusCode}");
-    }
-  }
   Future<Response> uploadChunk(BuildContext context, XFile photo,
     String category, Map<String, dynamic> info,
     Function(double) onProgress,
@@ -142,8 +106,8 @@ class Uploader {
       "method": "pwg.images.uploadAsync"
     };
     Map<String, dynamic> fields = {
-      'username': API.prefs.getString("username"),
-      'password': API.prefs.getString("password"),
+      'username': await API.storage.read(key: "username"),
+      'password': await API.storage.read(key: "password"),
       'filename': photo.path.split('/').last,
       'category': category,
     };

lib/services/upload/chunked_uploader.dart

@@ -83,7 +83,6 @@ class UploadRequest {
     }
 
     for (int i = 0; i < _chunksCount; i++) {
-      // print("${i+1} | $_chunksCount");
       final start = _getChunkStart(i);
       final end = _getChunkEnd(i);
       final chunkStream = _getChunkStream(start, end);
@@ -96,20 +95,13 @@ class UploadRequest {
         "file": MultipartFile(chunkStream, end - start, filename: fileName),
         if (data != null) ...data
       });
-      try {
-        finalResponse = await dio.request(
-          path,
-          data: formData,
-          queryParameters: params,
-          options: Options(
-              method: method,
-              contentType: contentType
-          ),
-          onSendProgress: (current, total) => _updateProgress(i, current, total),
-        );
-      } catch (e) {
-        print(e);
-      }
+      finalResponse = await dio.request(
+        path,
+        data: formData,
+        queryParameters: params,
+        options: Options(method: method, contentType: contentType),
+        onSendProgress: (current, total) => _updateProgress(i, current, total),
+      );
     }
     return finalResponse;
   }

lib/views/ImageViewPage.dart

@@ -1,4 +1,3 @@
-import 'package:better_player/better_player.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:icon_shadow/icon_shadow.dart';

pubspec.yaml

@@ -57,7 +57,6 @@ dependencies:
   cached_network_image: ^3.0.0
   better_player: ^0.0.79
   video_player: ^2.2.10
-  video_thumbnail: ^0.4.6
   wakelock: ^0.5.6
 
 dev_dependencies: