fix: Background image upload

packages/smooth_app/lib/cards/data_cards/image_upload_card.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
@@ -46,35 +45,17 @@ class _ImageUploadCardState extends State<ImageUploadCard> {
       if (!mounted) {
         return;
       }
-      final bool isUploaded = await uploadCapturedPicture(
+      await uploadCapturedPicture(
         context,
         barcode: widget.product
             .barcode!, //Probably throws an error, but this is not a big problem when we got a product without a barcode
         imageField: widget.productImageData.imageField,
         imageUri: croppedImageFile.uri,
       );
-      croppedImageFile.delete();
+
       if (!mounted) {
         return;
       }
-      if (isUploaded) {
-        if (widget.productImageData.imageField == ImageField.OTHER) {
-          final AppLocalizations appLocalizations =
-              AppLocalizations.of(context);
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(appLocalizations.other_photo_uploaded),
-              duration: const Duration(seconds: 3),
-              action: SnackBarAction(
-                label: appLocalizations.more_photos,
-                onPressed: _getImage,
-              ),
-            ),
-          );
-        } else {
-          await widget.onUpload(context);
-        }
-      }
     }
   }
 

packages/smooth_app/lib/helpers/background_task_helper.dart

@@ -0,0 +1,28 @@
+// helper class for serialization and deserialization of data for the background task
+class BackgroundInputData {
+  BackgroundInputData(
+      {required this.barcode,
+      required this.imageField,
+      required this.imageUri,
+      required this.counter,
+      required this.languageCode});
+
+  BackgroundInputData.fromJson(Map<String, dynamic> json)
+      : barcode = json['barcode'] as String,
+        imageField = json['imageField'] as String,
+        imageUri = json['imageUri'] as String,
+        counter = json['counter'] as int,
+        languageCode = json['languageCode'] as String;
+  final String barcode;
+  final String imageField;
+  final String imageUri;
+  int counter;
+  final String languageCode;
+  Map<String, dynamic> toJson() => <String, dynamic>{
+        'barcode': barcode,
+        'imageField': imageField,
+        'imageUri': imageUri,
+        'counter': counter,
+        'languageCode': languageCode,
+      };
+}

packages/smooth_app/lib/helpers/picture_capture_helper.dart

@@ -1,10 +1,106 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:provider/provider.dart';
 import 'package:smooth_app/data_models/continuous_scan_model.dart';
-import 'package:smooth_app/generic_lib/loading_dialog.dart';
+import 'package:smooth_app/database/dao_product.dart';
+import 'package:smooth_app/database/local_database.dart';
+import 'package:smooth_app/helpers/background_task_helper.dart';
 import 'package:smooth_app/query/product_query.dart';
