From cf626740e3fcbe94c759f510781a33901c2f94de Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Tue, 23 Sep 2025 17:09:03 +0000
Subject: [PATCH] Check for freerdp3

---
 .../java/io/xpipe/app/rdp/FreeRdpClient.java  | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/rdp/FreeRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/FreeRdpClient.java
index ffd7ad418..399942afc 100644
--- a/app/src/main/java/io/xpipe/app/rdp/FreeRdpClient.java
+++ b/app/src/main/java/io/xpipe/app/rdp/FreeRdpClient.java
@@ -16,21 +16,22 @@ import lombok.extern.jackson.Jacksonized;
 @Value
 @Jacksonized
 @Builder
-public class FreeRdpClient implements ExternalApplicationType.PathApplication, ExternalRdpClient {
+public class FreeRdpClient implements ExternalRdpClient {
 
     @Override
     public void launch(RdpLaunchConfig configuration) throws Exception {
-        CommandSupport.isInPathOrThrow(
-                LocalShell.getShell(),
-                getExecutable(),
-                "XFreeRDP",
-                DataStorage.get().local());
+        var v3 = LocalShell.getShell().view().findProgram("xfreerdp3");
+        if (v3.isEmpty()) {
+            CommandSupport.isInPathOrThrow(LocalShell.getShell(), getExecutable(), "xfreerdp", DataStorage.get().local());
+        }
 
         var file = writeRdpConfigFile(configuration.getTitle(), configuration.getConfig());
+        // macOS uses xfreerdp3 by default
+        var isV3Executable = v3.isPresent() || OsType.ofLocal() == OsType.MACOS;
         var b = CommandBuilder.of()
-                .add(getExecutable())
+                .add(v3.isPresent() ? "xfreerdp3" : "xfreerdp")
                 .addFile(file.toString())
-                .add(OsType.ofLocal() == OsType.LINUX ? "/cert-ignore" : "/cert:ignore")
+                .add(isV3Executable ? "/cert:ignore" : "/cert-ignore")
                 .add("/dynamic-resolution")
                 .add("/network:auto")
                 .add("/compression")
@@ -59,16 +60,6 @@ public class FreeRdpClient implements ExternalApplicationType.PathApplication, E
         return "https://www.freerdp.com/";
     }
 
-    @Override
-    public String getExecutable() {
-        return "xfreerdp";
-    }
-
-    @Override
-    public boolean detach() {
-        return true;
-    }
-
     @Override
     public String getId() {
         return "app.xfreeRdp";