From 1663502d357e310a428195ce6e3b8a716146c6b0 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 16:16:34 +0100 Subject: [PATCH] avoid NPE in processComposeControls --- .../java/org/thoughtcrime/securesms/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 954c7610b..f0db43f5b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -1111,7 +1111,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg); Util.runOnMain(() -> { try { - progressDialog.dismiss(); + if (progressDialog != null) progressDialog.dismiss(); } catch (final IllegalArgumentException e) { // The activity is finishing/destroyed, do nothing. }