Correctly close resources in BitmapUtils. (#440)

* Correctly close resources in BitmapUtils.

* Code Review.

Author: vanniktech

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added options to customize colors of toolbar back button, title and menu texts. [#437](https://github.com/CanHub/Android-Image-Cropper/issues/437)
 ### Fixed
 - Fixed and issue where setting toolbar color to white would do nothing. [#437](https://github.com/CanHub/Android-Image-Cropper/issues/437)
+- Correctly close resources in BitmapUtils. [#440](https://github.com/CanHub/Android-Image-Cropper/issues/440)
 
 ## [4.3.2] - 08/09/2022
 ### Fixed

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

@@ -149,7 +149,7 @@ class BitmapCroppingWorkerJob(
             this.sampleSize = sampleSize
         }
 
-        constructor(uri: Uri?, sampleSize: Int) {
+        constructor(uri: Uri, sampleSize: Int) {
             bitmap = null
             this.uri = uri
             error = null

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

@@ -17,12 +17,9 @@ import androidx.exifinterface.media.ExifInterface
 import com.canhub.cropper.CropImageView.RequestSizeOptions
 import com.canhub.cropper.common.CommonVersionCheck.isAtLeastQ29
 import com.canhub.cropper.utils.getUriForFile
-import java.io.Closeable
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
 import java.lang.ref.WeakReference
 import javax.microedition.khronos.egl.EGL10
 import javax.microedition.khronos.egl.EGLConfig
@@ -426,23 +423,19 @@ internal object BitmapUtils {
         compressFormat: CompressFormat,
         compressQuality: Int,
         customOutputUri: Uri?,
-    ): Uri? {
+    ): Uri {
         val newUri = customOutputUri ?: buildUri(context, compressFormat)
-        var outputStream: OutputStream? = null
-        try {
-            outputStream = context.contentResolver.openOutputStream(newUri!!, WRITE_AND_TRUNCATE)
 
-            bitmap.compress(compressFormat, compressQuality, outputStream)
-        } finally {
-            closeSafe(outputStream)
+        return context.contentResolver.openOutputStream(newUri, WRITE_AND_TRUNCATE).use {
+            bitmap.compress(compressFormat, compressQuality, it)
+            newUri
         }
-        return newUri
     }
 
     private fun buildUri(
         context: Context,
         compressFormat: CompressFormat
-    ): Uri? =
+    ): Uri =
         try {
             val ext = when (compressFormat) {
                 CompressFormat.JPEG -> ".jpg"
@@ -668,16 +661,12 @@ internal object BitmapUtils {
      */
     @Throws(FileNotFoundException::class)
     private fun decodeImageForOption(resolver: ContentResolver, uri: Uri): BitmapFactory.Options {
-        var stream: InputStream? = null
-        return try {
-            stream = resolver.openInputStream(uri)
+        return resolver.openInputStream(uri).use {
             val options = BitmapFactory.Options()
             options.inJustDecodeBounds = true
-            BitmapFactory.decodeStream(stream, EMPTY_RECT, options)
+            BitmapFactory.decodeStream(it, EMPTY_RECT, options)
             options.inJustDecodeBounds = false
             options
-        } finally {
-            closeSafe(stream)
         }
     }
 
@@ -692,14 +681,12 @@ internal object BitmapUtils {
         options: BitmapFactory.Options
     ): Bitmap? {
         do {
-            var stream: InputStream? = null
-            try {
-                stream = resolver.openInputStream(uri)
-                return BitmapFactory.decodeStream(stream, EMPTY_RECT, options)
-            } catch (e: OutOfMemoryError) {
-                options.inSampleSize *= 2
-            } finally {
-                closeSafe(stream)
+            resolver.openInputStream(uri).use {
+                try {
+                    return BitmapFactory.decodeStream(it, EMPTY_RECT, options)
+                } catch (e: OutOfMemoryError) {
+                    options.inSampleSize *= 2
+                }
             }
         } while (options.inSampleSize <= 512)
         throw CropException.FailedToDecodeImage(uri)
@@ -727,21 +714,25 @@ internal object BitmapUtils {
                         rect.width(), rect.height(), reqWidth, reqHeight
                     )
                 )
-            val stream = context.contentResolver.openInputStream(uri)
-            val decoder = BitmapRegionDecoder.newInstance(stream!!, false)
-            do {
+
+            context.contentResolver.openInputStream(uri).use {
+                val decoder = BitmapRegionDecoder.newInstance(it!!, false)
+
                 try {
-                    return BitmapSampled(
-                        decoder!!.decodeRegion(rect, options),
-                        options.inSampleSize
-                    )
-                } catch (e: OutOfMemoryError) {
-                    options.inSampleSize *= 2
+                    do {
+                        try {
+                            return BitmapSampled(
+                                decoder!!.decodeRegion(rect, options),
+                                options.inSampleSize
+                            )
+                        } catch (e: OutOfMemoryError) {
+                            options.inSampleSize *= 2
+                        }
+                    } while (options.inSampleSize <= 512)
+                } finally {
+                    decoder?.recycle()
                 }
-            } while (options.inSampleSize <= 512)
-
-            closeSafe(stream)
-            decoder?.recycle()
+            }
         } catch (e: Exception) {
             throw CropException.FailedToLoadBitmap(uri, e.message)
         }
@@ -934,19 +925,6 @@ internal object BitmapUtils {
             }
         }
 
-    /**
-     * Close the given closeable object (Stream) in a safe way: check if it is null and catch-log
-     * exception thrown.
-     *
-     * @param closeable the closable object to close
-     */
-    private fun closeSafe(closeable: Closeable?) {
-        try {
-            closeable?.close()
-        } catch (ignored: IOException) {
-        }
-    }
-
     /**
      * Holds bitmap instance and the sample size that the bitmap was loaded/cropped with.
      */