From b4661e6a30ba22fc8c2253ca68b5e8b6c6eb2eb6 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 3 May 2023 10:41:04 -0500 Subject: [PATCH] Fix NPE --- .../java/eu/siacs/conversations/entities/Conversation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 41c42d195d822ef1fddf3aa876246e732da9d54e..78e5c0e057dd1cc71fcedb7c7544182518f0fc51 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2641,14 +2641,14 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl return; } - if (command.getAttribute("status").equals("executing") && actionsAdapter.countExceptCancel() < 1 && !actionsCleared) { + if ("executing".equals(command.getAttribute("status")) && actionsAdapter.countExceptCancel() < 1 && !actionsCleared) { // No actions have been given, but we are not done? // This is probably a spec violation, but we should do *something* actionsAdapter.add(Pair.create("execute", "execute")); } if (!actionsAdapter.isEmpty() || fillableFieldCount > 0) { - if (command.getAttribute("status").equals("completed") || command.getAttribute("status").equals("canceled")) { + if ("completed".equals(command.getAttribute("status")) || "canceled".equals(command.getAttribute("status"))) { actionsAdapter.add(Pair.create("close", "close")); } else if (actionsAdapter.getPosition("cancel") < 0 && !xmppConnectionService.isOnboarding()) { actionsAdapter.insert(Pair.create("cancel", "cancel"), 0);