add interface enum

This commit is contained in:
Craig Raw 2022-10-17 13:52:40 +02:00
parent c4c581525a
commit 0fa6bd56e2
3 changed files with 26 additions and 2 deletions

View file

@ -210,7 +210,7 @@ public class AppServices {
restartService(ratesService); restartService(ratesService);
} }
if(config.isCheckNewVersions() && Network.get() == Network.MAINNET) { if(config.isCheckNewVersions() && Network.get() == Network.MAINNET && Interface.get() == Interface.DESKTOP) {
restartService(versionCheckService); restartService(versionCheckService);
} }
@ -1104,7 +1104,7 @@ public class AppServices {
Wallet wallet = walletTabData.getWallet(); Wallet wallet = walletTabData.getWallet();
Storage storage = walletTabData.getStorage(); Storage storage = walletTabData.getStorage();
if(!storage.getWalletFile().exists() || wallet.containsSource(KeystoreSource.HW_USB)) { if(Interface.get() == Interface.DESKTOP && (!storage.getWalletFile().exists() || wallet.containsSource(KeystoreSource.HW_USB))) {
usbWallet = true; usbWallet = true;
if(deviceEnumerateService == null) { if(deviceEnumerateService == null) {

View file

@ -0,0 +1,23 @@
package com.sparrowwallet.sparrow;
public enum Interface {
DESKTOP, TERMINAL, SERVER;
private static Interface currentInterface;
public static Interface get() {
if(currentInterface == null) {
currentInterface = DESKTOP;
}
return currentInterface;
}
public static void set(Interface interf) {
if(currentInterface != null && interf != currentInterface) {
throw new IllegalStateException("Interface already set to " + currentInterface);
}
currentInterface = interf;
}
}

View file

@ -87,6 +87,7 @@ public class SparrowWallet {
SLF4JBridgeHandler.install(); SLF4JBridgeHandler.install();
if(args.terminal || java.awt.GraphicsEnvironment.isHeadless()) { if(args.terminal || java.awt.GraphicsEnvironment.isHeadless()) {
Interface.set(Interface.TERMINAL);
PlatformImpl.setTaskbarApplication(false); PlatformImpl.setTaskbarApplication(false);
Drongo.removeRootLogAppender("STDOUT"); Drongo.removeRootLogAppender("STDOUT");
com.sun.javafx.application.LauncherImpl.launchApplication(SparrowTerminal.class, SparrowWalletPreloader.class, argv); com.sun.javafx.application.LauncherImpl.launchApplication(SparrowTerminal.class, SparrowWalletPreloader.class, argv);