From 8198509806d6da81f2bcc14e12e67b776c395e39 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 17 Jan 2023 10:05:34 -0500
Subject: [PATCH] Fix 2 NPE

---
 .../java/eu/siacs/conversations/entities/Conversation.java     | 3 ++-
 .../eu/siacs/conversations/services/XmppConnectionService.java | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 859af92234dec4febd182aec5769dc8d6c9b51c3..7a8656b50bf5b29459efad7a03c5db34ad8fd80f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1568,7 +1568,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                         binding.text.setTextAppearance(binding.getRoot().getContext(), R.style.TextAppearance_Conversations_Subhead);
                         setTextOrHide(binding.text, cell.reported.getLabel());
                     } else {
-                        SpannableStringBuilder text = new SpannableStringBuilder(cell.el.findChildContent("value", "jabber:x:data"));
+                        String value = cell.el.findChildContent("value", "jabber:x:data");
+                        SpannableStringBuilder text = new SpannableStringBuilder(value == null ? "" : value);
                         if (cell.reported.getType().equals(Optional.of("jid-single"))) {
                             text.setSpan(new FixedURLSpan("xmpp:" + Jid.ofEscaped(text.toString()).toEscapedString()), 0, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                         }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 9598c04eb58e954faa1b5b983f99c51e0cde1fce..e0c5840ef8e0e768c805576f43b97f3d42520d87 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1899,6 +1899,8 @@ public class XmppConnectionService extends Service {
         }
         account.removeBookmark(bookmark);
         final XmppConnection connection = account.getXmppConnection();
+        if (connection == null) return;
+
         if (connection.getFeatures().bookmarks2()) {
             IqPacket request = mIqGenerator.deleteItem(Namespace.BOOKMARKS2, bookmark.getJid().asBareJid().toEscapedString());
             sendIqPacket(account, request, (a, response) -> {