fix misskey cancel reaction crash

DimensionDev · Jan 7, 2025 · 204c771 · 204c771
1 parent bc5ac37
commit 204c771
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/app/src/main/java/dev/dimension/flare/ui/component/NetworkImage.kt b/app/src/main/java/dev/dimension/flare/ui/component/NetworkImage.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.isUnspecified
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.graphics.FilterQuality
@@ -92,7 +93,11 @@ internal fun EmojiImage(
         val aspectRatio =
             remember(painter.intrinsicSize) {
                 val size = painter.intrinsicSize
-                (size.width / size.height).takeUnless { it.isNaN() } ?: 1f
+                if (size.isUnspecified) {
+                    1f
+                } else {
+                    (size.width / size.height).takeUnless { it.isNaN() } ?: 1f
+                }
             }
         Image(
             painter = painter,

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -386,12 +386,20 @@ internal fun Note.renderStatus(
                 StatusAction.Item.Reaction(
                     reacted = myReaction != null,
                     onClicked = {
-                        launcher.launch(
-                            AppDeepLink.Misskey.AddReaction(
-                                accountKey = accountKey,
+                        if (myReaction == null) {
+                            launcher.launch(
+                                AppDeepLink.Misskey.AddReaction(
+                                    accountKey = accountKey,
+                                    statusKey = statusKey,
+                                ),
+                            )
+                        } else {
+                            event.react(
                                 statusKey = statusKey,
-                            ),
-                        )
+                                hasReacted = true,
+                                reaction = myReaction,
+                            )
+                        }
                     },
                 ),
                 StatusAction.Group(