1 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/camera/gallery/BaseImage.java b/src/com/android/camera/gallery/BaseImage.java
index f11cc26..8b521d9 100644
--- a/src/com/android/camera/gallery/BaseImage.java
+++ b/src/com/android/camera/gallery/BaseImage.java
@@ -17,6 +17,7 @@
 package com.android.camera.gallery;
 
 import com.android.camera.BitmapManager;
+import com.android.camera.Util;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
@@ -27,7 +28,6 @@ import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore.Images;
 import android.util.Log;
 
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -74,8 +74,7 @@ public abstract class BaseImage implements IImage {
         }
     }
 
-    private class CompressImageToFile extends BaseCancelable
-            implements IGetBooleanCancelable {
+    private class CompressImageToFile extends BaseCancelable<Boolean> {
         private ThreadSafeOutputStream mOutputStream = null;
 
         private Bitmap mBitmap;
@@ -97,7 +96,7 @@ public abstract class BaseImage implements IImage {
             return false;
         }
 
-        public boolean get() {
+        public Boolean get() {
             try {
                 long t1 = System.currentTimeMillis();
                 OutputStream delegate = mContentResolver.openOutputStream(mUri);
@@ -145,7 +144,7 @@ public abstract class BaseImage implements IImage {
      * @param uri       where to store the bitmap
      * @return          true if we succeeded
      */
-    protected IGetBooleanCancelable compressImageToFile(
+    protected ICancelable<Boolean> compressImageToFile(
             Bitmap bitmap, byte [] jpegData, Uri uri) {
         return new CompressImageToFile(bitmap, jpegData, uri);
     }
@@ -178,8 +177,7 @@ public abstract class BaseImage implements IImage {
         return b;
     }
 
-    private class LoadBitmapCancelable extends BaseCancelable
-            implements IGetBitmapCancelable {
+    private class LoadBitmapCancelable extends BaseCancelable<Bitmap> {
         private ParcelFileDescriptor mPFD;
         private BitmapFactory.Options mOptions = new BitmapFactory.Options();
         private long mCancelInitiationTime;
@@ -224,7 +222,7 @@ public abstract class BaseImage implements IImage {
     }
 
 
-    public IGetBitmapCancelable fullSizeBitmapCancelable(
+    public ICancelable<Bitmap> fullSizeBitmapCancelable(
             int targetWidthHeight) {
         try {
             ParcelFileDescriptor pfdInput = mContentResolver