Browse Source

add interface enum

master
Craig Raw 2 years ago
parent
commit
0fa6bd56e2
  1. 4
      src/main/java/com/sparrowwallet/sparrow/AppServices.java
  2. 23
      src/main/java/com/sparrowwallet/sparrow/Interface.java
  3. 1
      src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

4
src/main/java/com/sparrowwallet/sparrow/AppServices.java

@ -210,7 +210,7 @@ public class AppServices {
restartService(ratesService);
}
if(config.isCheckNewVersions() && Network.get() == Network.MAINNET) {
if(config.isCheckNewVersions() && Network.get() == Network.MAINNET && Interface.get() == Interface.DESKTOP) {
restartService(versionCheckService);
}
@ -1104,7 +1104,7 @@ public class AppServices {
Wallet wallet = walletTabData.getWallet();
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;
if(deviceEnumerateService == null) {

23
src/main/java/com/sparrowwallet/sparrow/Interface.java

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

1
src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

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

Loading…
Cancel
Save