From dff082ce3e2bbcd52838bf7656d3591fb4cd4f79 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 27 Mar 2023 21:57:15 -0500 Subject: [PATCH] Hide cancel button when onboarding Sort so that cancel comes before prev comes before everything else --- .../eu/siacs/conversations/entities/Conversation.java | 10 +++++++++- 1 file changed, 9 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 256b44181d1e86d3d2fdbb212d3d34b31d6a0d69..43a4ffd7c55b906e5fb5dc2630951c948fb4b2b2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2552,7 +2552,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl if (!actionsAdapter.isEmpty() || fillableFieldCount > 0) { if (command.getAttribute("status").equals("completed") || command.getAttribute("status").equals("canceled")) { actionsAdapter.add(Pair.create("close", "close")); - } else if (actionsAdapter.getPosition("cancel") < 0) { + } else if (actionsAdapter.getPosition("cancel") < 0 && !xmppConnectionService.isOnboarding()) { actionsAdapter.insert(Pair.create("cancel", "cancel"), 0); } } @@ -2562,6 +2562,14 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl actionsAdapter.add(Pair.create("close", "close")); } + actionsAdapter.sort((x, y) -> { + if (x.first.equals("cancel")) return -1; + if (y.first.equals("cancel")) return 1; + if (x.first.equals("prev") && xmppConnectionService.isOnboarding()) return -1; + if (y.first.equals("prev") && xmppConnectionService.isOnboarding()) return 1; + return 0; + }); + Data dataForm = null; if (responseElement != null && responseElement.getName().equals("x") && responseElement.getNamespace().equals("jabber:x:data")) dataForm = Data.parse(responseElement); if (mNode.equals("jabber:iq:register") &&