From 948c44e98ce3592723629e805ecf9144a6437116 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Thu, 15 Feb 2018 19:24:01 +0100
Subject: [PATCH] fix rare crash when resizing image in EditProfileActivity &
 prevent upscaling of image

---
 .../tusky/EditProfileActivity.kt              | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
index 602fabf5..6da78305 100644
--- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
@@ -422,41 +422,44 @@ class EditProfileActivity : BaseActivity() {
 
         override fun doInBackground(vararg uris: Uri): Boolean? {
             val uri = uris[0]
-                val inputStream: InputStream?
-                try {
-                    inputStream = contentResolver.openInputStream(uri)
-                } catch (e: FileNotFoundException) {
-                    Log.d(TAG, Log.getStackTraceString(e))
-                    return false
-                }
+            val inputStream: InputStream?
+            try {
+                inputStream = contentResolver.openInputStream(uri)
+            } catch (e: FileNotFoundException) {
+                Log.d(TAG, Log.getStackTraceString(e))
+                return false
+            }
 
-                val sourceBitmap: Bitmap?
-                try {
-                    sourceBitmap = BitmapFactory.decodeStream(inputStream, null, null)
-                } catch (error: OutOfMemoryError) {
-                    Log.d(TAG, Log.getStackTraceString(error))
-                    return false
-                } finally {
-                    IOUtils.closeQuietly(inputStream)
-                }
-                if (sourceBitmap == null) {
-                    return false
-                }
-                val bitmap = Bitmap.createScaledBitmap(sourceBitmap, resizeWidth, resizeHeight, true)
-                sourceBitmap.recycle()
-                if (bitmap == null) {
-                    return false
-                }
+            val sourceBitmap: Bitmap?
+            try {
+                sourceBitmap = BitmapFactory.decodeStream(inputStream, null, null)
+            } catch (error: OutOfMemoryError) {
+                Log.d(TAG, Log.getStackTraceString(error))
+                return false
+            } finally {
+                IOUtils.closeQuietly(inputStream)
+            }
+            if (sourceBitmap == null) {
+                return false
+            }
 
-                resultBitmap = bitmap
+            //dont upscale image if its smaller than the desired size
+            val bitmap =
+                    if(sourceBitmap.width <= resizeWidth && sourceBitmap.height <= resizeHeight) {
+                        sourceBitmap
+                    } else {
+                        Bitmap.createScaledBitmap(sourceBitmap, resizeWidth, resizeHeight, true)
+                    }
 
-                if (!saveBitmapToFile(bitmap, cacheFile)) {
-                    return false
-                }
+            resultBitmap = bitmap
 
-                if (isCancelled) {
-                    return false
-                }
+            if (!saveBitmapToFile(bitmap, cacheFile)) {
+                return false
+            }
+
+            if (isCancelled) {
+                return false
+            }
 
             return true
         }