+import 'package:smooth_app/services/smooth_random.dart';
+import 'package:workmanager/workmanager.dart';
+
+@pragma(
+    'vm:entry-point') // Mandatory if the App is obfuscated or using Flutter 3.1+
+void callbackDispatcher() {
+  Workmanager().executeTask(
+    (String task, Map<String, dynamic>? inputData) async {
+      const List<Duration> duration = <Duration>[
+        Duration(seconds: 30),
+        Duration(minutes: 1),
+        Duration(minutes: 30),
+        Duration(hours: 1),
+        Duration(hours: 6),
+        Duration(days: 1),
+      ];
+      // make a counter with task as key as it is unique for each task
+      final BackgroundInputData inputTask =
+          BackgroundInputData.fromJson(inputData!);
+      final int counter = inputTask.counter;
+      // if task is greate than 6 , that means it has been executed 7 times
+      if (counter > duration.length) {
+        // returns true to let platform know that the task is completed
+        final File file = File(inputTask.imageUri);
+        file.deleteSync();
+        return true;
+      }
+
+      bool shouldRetry = false;
+      try {
+        final SendImage image = SendImage(
+          lang: ProductQuery.getLanguage(),
+          barcode: inputTask.barcode,
+          imageField: ImageFieldExtension.getType(inputTask.imageField),
+          imageUri: Uri.parse(inputTask.imageUri),
+        );
+        final Status result = await OpenFoodAPIClient.addProductImage(
+          ProductQuery.getUser(),
+          image,
+        );
+        shouldRetry = result.error != null || result.status != 'status ok';
+      } catch (e) {
+        shouldRetry = true;
+      }
+      if (shouldRetry) {
+        inputTask.counter += 1;
+        await Workmanager().initialize(callbackDispatcher);
+        await Workmanager().registerOneOffTask(
+          task,
+          'ImageUploadWorker',
+          constraints: Constraints(
+            networkType: NetworkType.connected,
+          ),
+          inputData: inputTask.toJson(),
+          initialDelay: duration[counter - 1],
+        );
+        return Future<bool>.error('Failed and it will try again');
+      } else {
+        // go to the file system and delete the file that was uploaded
+        final File file = File(inputData['imageUri'].toString());
+        file.deleteSync();
+        final LocalDatabase localDatabase =
+            await LocalDatabase.getLocalDatabase();
+        final DaoProduct daoProduct = DaoProduct(localDatabase);
+        final ProductQueryConfiguration configuration =
+            ProductQueryConfiguration(
+          inputTask.barcode,
+          fields: ProductQuery.fields,
+          language: LanguageHelper.fromJson(inputTask.languageCode),
+          country: ProductQuery.getCountry(),
+        );
+        try {
+          final ProductResult result =
+              await OpenFoodAPIClient.getProduct(configuration);
+          if (result.status == 1) {
+            final Product? product = result.product;
+            if (product != null) {
+              await daoProduct.put(product);
+            }
+          }
+        } catch (e) {
+          debugPrint('Error: $e,Updating to localdatabse failed');
+          // Return true as the task of uploading image is completed successfully
+          // It's just the task of updating the product in the local database is failed
+          // The user can simply refresh it
+          return true;
+        }
+        // Returns true to let platform know that the task is completed
+        return true;
+      }
+    },
+  );
+}
 
 Future<bool> uploadCapturedPicture(
   BuildContext context, {
@@ -13,27 +109,36 @@ Future<bool> uploadCapturedPicture(
   required Uri imageUri,
 }) async {
   final AppLocalizations appLocalizations = AppLocalizations.of(context);
-  final SendImage image = SendImage(
-    lang: ProductQuery.getLanguage(),
+  final BackgroundInputData inputData = BackgroundInputData(
     barcode: barcode,
-    imageField: imageField,
-    imageUri: imageUri,
+    imageField: imageField.value,
+    imageUri: File(imageUri.path).path,
+    counter: 0,
+    languageCode: ProductQuery.getLanguage().code,
   );
-  final Status? result = await LoadingDialog.run<Status>(
-    context: context,
-    future: OpenFoodAPIClient.addProductImage(
-      ProductQuery.getUser(),
-      image,
+
+  await Workmanager().initialize(callbackDispatcher);
+  // generate a random 8 digit word as the task name
+  final SmoothRandom smoothie = SmoothRandom();
+  final String uniqueId =
+      'ImageUploader_${barcode}_${imageField.value}${smoothie.generateRandomString(8)}';
+  await Workmanager().registerOneOffTask(
+    uniqueId,
+    'ImageUploadWorker',
+    constraints: Constraints(
+      networkType: NetworkType.connected,
+    ),
+    inputData: inputData.toJson(),
+  );
+
+  // ignore: use_build_context_synchronously
+  ScaffoldMessenger.of(context).showSnackBar(
+    SnackBar(
+      content: Text(
+        appLocalizations.image_upload_queued,
+      ),
     ),
-    title: appLocalizations.uploading_image,
   );
-  if (result == null || result.error != null || result.status != 'status ok') {
-    await LoadingDialog.error(
-      context: context,
-      title: appLocalizations.error_occurred,
-    );
-    return false;
-  }
   //ignore: use_build_context_synchronously
   await _updateContinuousScanModel(context, barcode);
   return true;

packages/smooth_app/lib/l10n/app_en.arb

@@ -1509,11 +1509,16 @@
         "description": "Button label for taking a photo"
     },
     "choose_from_gallery": "Choose from gallery",
-    "@choose from gallery": {
+    "@choose_from_gallery": {
         "description": "Button label for choosing a photo from gallery"
     },
+    "image_upload_queued": "Image upload queued,the image will be uploaded automatically",
+    "@image_upload_queued": {
+        "description": "Message when a photo is queued for upload"
+    },
     "no_internet_connection": "No internet connection",
     "@no_internet_connection": {
         "description": "Message when there is no internet connection"
     }
+
 }

packages/smooth_app/lib/pages/product/add_new_product_page.dart

@@ -4,6 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/model/Product.dart';
 import 'package:openfoodfacts/model/ProductImage.dart';
+import 'package:provider/provider.dart';
+import 'package:smooth_app/database/dao_product.dart';
+import 'package:smooth_app/database/local_database.dart';
 import 'package:smooth_app/generic_lib/buttons/smooth_large_button_with_icon.dart';
 import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/generic_lib/dialogs/smooth_alert_dialog.dart';
@@ -80,6 +83,21 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
                   action: SmoothActionButton(
                     text: appLocalizations.finish,
                     onPressed: () async {
+                      final LocalDatabase localDatabase =
+                          context.read<LocalDatabase>();
+                      final DaoProduct daoProduct = DaoProduct(localDatabase);
+                      final Product? product =
+                          await daoProduct.get(widget.barcode);
+                      if (product == null) {
+                        final Product product = Product(
+                          barcode: widget.barcode,
+                        );
+                        daoProduct.put(product);
+                        localDatabase.notifyListeners();
+                      }
+                      if (!mounted) {
+                        return;
+                      }
                       await Navigator.maybePop(
                           context, _isProductLoaded ? widget.barcode : null);
                     },
@@ -156,7 +174,6 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
               _isProductLoaded = true;
             });
           }
-          initialPhoto.delete();
         },
       ),
     );
