on onSaveInstanceState save bitmap to temp file on disk to be restored instead of saving the bitmap into parcel

Author: ArthurHub

cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java

@@ -315,6 +315,32 @@ private static void fixRectForAspectRatio(Rect rect, int aspectRatioX, int aspec
         }
     }
 
+    /**
+     * Write given bitmap to a temp file.
+     * If file already exists no-op as we already saved the file in this session.
+     * Uses JPEG 95% compression.
+     *
+     * @param uri the uri to write the bitmap to, if null
+     * @return the uri where the image was saved in, either the given uri or new pointing to temp file.
+     */
+    static Uri writeTempStateStoreBitmap(Context context, Bitmap bitmap, Uri uri) {
+        try {
+            boolean needSave = true;
+            if (uri == null) {
+                uri = Uri.fromFile(File.createTempFile("aic_state_store_temp", ".jpg", context.getCacheDir()));
+            } else if (new File(uri.getPath()).exists()) {
+                needSave = false;
+            }
+            if (needSave) {
+                writeBitmapToUri(context, bitmap, uri, Bitmap.CompressFormat.JPEG, 95);
+            }
+            return uri;
+        } catch (Exception e) {
+            Log.w("AIC", "Failed to write bitmap to temp file for image-cropper save instance state", e);
+            return null;
+        }
+    }
+
     /**
      * Write the given bitmap to the given uri using the given compression.
      */

cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java

