From 3a14a4473f5a95feba97fc409f609ee2ca2333cb Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 24 Oct 2025 18:18:00 +0000
Subject: [PATCH] More flatpak fixes

---
 .../java/io/xpipe/app/prefs/ExternalApplicationType.java   | 2 +-
 app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java   | 7 ++++++-
 app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java   | 7 ++++++-
 app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java     | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java
index c73fe05eb..41f5ab881 100644
--- a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java
+++ b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java
@@ -135,7 +135,7 @@ public interface ExternalApplicationType extends PrefsValue {
             var app = FlatpakCache.getApp(getFlatpakId());
             if (app.isEmpty()) {
                 throw ErrorEventFactory.expected(new IOException("Executable " + getExecutable()
-                        + " not found in PATH and flatkpak " + getFlatpakId() + " not installed. Install it and refresh the environment by restarting XPipe"));
+                        + " not found in PATH nor as a flatkpak " + getFlatpakId() + " not installed. Install it and refresh the environment by restarting XPipe"));
             }
 
             try (ShellControl pc = LocalShell.getShell()) {
diff --git a/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java
index a6dfd392f..cc9aef486 100644
--- a/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java
+++ b/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java
@@ -16,7 +16,7 @@ import java.util.*;
 @Value
 @Jacksonized
 @Builder
-public class RemminaRdpClient implements ExternalApplicationType.PathApplication, ExternalRdpClient {
+public class RemminaRdpClient implements ExternalApplicationType.LinuxApplication, ExternalRdpClient {
 
     private List<String> toStrip() {
         return List.of("auto connect", "password 51", "prompt for credentials", "smart sizing");
@@ -68,4 +68,9 @@ public class RemminaRdpClient implements ExternalApplicationType.PathApplication
     public String getId() {
         return "app.remmina";
     }
+
+    @Override
+    public String getFlatpakId() throws Exception {
+        return "org.remmina.Remmina";
+    }
 }
diff --git a/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java b/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java
index 37b39fd20..2c2524bc2 100644
--- a/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java
+++ b/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java
@@ -15,7 +15,7 @@ import java.util.Optional;
 @Builder
 @Jacksonized
 @JsonTypeName("remmina")
-public class RemminaVncClient implements ExternalApplicationType.PathApplication, ExternalVncClient {
+public class RemminaVncClient implements ExternalApplicationType.LinuxApplication, ExternalVncClient {
 
     @Override
     public String getExecutable() {
@@ -50,4 +50,9 @@ public class RemminaVncClient implements ExternalApplicationType.PathApplication
     public String getWebsite() {
         return "https://remmina.org/";
     }
+
+    @Override
+    public String getFlatpakId() throws Exception {
+        return "org.remmina.Remmina";
+    }
 }
diff --git a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
index ab8041450..8497e1167 100644
--- a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
+++ b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
@@ -73,7 +73,7 @@ public abstract class TigerVncClient implements ExternalVncClient {
     @Builder
     @Jacksonized
     @JsonTypeName("tigerVnc")
-    public static class Linux extends TigerVncClient implements ExternalApplicationType.PathApplication {
+    public static class Linux extends TigerVncClient implements ExternalApplicationType.LinuxApplication {
 
         @Override
         public void launch(VncLaunchConfig configuration) throws Exception {
@@ -107,6 +107,11 @@ public abstract class TigerVncClient implements ExternalVncClient {
         public boolean detach() {
             return true;
         }
+
+        @Override
+        public String getFlatpakId() throws Exception {
+            return "org.tigervnc.vncviewer";
+        }
     }
 
     @Builder