From b146b9bb275f7ab77e818865dd01fa09bb82b372 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 27 Nov 2023 16:57:18 +0000
Subject: [PATCH] Disable help

---
 app/src/main/java/io/xpipe/app/Main.java      |  7 ++++++
 .../xpipe/app/launcher/LauncherCommand.java   |  4 ++--
 .../app/launcher/LauncherHelpCommand.java     | 23 -------------------
 .../java/io/xpipe/app/util/UnlockAlert.java   |  2 +-
 4 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 app/src/main/java/io/xpipe/app/launcher/LauncherHelpCommand.java

diff --git a/app/src/main/java/io/xpipe/app/Main.java b/app/src/main/java/io/xpipe/app/Main.java
index 5801e943..71de2842 100644
--- a/app/src/main/java/io/xpipe/app/Main.java
+++ b/app/src/main/java/io/xpipe/app/Main.java
@@ -12,6 +12,13 @@ public class Main {
             return;
         }
 
+        // Since this is not marked as a console application, it will not print anything when you run it in a console
+        // So sadly there can't be a help command
+//        if (args.length == 1 && args[0].equals("--help")) {
+//            System.out.println("HELP");
+//            return;
+//        }
+
         OperationMode.init(args);
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
index d786b2bb..7e0a55c7 100644
--- a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
+++ b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
@@ -24,8 +24,8 @@ import java.util.concurrent.Callable;
 @CommandLine.Command(
         header = "Launches the XPipe daemon.",
         sortOptions = false,
-        showEndOfOptionsDelimiterInUsageHelp = true,
-subcommands = {LauncherHelpCommand.class})
+        showEndOfOptionsDelimiterInUsageHelp = true
+)
 public class LauncherCommand implements Callable<Integer> {
 
     @CommandLine.Option(
diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherHelpCommand.java b/app/src/main/java/io/xpipe/app/launcher/LauncherHelpCommand.java
deleted file mode 100644
index 5ba7fcff..00000000
--- a/app/src/main/java/io/xpipe/app/launcher/LauncherHelpCommand.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.xpipe.app.launcher;
-
-import picocli.CommandLine;
-
-import java.util.concurrent.Callable;
-
-@CommandLine.Command(
-        name = "--help",
-        header = "Displays help information",
-        helpCommand = true
-)
-public class LauncherHelpCommand implements Callable<Integer> {
-
-    @Override
-    public Integer call() {
-        System.out.println("""
-                HELP
-                
-                COMMAND!
-                """);
-        return 0;
-    }
-}
diff --git a/app/src/main/java/io/xpipe/app/util/UnlockAlert.java b/app/src/main/java/io/xpipe/app/util/UnlockAlert.java
index a1b89784..4f16a352 100644
--- a/app/src/main/java/io/xpipe/app/util/UnlockAlert.java
+++ b/app/src/main/java/io/xpipe/app/util/UnlockAlert.java
@@ -47,7 +47,7 @@ public class UnlockAlert {
                     .ifPresentOrElse(t -> {}, () -> canceled.set(true));
 
             if (canceled.get()) {
-                ErrorEvent.fromMessage("Unlock cancelled").term().omit().handle();
+                ErrorEvent.fromMessage("Unlock cancelled").expected().term().omit().handle();
                 return;
             }