Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix OS check

Browse Source
This commit is contained in:
Manfred Karrer 2016-04-22 02:01:27 +02:00
parent 95b971150b
commit 5353e05c3f
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/src/main/java/io/bitsquare/common/util/Utilities.java
View File

@ -34,6 +34,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.util.Locale;
import java.util.Random;
import java.util.concurrent.*;
@ -115,34 +116,42 @@ public class Utilities {
}
private static String getOSName() {
return System.getProperty("os.name").toLowerCase();
return System.getProperty("os.name").toLowerCase(Locale.US);
}
//TODO remove logs
public static boolean isCorrectOSArchitecture() {
String jvmArch = System.getProperty("sun.arch.data.model");
log.warn("jvmArch " + jvmArch);
log.warn("System.getenv(\"ProgramFiles(x86)\") " + System.getenv("ProgramFiles(x86)"));
public static String getOSArchitecture() {
String osArch = System.getProperty("os.arch");
if (isWindows()) {
// See: https://stackoverflow.com/questions/20856694/how-to-find-the-os-bit-type
// See: Like always windows needs extra treatment
// https://stackoverflow.com/questions/20856694/how-to-find-the-os-bit-type
String arch = System.getenv("PROCESSOR_ARCHITECTURE");
String wow64Arch = System.getenv("PROCESSOR_ARCHITEW6432");
String realArch = arch.endsWith("64")
return arch.endsWith("64")
|| wow64Arch != null && wow64Arch.endsWith("64")
? "64" : "32";
log.warn("arch " + arch);
log.warn("wow64Arch " + wow64Arch);
log.warn("realArch " + realArch);
return realArch.endsWith(jvmArch);
} else if (isLinux()) {
return osArch.startsWith("i") ? "32" : "64";
} else {
String osArch = System.getProperty("os.arch");
log.warn("osArch " + osArch);
return osArch.endsWith(jvmArch);
return osArch.contains("64") ? "64" : osArch;
}
}
public static String getJVMArchitecture() {
return System.getProperty("sun.arch.data.model");
}
public static boolean isCorrectOSArchitecture() {
boolean result = getOSArchitecture().endsWith(getJVMArchitecture());
if (!result) {
log.warn("System.getProperty(\"os.arch\") " + System.getProperty("os.arch"));
log.warn("System.getenv(\"ProgramFiles(x86)\") " + System.getenv("ProgramFiles(x86)"));
log.warn("System.getenv(\"PROCESSOR_ARCHITECTURE\")" + System.getenv("PROCESSOR_ARCHITECTURE"));
log.warn("System.getenv(\"PROCESSOR_ARCHITEW6432\") " + System.getenv("PROCESSOR_ARCHITEW6432"));
log.warn("System.getProperty(\"sun.arch.data.model\") " + System.getProperty("sun.arch.data.model"));
}
return result;
}
public static void openURI(URI uri) throws IOException {
if (!isLinux()
&& Desktop.isDesktopSupported()
@ -176,7 +185,7 @@ public class Utilities {
throw new IOException("Failed to open directory: " + directory.toString());
}
}
public static void openWebPage(String target) {
try {
openURI(new URI(target));

20
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View File

@ -208,14 +208,16 @@ public class BitsquareApp extends Application {
primaryStage.show();
if (!Utilities.isCorrectOSArchitecture())
new Popup<>().warning("You have the wrong version installed for the architecture of your computer.\n" +
"Your computers architecture is: " + System.getProperty("os.arch") + ".\n" +
"The Bitsquare binary you installed is: " + System.getProperty("sun.arch.data.model") + ".\n" +
"Please shut down and re-install the correct version (" + System.getProperty("os.arch") + ").")
.closeButtonText("Shut down")
.onClose(shutDownHandler::run)
if (!Utilities.isCorrectOSArchitecture()) {
String osArchitecture = Utilities.getOSArchitecture();
// We don't force a shutdown as the osArchitecture might in strange cases return a wrong value.
// Needs at least more testing on different machines...
new Popup<>().warning("You have probably the wrong version installed for the architecture of your computer.\n" +
"Your computers architecture is: " + osArchitecture + ".\n" +
"The Bitsquare binary you installed is: " + Utilities.getJVMArchitecture() + ".\n" +
"Please shut down and re-install the correct version (" + osArchitecture + ").")
.show();
}
} catch (Throwable throwable) {
showErrorPopup(throwable, false);
@ -225,8 +227,8 @@ public class BitsquareApp extends Application {
private void showSendAlertMessagePopup() {
AlertManager alertManager = injector.getInstance(AlertManager.class);
new SendAlertMessageWindow()
.onAddAlertMessage((alert, privKeyString) -> alertManager.addAlertMessageIfKeyIsValid(alert, privKeyString))
.onRemoveAlertMessage(privKeyString -> alertManager.removeAlertMessageIfKeyIsValid(privKeyString))
.onAddAlertMessage(alertManager::addAlertMessageIfKeyIsValid)
.onRemoveAlertMessage(alertManager::removeAlertMessageIfKeyIsValid)
.show();
}