From 617ceb24291318732082654f37216c7da4adfb48 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 6 Apr 2022 08:29:39 -0500
Subject: [PATCH] Fix NPE

---
 src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java | 3 ++-
 1 file changed, 2 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 81790fd03..a358e6012 100644
--- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
+++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
@@ -159,10 +159,11 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
             @Override
             public void onItemSelected(AdapterView accountSpinner, View view, int position, long id) {
                 XmppActivity context = (XmppActivity) getActivity();
-                if (context.xmppConnectionService == null || accountJid() == null) return;
+                if (context == null || context.xmppConnectionService == null || accountJid() == null) return;
 
                 gatewayListAdapter.clear();
                 final Account account = context.xmppConnectionService.findAccountByJid(accountJid());
+                if (account == null) return;
 
                 for (final Contact contact : account.getRoster().getContacts()) {
                     if (contact.showInRoster() && (contact.getPresences().anyIdentity("gateway", null) || contact.getPresences().anySupport("jabber:iq:gateway"))) {