@@ -187,6 +187,11 @@ public class CropImageView extends FrameLayout {
      */
     private boolean mSizeChanged;
 
+    /**
+     * Temp URI used to save bitmap image to disk to preserve for instance state in case cropped was set with bitmap
+     */
+    private Uri mSaveInstanceStateBitmapUri;
+
     /**
      * Task used to load bitmap async from UI thread
      */
@@ -829,7 +834,7 @@ public void setOnCropImageCompleteListener(OnCropImageCompleteListener listener)
      */
     public void setImageBitmap(Bitmap bitmap) {
         mCropOverlayView.setInitialCropWindowRect(null);
-        setBitmap(bitmap);
+        setBitmap(bitmap, 0, null, 1, 0);
     }
 
     /**
@@ -865,7 +870,7 @@ public void setImageResource(int resId) {
         if (resId != 0) {
             mCropOverlayView.setInitialCropWindowRect(null);
             Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resId);
-            setBitmap(bitmap, resId);
+            setBitmap(bitmap, resId, null, 1, 0);
         }
     }
 
@@ -1000,7 +1005,7 @@ void onSetImageUriAsyncComplete(BitmapLoadingWorkerTask.Result result) {
 
         if (result.error == null) {
             mInitialDegreesRotated = result.degreesRotated;
-            setBitmap(result.bitmap, result.uri, result.loadSampleSize, result.degreesRotated);
+            setBitmap(result.bitmap, 0, result.uri, result.loadSampleSize, result.degreesRotated);
         }
 
         OnSetImageUriCompleteListener listener = mOnSetImageUriCompleteListener;
@@ -1027,27 +1032,6 @@ void onImageCroppingAsyncComplete(BitmapCroppingWorkerTask.Result result) {
         }
     }
 
-    /**
-     * {@link #setBitmap(Bitmap, int, Uri, int, int)}}
-     */
-    private void setBitmap(Bitmap bitmap) {
-        setBitmap(bitmap, 0, null, 1, 0);
-    }
-
-    /**
-     * {@link #setBitmap(Bitmap, int, Uri, int, int)}}
-     */
-    private void setBitmap(Bitmap bitmap, int imageResource) {
-        setBitmap(bitmap, imageResource, null, 1, 0);
-    }
-
-    /**
-     * {@link #setBitmap(Bitmap, int, Uri, int, int)}}
-     */
-    private void setBitmap(Bitmap bitmap, Uri imageUri, int loadSampleSize, int degreesRotated) {
-        setBitmap(bitmap, 0, imageUri, loadSampleSize, degreesRotated);
-    }
-
     /**
      * Set the given bitmap to be used in for cropping<br>
      * Optionally clear full if the bitmap is new, or partial clear if the bitmap has been manipulated.
@@ -1098,6 +1082,7 @@ private void clearImageInt() {
         mZoomOffsetX = 0;
         mZoomOffsetY = 0;
         mImageMatrix.reset();
+        mSaveInstanceStateBitmapUri = null;
 
         mImageView.setImageBitmap(null);
 
@@ -1151,18 +1136,16 @@ public void startCropWorkerTask(int reqWidth, int reqHeight, RequestSizeOptions
 
     @Override
     public Parcelable onSaveInstanceState() {
-        if (mLoadedImageUri == null && mBitmap == null) {
+        if (mLoadedImageUri == null && mBitmap == null && mImageResource < 1) {
             return super.onSaveInstanceState();
         }
 
         Bundle bundle = new Bundle();
-        bundle.putParcelable("instanceState", super.onSaveInstanceState());
-        bundle.putParcelable("LOADED_IMAGE_URI", mLoadedImageUri);
-        bundle.putInt("LOADED_IMAGE_RESOURCE", mImageResource);
-        if (mLoadedImageUri == null && mImageResource < 1) {
-            bundle.putParcelable("SET_BITMAP", mBitmap);
+        Uri imageUri = mLoadedImageUri;
+        if (imageUri == null && mImageResource < 1) {
+            mSaveInstanceStateBitmapUri = imageUri = BitmapUtils.writeTempStateStoreBitmap(getContext(), mBitmap, mSaveInstanceStateBitmapUri);
         }
-        if (mLoadedImageUri != null && mBitmap != null) {
+        if (imageUri != null && mBitmap != null) {
             String key = UUID.randomUUID().toString();
             BitmapUtils.mStateBitmap = new Pair<>(key, new WeakReference<>(mBitmap));
             bundle.putString("LOADED_IMAGE_STATE_BITMAP_KEY", key);
@@ -1173,6 +1156,9 @@ public Parcelable onSaveInstanceState() {
                 bundle.putParcelable("LOADING_IMAGE_URI", task.getUri());
             }
         }
+        bundle.putParcelable("instanceState", super.onSaveInstanceState());
+        bundle.putParcelable("LOADED_IMAGE_URI", imageUri);
+        bundle.putInt("LOADED_IMAGE_RESOURCE", mImageResource);
         bundle.putInt("LOADED_SAMPLE_SIZE", mLoadedSampleSize);
         bundle.putInt("DEGREES_ROTATED", mDegreesRotated);
         bundle.putParcelable("INITIAL_CROP_RECT", mCropOverlayView.getInitialCropWindowRect());
@@ -1207,9 +1193,9 @@ public void onRestoreInstanceState(Parcelable state) {
                     if (key != null) {
                         Bitmap stateBitmap = BitmapUtils.mStateBitmap != null && BitmapUtils.mStateBitmap.first.equals(key)
                                 ? BitmapUtils.mStateBitmap.second.get() : null;
+                        BitmapUtils.mStateBitmap = null;
                         if (stateBitmap != null && !stateBitmap.isRecycled()) {
-                            BitmapUtils.mStateBitmap = null;
-                            setBitmap(stateBitmap, uri, bundle.getInt("LOADED_SAMPLE_SIZE"), 0);
+                            setBitmap(stateBitmap, 0, uri, bundle.getInt("LOADED_SAMPLE_SIZE"), 0);
                         }
                     }
                     if (mLoadedImageUri == null) {
@@ -1220,14 +1206,9 @@ public void onRestoreInstanceState(Parcelable state) {
                     if (resId > 0) {
                         setImageResource(resId);
                     } else {
-                        Bitmap bitmap = bundle.getParcelable("SET_BITMAP");
-                        if (bitmap != null) {
-                            setBitmap(bitmap);
-                        } else {
-                            uri = bundle.getParcelable("LOADING_IMAGE_URI");
-                            if (uri != null) {
-                                setImageUriAsync(uri);
-                            }
+                        uri = bundle.getParcelable("LOADING_IMAGE_URI");
+                        if (uri != null) {
+                            setImageUriAsync(uri);
                         }
                     }
                 }