[image_picker]Android update cache

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Update `ImagePickerCache` to save list of images and recover them when it is needed.
+
 ## 0.8.2
 
 * Added new methods that return `package:cross_file` `XFile` instances. [Docs](https://pub.dev/documentation/cross_file/latest/index.html).

packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java

@@ -10,12 +10,16 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.MethodCall;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 class ImagePickerCache {
 
   static final String MAP_KEY_PATH = "path";
+  static final String MAP_KEY_PATH_LIST = "pathList";
   static final String MAP_KEY_MAX_WIDTH = "maxWidth";
   static final String MAP_KEY_MAX_HEIGHT = "maxHeight";
   static final String MAP_KEY_IMAGE_QUALITY = "imageQuality";
@@ -50,7 +54,8 @@ class ImagePickerCache {
   }
 
   void saveTypeWithMethodCallName(String methodCallName) {
-    if (methodCallName.equals(ImagePickerPlugin.METHOD_CALL_IMAGE)) {
+    if (methodCallName.equals(ImagePickerPlugin.METHOD_CALL_IMAGE)
+        | methodCallName.equals(ImagePickerPlugin.METHOD_CALL_MULTI_IMAGE)) {
       setType("image");
     } else if (methodCallName.equals(ImagePickerPlugin.METHOD_CALL_VIDEO)) {
       setType("video");
@@ -99,11 +104,13 @@ String retrievePendingCameraMediaUriPath() {
   }
 
   void saveResult(
-      @Nullable String path, @Nullable String errorCode, @Nullable String errorMessage) {
+      @Nullable ArrayList<String> path, @Nullable String errorCode, @Nullable String errorMessage) {
 
+    Set<String> imageSet = new HashSet<>();
+    imageSet.addAll(path);
     SharedPreferences.Editor editor = prefs.edit();
     if (path != null) {
-      editor.putString(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, path);
+      editor.putStringSet(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, imageSet);
     }
     if (errorCode != null) {
       editor.putString(SHARED_PREFERENCE_ERROR_CODE_KEY, errorCode);
@@ -121,11 +128,14 @@ void clear() {
   Map<String, Object> getCacheMap() {
 
     Map<String, Object> resultMap = new HashMap<>();
+    ArrayList<String> pathList = new ArrayList<>();
     boolean hasData = false;
 
     if (prefs.contains(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY)) {
-      final String imagePathValue = prefs.getString(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, "");
-      resultMap.put(MAP_KEY_PATH, imagePathValue);
+      final Set<String> imagePathList =
+          prefs.getStringSet(FLUTTER_IMAGE_PICKER_IMAGE_PATH_KEY, null);
+      pathList.addAll(imagePathList);
+      resultMap.put(MAP_KEY_PATH_LIST, pathList);
       hasData = true;
     }
 
@@ -159,7 +169,6 @@ Map<String, Object> getCacheMap() {
         resultMap.put(MAP_KEY_IMAGE_QUALITY, 100);
       }
     }
-
     return resultMap;
   }
 }

packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java

@@ -229,17 +229,21 @@ void saveStateBeforeResult() {
 
   void retrieveLostImage(MethodChannel.Result result) {
     Map<String, Object> resultMap = cache.getCacheMap();
-    String path = (String) resultMap.get(cache.MAP_KEY_PATH);
-    if (path != null) {
-      Double maxWidth = (Double) resultMap.get(cache.MAP_KEY_MAX_WIDTH);
-      Double maxHeight = (Double) resultMap.get(cache.MAP_KEY_MAX_HEIGHT);
-      int imageQuality =
-          resultMap.get(cache.MAP_KEY_IMAGE_QUALITY) == null
-              ? 100
-              : (int) resultMap.get(cache.MAP_KEY_IMAGE_QUALITY);
-
-      String newPath = imageResizer.resizeImageIfNeeded(path, maxWidth, maxHeight, imageQuality);
-      resultMap.put(cache.MAP_KEY_PATH, newPath);
+    ArrayList<String> pathList = (ArrayList<String>) resultMap.get(cache.MAP_KEY_PATH_LIST);
+    ArrayList<String> newPathList = new ArrayList<>();
+    if (pathList != null) {
+      for (String path : pathList) {
+        Double maxWidth = (Double) resultMap.get(cache.MAP_KEY_MAX_WIDTH);
+        Double maxHeight = (Double) resultMap.get(cache.MAP_KEY_MAX_HEIGHT);
+        int imageQuality =
+            resultMap.get(cache.MAP_KEY_IMAGE_QUALITY) == null
+                ? 100
+                : (int) resultMap.get(cache.MAP_KEY_IMAGE_QUALITY);
+
+        newPathList.add(imageResizer.resizeImageIfNeeded(path, maxWidth, maxHeight, imageQuality));
+      }
+      resultMap.put(cache.MAP_KEY_PATH_LIST, newPathList);
+      resultMap.put(cache.MAP_KEY_PATH, newPathList.get(0));
     }
     if (resultMap.isEmpty()) {
       result.success(null);
@@ -619,21 +623,21 @@ private boolean setPendingMethodCallAndResult(
 
   private void finishWithSuccess(String imagePath) {
     if (pendingResult == null) {
-      cache.saveResult(imagePath, null, null);
+      ArrayList<String> pathList = new ArrayList<>();
+      pathList.add(imagePath);
+      cache.saveResult(pathList, null, null);
       return;
     }
     pendingResult.success(imagePath);
     clearMethodCallAndResult();
   }
 
-  private void finishWithListSuccess(ArrayList<String> imagePaths) {
+  private void finishWithListSuccess(ArrayList<String> imagePath) {
     if (pendingResult == null) {
-      for (String imagePath : imagePaths) {
-        cache.saveResult(imagePath, null, null);
-      }
+      cache.saveResult(imagePath, null, null);
       return;
     }
-    pendingResult.success(imagePaths);
+    pendingResult.success(imagePath);
     clearMethodCallAndResult();
   }
 

packages/image_picker/image_picker/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -25,7 +25,7 @@ dependencies:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^2.0.1
   image_picker_for_web: ^2.1.0
-  image_picker_platform_interface: ^2.2.0
+  image_picker_platform_interface: ^2.2.1
 
 dev_dependencies:
   flutter_test:

packages/image_picker/image_picker/test/image_picker_deprecated_test.dart

@@ -320,6 +320,41 @@ void main() {
           expect(response.file!.path, '/example/path');
         });
 
+        test('retrieveLostData get success response with pathList', () async {
+          channel.setMockMethodCallHandler((MethodCall methodCall) async {
+            return <String, dynamic>{
+              'type': 'image',
+              'path': '/example/path',
+              'pathList': ['/example/path'],
+            };
+          });
+
+          final LostData response = await picker.getLostData();
+          expect(response.type, RetrieveType.image);
+          expect(response.file, isNotNull);
+          expect(response.file!.path, '/example/path');
+          expect(response.files!.first.path, '/example/path');
+        });
+
+        test('retrieveLostData is failed for multiRetrieve method call',
+            () async {
+          channel.setMockMethodCallHandler((MethodCall methodCall) async {
+            switch (methodCall.method) {
+              case 'multiRetrieve':
+                throw MissingPluginException();
+              case 'retrieve':
+                return <String, dynamic>{
+                  'type': 'image',
+                  'path': '/example/path',
+                  'pathList': null,
+                };
+            }
+          });
+
+          final LostData response = await picker.getLostData();
+          expect(response.files, null);
+        });
+
         test('retrieveLostData get error response', () async {
           channel.setMockMethodCallHandler((MethodCall methodCall) async {
             return <String, String>{

packages/image_picker/image_picker/test/image_picker_test.dart

@@ -315,6 +315,41 @@ void main() {
           expect(response.file!.path, '/example/path');
         });
 
+        test('retrieveLostData get success response with pathList', () async {
+          channel.setMockMethodCallHandler((MethodCall methodCall) async {
+            return <String, dynamic>{
+              'type': 'image',
+              'path': '/example/path',
+              'pathList': ['/example/path'],
+            };
+          });
+
+          final LostDataResponse response = await picker.retrieveLostData();
+          expect(response.type, RetrieveType.image);
+          expect(response.file, isNotNull);
+          expect(response.file!.path, '/example/path');
+          expect(response.files!.first.path, '/example/path');
+        });
+
+        test('retrieveLostData is failed for multiRetrieve method call',
+            () async {
+          channel.setMockMethodCallHandler((MethodCall methodCall) async {
+            switch (methodCall.method) {
+              case 'multiRetrieve':
+                throw MissingPluginException();
+              case 'retrieve':
+                return <String, dynamic>{
+                  'type': 'image',
+                  'path': '/example/path',
+                  'pathList': null,
+                };
+            }
+          });
+
+          final LostDataResponse response = await picker.retrieveLostData();
+          expect(response.files, null);
+        });
+
         test('retrieveLostData get error response', () async {
           channel.setMockMethodCallHandler((MethodCall methodCall) async {
             return <String, String>{