Combine ImageLoader and CropLoader utility classes.

Bug: 9356969
Bug: 9170644

- Refactor to eliminate code duplication in image loading classes.
- Fix bugs caused by the inability to determine MIME types for images
  that aren't in Gallery's content provider (causes b/9356969).

Change-Id: I30c2ba5c0cd37aac624681a2cec9abddaa78f9c2

1 files changed, 2 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 8b9d57cb9..2da358c2c 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -40,6 +40,7 @@ import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 import com.android.gallery3d.filtershow.pipeline.ImagePreset;
+import com.android.gallery3d.filtershow.tools.SaveCopyTask;
 
 import java.io.File;
 
@@ -394,7 +395,7 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public void saveImage(FilterShowActivity filterShowActivity, File file) {
-        ImageLoader.saveImage(getImagePreset(), filterShowActivity, file);
+        SaveCopyTask.saveImage(getImagePreset(), filterShowActivity, file);
     }