mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-22 15:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

More flatpak fixes

Browse Source
This commit is contained in:
crschnick
2025-10-24 18:18:00 +00:00
parent 23c17b12f6
commit 3a14a4473f
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java
View File

@@ -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()) {

7
app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java
View File

@@ -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";
}
}

7
app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java
View File

@@ -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";
}
}

7
app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java
View File

@@ -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