From eb826b278600b5108836a109b67cfb8c02aa1e6f Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 5 Jan 2026 12:51:29 -0400
Subject: [PATCH] Fix crash when rotating device in emoji reaction picker.

Adds null check for selectedConversationModel in hideInternal() to
prevent NPE when hide() is called after the overlay has already been
hidden during configuration changes.

Fixes #14491
---
 .../securesms/conversation/ConversationReactionOverlay.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 834bed6d96..3c4eb3dfcf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -407,6 +407,10 @@ public final class ConversationReactionOverlay extends FrameLayout {
   }
 
   private void hideInternal(@Nullable OnHideListener onHideListener) {
+    if (overlayState == OverlayState.HIDDEN || selectedConversationModel == null) {
+      return;
+    }
+
     overlayState = OverlayState.HIDDEN;
 
     AnimatorSet animatorSet = newHideAnimatorSet();