From 286046020ccfdd0ed453abef6a504814d40ad9b0 Mon Sep 17 00:00:00 2001
From: Manuel Lorenzo <manulorenzop@gmail.com>
Date: Thu, 15 Jun 2023 13:36:24 +0200
Subject: [PATCH 1/2] Fix image upload cancel crash

---
 .../ui/components/common/PictrsImage.kt       | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt b/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
index f2eb79b18..c35b65892 100644
--- a/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
+++ b/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
@@ -1,4 +1,5 @@
 package com.jerboa.ui.components.common
+
 import android.graphics.Bitmap
 import android.net.Uri
 import android.util.Log
@@ -69,7 +70,11 @@ fun CircularIcon(
 }
 
 @Composable
-fun LargerCircularIcon(modifier: Modifier = Modifier, icon: String, contentDescription: String? = null) {
+fun LargerCircularIcon(
+    modifier: Modifier = Modifier,
+    icon: String,
+    contentDescription: String? = null
+) {
     CircularIcon(
         modifier = modifier,
         icon = icon,
@@ -188,11 +193,13 @@ fun PickImage(
     val launcher = rememberLauncherForActivityResult(
         ActivityResultContracts.GetContent(),
     ) { uri ->
-        imageUri = uri
-        bitmap.value = decodeUriToBitmap(ctx, imageUri!!)
-        Log.d("jerboa", "Uploading image...")
-        Log.d("jerboa", imageUri.toString())
-        onPickedImage(uri!!)
+        uri?.let {
+            imageUri = it
+            bitmap.value = decodeUriToBitmap(ctx, it)
+            Log.d("jerboa", "Uploading image...")
+            Log.d("jerboa", imageUri.toString())
+            onPickedImage(it)
+        }
     }
     Column(
         modifier = modifier,
@@ -209,14 +216,11 @@ fun PickImage(
 
         if (showImage) {
             Spacer(modifier = Modifier.height(SMALL_PADDING))
-
-            imageUri?.let {
-                bitmap.value?.let { btm ->
-                    Image(
-                        bitmap = btm.asImageBitmap(),
-                        contentDescription = stringResource(R.string.pickImage_imagePreview),
-                    )
-                }
+            bitmap.value?.let { btm ->
+                Image(
+                    bitmap = btm.asImageBitmap(),
+                    contentDescription = stringResource(R.string.pickImage_imagePreview),
+                )
             }
         }
     }

From 251a85c8b5de018d21550254220c9e6a0ecb3429 Mon Sep 17 00:00:00 2001
From: Manuel Lorenzo <manulorenzop@gmail.com>
Date: Thu, 15 Jun 2023 17:23:26 +0200
Subject: [PATCH 2/2] :lipstick: revert formatting changes

---
 .../java/com/jerboa/ui/components/common/PictrsImage.kt     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt b/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
index c35b65892..9a81cd40a 100644
--- a/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
+++ b/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
@@ -70,11 +70,7 @@ fun CircularIcon(
 }
 
 @Composable
-fun LargerCircularIcon(
-    modifier: Modifier = Modifier,
-    icon: String,
-    contentDescription: String? = null
-) {
+fun LargerCircularIcon(modifier: Modifier = Modifier, icon: String, contentDescription: String? = null) {
     CircularIcon(
         modifier = modifier,
         icon = icon,