From 23eff8fedcc6283a4c785f3dac85b0c30b342229 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 7 Jun 2022 15:20:57 -0500
Subject: [PATCH] Fix NPE

---
 src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
index a358e60125e086ba59c414884bb6301e5817eff8..b18b4cb57ee19a04fa32892fecbead3795173558 100644
--- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
+++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
@@ -223,7 +223,10 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
         }
         final Jid accountJid = accountJid();
         final OnGatewayResult finish = (final String jidString, final String errorMessage) -> {
-            getActivity().runOnUiThread(() -> {
+            Activity context = getActivity();
+            if (context == null) return; // Race condition, we got the reply after the UI was closed
+
+            context.runOnUiThread(() -> {
                 if (errorMessage != null) {
                     binding.jidLayout.setError(errorMessage);
                     return;