nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-26 18:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sirjonasxx/G-Earth

Browse Source
This commit is contained in:
sirjonasxx 2022-05-03 06:13:48 +02:00
commit 765dbd6f01
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java
View File

@ -25,7 +25,7 @@ public class NitroWindows implements NitroOsFunctions {
@Override @Override
public boolean isRootCertificateTrusted(File certificate) { public boolean isRootCertificateTrusted(File certificate) {
try { try {
final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify " + certificate.getAbsolutePath()}); final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify \"" + certificate.getAbsolutePath() + "\""});
return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") && return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") &&
output.contains("dwInfoStatus=10c dwErrorStatus=0"); output.contains("dwInfoStatus=10c dwErrorStatus=0");
@ -41,7 +41,7 @@ public class NitroWindows implements NitroOsFunctions {
final String certificatePath = certificate.getAbsolutePath(); final String certificatePath = certificate.getAbsolutePath();
// Prompt UAC elevation. // Prompt UAC elevation.
WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C \"certutil -addstore root " + certificatePath + "\"", null, 1); WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C 'certutil -addstore root \"" + certificatePath + "\"'", null, 1);
// Wait for exit. // Wait for exit.
Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE); Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE);

2
G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java
View File

@ -10,7 +10,7 @@ import java.util.*;
public class LinuxHabboClient extends HabboClient { public class LinuxHabboClient extends HabboClient {
private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo.exe"}; private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo"};
List<PotentialHabboProcess> potentialProcesses = new ArrayList<>(); List<PotentialHabboProcess> potentialProcesses = new ArrayList<>();

6
G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
View File

@ -89,10 +89,13 @@ public class TitleBarController {
stage.getScene().setFill(Color.TRANSPARENT); stage.getScene().setFill(Color.TRANSPARENT);
stage.getScene().getRoot().getStyleClass().add("root-node"); stage.getScene().getRoot().getStyleClass().add("root-node");
controller.themeBtn.setVisible(config.displayThemePicker());
if (!config.displayMinimizeButton()) { if (!config.displayMinimizeButton()) {
((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn); ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn);
} }
if (!config.displayThemePicker()) {
((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn);
}
}); });
return controller; return controller;
} }
@ -107,7 +110,6 @@ public class TitleBarController {
Platform.runLater(() -> titleLabel.setText(title)); Platform.runLater(() -> titleLabel.setText(title));
} }
public void handleCloseAction(MouseEvent event) { public void handleCloseAction(MouseEvent event) {
config.onCloseClicked(); config.onCloseClicked();
} }