Merge pull request #332 from Vantablack/fix-parcel

Fix class not found when unmarshalling for Samsung devices

Author: ArthurHub

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

@@ -30,6 +30,7 @@
 import android.graphics.RectF;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.MediaStore;
@@ -453,8 +454,10 @@ public Intent getIntent(@NonNull Context context, @Nullable Class<?> cls) {
 
             Intent intent = new Intent();
             intent.setClass(context, cls);
-            intent.putExtra(CROP_IMAGE_EXTRA_SOURCE, mSource);
-            intent.putExtra(CROP_IMAGE_EXTRA_OPTIONS, mOptions);
+            Bundle b = new Bundle();
+            b.putParcelable(CROP_IMAGE_EXTRA_SOURCE, mSource);
+            b.putParcelable(CROP_IMAGE_EXTRA_OPTIONS, mOptions);
+            intent.putExtra("bundle", b);
             return intent;
         }
 

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

@@ -62,9 +62,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         mCropImageView = (CropImageView) findViewById(R.id.cropImageView);
 
-        Intent intent = getIntent();
-        mCropImageUri = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_SOURCE);
-        mOptions = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_OPTIONS);
+        Bundle bundle = getIntent().getBundleExtra("bundle");
+        mCropImageUri = bundle.getParcelable(CropImage.CROP_IMAGE_EXTRA_SOURCE);
+        mOptions = bundle.getParcelable(CropImage.CROP_IMAGE_EXTRA_OPTIONS);
 
         if (savedInstanceState == null) {
             if (mCropImageUri == null || mCropImageUri.equals(Uri.EMPTY)) {