Do not crop after pick cancelled

CHANGELOG.md

@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - `Security` in case of vulnerabilities.
 
 ## [unreleased x.x.x] -
+### Fixed
+- After cropping a camera image, cancelling library picker shows again the last cropped image [#162](https://github.com/CanHub/Android-Image-Cropper/issues/162)
 
 ## [3.2.1] - 14/07/21
 ### Fixed

cropper/src/main/java/com/canhub/cropper/PickImageContract.kt

@@ -1,5 +1,6 @@
 package com.canhub.cropper
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -37,6 +38,10 @@ open class PickImageContract : ActivityResultContract<Boolean, Uri?>() {
         resultCode: Int,
         intent: Intent?
     ): Uri? {
+        if (resultCode == Activity.RESULT_CANCELED) {
+            context = null
+            return null
+        }
         context?.let {
             context = null
             return getPickImageResultUriContent(it, intent)

cropper/src/test/java/com/canhub/cropper/PickImageContractTest.kt

@@ -57,4 +57,28 @@ class PickImageContractTest {
         // THEN
         assertEquals(expected, result)
     }
+
+    @Test
+    fun `GIVEN pick image contract and previous image selection, WHEN cancelling image pick, THEN no uri should be returned`() {
+        // GIVEN
+        var firstFragment: ContractTestFragment? = null
+        var secondFragment: ContractTestFragment? = null
+        val firstSelection = "content://testResult".toUri()
+        with(launchFragmentInContainer { ContractTestFragment(testRegistry) }) {
+            onFragment { firstFragment = it }
+        }
+        firstFragment?.pickImageIntent(true)
+        firstFragment?.pickImage?.contract?.parseResult(Activity.RESULT_OK, Intent().apply { data = firstSelection })
+        with(launchFragmentInContainer { ContractTestFragment(testRegistry) }) {
+            onFragment { secondFragment = it }
+        }
+
+        // WHEN
+        secondFragment?.pickImageIntent(true)
+        val resultIntent = Intent()
+        val result = secondFragment?.pickImage?.contract?.parseResult(Activity.RESULT_CANCELED, resultIntent)
+
+        // THEN
+        assertEquals(null, result)
+    }
 }