@@ -167,13 +184,19 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
     return Padding(
       padding: _ROW_PADDING_TOP,
       child: Row(
-        mainAxisAlignment: MainAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
           SizedBox(height: 50, child: Image.file(image, fit: BoxFit.cover)),
           Expanded(
-              child: Center(
-                  child: Text(_getPhotoUploadedLabelText(context, imageType),
-                      style: Theme.of(context).textTheme.bodyText1))),
+            child: Center(
+              child: Text(_getAddPhotoButtonText(context, imageType),
+                  style: Theme.of(context).textTheme.bodyText1),
+            ),
+          ),
+          const Icon(
+            Icons.check_box,
+            color: Colors.green,
+          )
         ],
       ),
     );
@@ -195,51 +218,35 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
     }
   }
 
-  String _getPhotoUploadedLabelText(
-      BuildContext context, ImageField imageType) {
-    final AppLocalizations appLocalizations = AppLocalizations.of(context);
-    switch (imageType) {
-      case ImageField.FRONT:
-        return appLocalizations.front_photo_uploaded;
-      case ImageField.INGREDIENTS:
-        return appLocalizations.ingredients_photo_uploaded;
-      case ImageField.NUTRITION:
-        return appLocalizations.nutritional_facts_photo_uploaded;
-      case ImageField.PACKAGING:
-        return appLocalizations.recycling_photo_uploaded;
-      case ImageField.OTHER:
-        return appLocalizations.other_photo_uploaded;
-    }
-  }
-
   bool _isImageUploadedForType(ImageField imageType) {
     return (_uploadedImages[imageType] ?? <File>[]).isNotEmpty;
   }
 
   Widget _buildNutritionInputButton() {
     if (_nutritionFactsAdded) {
       return Padding(
-          padding: _ROW_PADDING_TOP,
-          child: Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: <Widget>[
-              const SizedBox(
-                width: 50.0,
-                child: Icon(
-                  Icons.check,
-                  color: Colors.greenAccent,
-                ),
+        padding: _ROW_PADDING_TOP,
+        child: Row(
+          mainAxisSize: MainAxisSize.max,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: <Widget>[
+            const SizedBox(
+              width: 50.0,
+              child: Icon(
+                Icons.check,
+                color: Colors.greenAccent,
               ),
-              Expanded(
-                child: Center(
-                  child: Text(
-                      AppLocalizations.of(context).nutritional_facts_added,
-                      style: Theme.of(context).textTheme.bodyText1),
-                ),
+            ),
+            Expanded(
+              child: Center(
+                child: Text(
+                    AppLocalizations.of(context).nutritional_facts_added,
+                    style: Theme.of(context).textTheme.bodyText1),
               ),
-            ],
-          ));
+            ),
+          ],
+        ),
+      );
     }
 
     return Padding(