[image_picker]Android update cache

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.8.2
+
+* Update cache system to save list of images and retrieve them when it is needed. On Android, 
+`getLostData` will return `LostData` object that has new `List<PickedFile>` property to get multiple lost images.
+
 ## 0.8.1+3
 
 * Fix image picker causing a crash when the cache directory is deleted.

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);
@@ -489,7 +493,7 @@ private void handleChooseImageResult(int resultCode, Intent data) {
     }
 
     // User cancelled choosing a picture.
-    finishWithSuccess(null);
+    finishWithSuccess(null, false);
   }
 
   private void handleChooseMultiImageResult(int resultCode, Intent intent) {
@@ -507,7 +511,7 @@ private void handleChooseMultiImageResult(int resultCode, Intent intent) {
     }
 
     // User cancelled choosing a picture.
-    finishWithSuccess(null);
+    finishWithSuccess(null, false);
   }
 
   private void handleChooseVideoResult(int resultCode, Intent data) {
@@ -518,7 +522,7 @@ private void handleChooseVideoResult(int resultCode, Intent data) {
     }
 
     // User cancelled choosing a picture.
-    finishWithSuccess(null);
+    finishWithSuccess(null, false);
   }
 
   private void handleCaptureImageResult(int resultCode) {
@@ -537,7 +541,7 @@ public void onPathReady(String path) {
     }
 
     // User cancelled taking a picture.
-    finishWithSuccess(null);
+    finishWithSuccess(null, false);
   }
 
   private void handleCaptureVideoResult(int resultCode) {
@@ -556,7 +560,7 @@ public void onPathReady(String path) {
     }
 
     // User cancelled taking a picture.
-    finishWithSuccess(null);
+    finishWithSuccess(null, false);
   }
 
   private void handleMultiImageResult(
@@ -573,21 +577,23 @@ private void handleMultiImageResult(
         }
         paths.set(i, finalImagePath);
       }
-      finishWithListSuccess(paths);
+      finishWithSuccess(paths, true);
     }
   }
 
   private void handleImageResult(String path, boolean shouldDeleteOriginalIfScaled) {
+    ArrayList<String> imageList = new ArrayList<String>();
     if (methodCall != null) {
       String finalImagePath = getResizedImagePath(path);
       //delete original file if scaled
       if (finalImagePath != null && !finalImagePath.equals(path) && shouldDeleteOriginalIfScaled) {
         new File(path).delete();
       }
-      finishWithSuccess(finalImagePath);
+      imageList.add(finalImagePath);
     } else {
-      finishWithSuccess(path);
+      imageList.add(path);
     }
+    finishWithSuccess(imageList, false);
   }
 
   private String getResizedImagePath(String path) {
@@ -599,7 +605,9 @@ private String getResizedImagePath(String path) {
   }
 
   private void handleVideoResult(String path) {
-    finishWithSuccess(path);
+    ArrayList<String> imageList = new ArrayList<String>();
+    imageList.add(path);
+    finishWithSuccess(imageList, false);
   }
 
   private boolean setPendingMethodCallAndResult(
@@ -617,23 +625,17 @@ private boolean setPendingMethodCallAndResult(
     return true;
   }
 
-  private void finishWithSuccess(String imagePath) {
+  private void finishWithSuccess(ArrayList<String> imagePath, boolean isMultiImage) {
     if (pendingResult == null) {
       cache.saveResult(imagePath, null, null);
       return;
     }
-    pendingResult.success(imagePath);
-    clearMethodCallAndResult();
-  }
 
-  private void finishWithListSuccess(ArrayList<String> imagePaths) {
-    if (pendingResult == null) {
-      for (String imagePath : imagePaths) {
-        cache.saveResult(imagePath, null, null);
-      }
-      return;
+    if (isMultiImage || imagePath == null) {
+      pendingResult.success(imagePath);
+    } else {
+      pendingResult.success(imagePath.get(0));
     }
-    pendingResult.success(imagePaths);
     clearMethodCallAndResult();
   }
 

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

@@ -94,6 +94,7 @@ public void onActivityStopped(Activity activity) {
   static final String METHOD_CALL_MULTI_IMAGE = "pickMultiImage";
   static final String METHOD_CALL_VIDEO = "pickVideo";
   private static final String METHOD_CALL_RETRIEVE = "retrieve";
+  private static final String METHOD_CALL_MULTI_RETRIEVE = "multiRetrieve";
   private static final int CAMERA_DEVICE_FRONT = 1;
   private static final int CAMERA_DEVICE_REAR = 0;
   private static final String CHANNEL = "plugins.flutter.io/image_picker";
@@ -320,6 +321,7 @@ public void onMethodCall(MethodCall call, MethodChannel.Result rawResult) {
         }
         break;
       case METHOD_CALL_RETRIEVE:
+      case METHOD_CALL_MULTI_RETRIEVE:
         delegate.retrieveLostImage(result);
         break;
       default:

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.1+3
+version: 0.8.2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"