fix rare crash when resizing image in EditProfileActivity & prevent upscaling of image

7 years ago · 948c44e98c
parent 214bde416f
commit 948c44e98c
1 changed files with 34 additions and 31 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
@ -442,10 +442,13 @@ class EditProfileActivity : BaseActivity() {
            if (sourceBitmap == null) {
                return false
            }
-                val bitmap = Bitmap.createScaledBitmap(sourceBitmap, resizeWidth, resizeHeight, true)
-                sourceBitmap.recycle()
-                if (bitmap == null) {
-                    return false
+
+            //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)
                    }

            resultBitmap = bitmap