fix restore state not restoring rotation

Author: ArthurHub

README.md

@@ -123,6 +123,7 @@ For more information, see the [GitHub Wiki](https://github.com/ArthurHub/Android
 *2.4.3* (WIP)
 
 - Adding option to omit camera intents on getPickImageChooserIntent (thx Hugo Rossi)
+- Fix restore state not restoring rotation
 
 *2.4.2*
 

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

@@ -181,6 +181,11 @@ public class CropImageView extends FrameLayout {
      */
     private RectF mRestoreCropWindowRect;
 
+    /**
+     * Used to restore image rotation after state restore
+     */
+    private int mRestoreDegreesRotated;
+
     /**
      * Used to detect size change to handle auto-zoom using {@link #handleCropWindowChanged(boolean, boolean)} in
      * {@link #layout(int, int, int, int)}.
@@ -1213,7 +1218,7 @@ public void onRestoreInstanceState(Parcelable state) {
                     }
                 }
 
-                mDegreesRotated = bundle.getInt("DEGREES_ROTATED");
+                mDegreesRotated = mRestoreDegreesRotated = bundle.getInt("DEGREES_ROTATED");
 
                 Rect initialCropRect = bundle.getParcelable("INITIAL_CROP_RECT");
                 if (initialCropRect != null && (initialCropRect.width() > 0 || initialCropRect.height() > 0)) {
@@ -1315,6 +1320,10 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 
                 // after state restore we want to restore the window crop, possible only after widget size is known
                 if (mRestoreCropWindowRect != null) {
+                    if (mRestoreDegreesRotated != mInitialDegreesRotated) {
+                        mDegreesRotated = mRestoreDegreesRotated;
+                        applyImageMatrix(r - l, b - t, true, false);
+                    }
                     mImageMatrix.mapRect(mRestoreCropWindowRect);
                     mCropOverlayView.setCropWindowRect(mRestoreCropWindowRect);
                     handleCropWindowChanged(false, false);