sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

default to hd capture on new osx installs

Browse source
This commit is contained in:
Craig Raw 2021-03-15 11:25:30 +02:00
parent 1d73956853
commit e1f405d886
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/sparrowwallet/sparrow/MainApp.java
View file

@ -19,6 +19,7 @@ import javafx.application.Application;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.stage.Stage; import javafx.stage.Stage;
import org.controlsfx.glyphfont.GlyphFontRegistry; import org.controlsfx.glyphfont.GlyphFontRegistry;
import org.controlsfx.tools.Platform;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.bridge.SLF4JBridgeHandler; import org.slf4j.bridge.SLF4JBridgeHandler;
@ -79,6 +80,10 @@ public class MainApp extends Application {
Config.get().setCoreWallet(""); Config.get().setCoreWallet("");
} }
if(Config.get().getHdCapture() == null && Platform.getCurrent() == Platform.OSX) {
Config.get().setHdCapture(Boolean.TRUE);
}
System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths())); System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
AppController appController = AppServices.newAppWindow(stage); AppController appController = AppServices.newAppWindow(stage);

10
src/main/java/com/sparrowwallet/sparrow/io/Config.java
View file

@ -37,7 +37,7 @@ public class Config {
private List<File> recentWalletFiles; private List<File> recentWalletFiles;
private Integer keyDerivationPeriod; private Integer keyDerivationPeriod;
private File hwi; private File hwi;
private boolean hdCapture; private Boolean hdCapture;
private ServerType serverType; private ServerType serverType;
private String publicElectrumServer; private String publicElectrumServer;
private String coreServer; private String coreServer;
@ -263,11 +263,15 @@ public class Config {
flush(); flush();
} }
public boolean isHdCapture() { public Boolean getHdCapture() {
return hdCapture; return hdCapture;
} }
public void setHdCapture(boolean hdCapture) { public Boolean isHdCapture() {
return hdCapture != null && hdCapture;
}
public void setHdCapture(Boolean hdCapture) {
this.hdCapture = hdCapture; this.hdCapture = hdCapture;
flush(); flush();
} }