beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefs fix

Browse source
This commit is contained in:
crschnick 2023-04-19 06:07:12 +00:00
parent d464118d83
commit 097a463e0e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -119,7 +119,7 @@ public class AppPrefs {
// ==== // ====
private final Property<SecretValue> lockPassword = new SimpleObjectProperty<SecretValue>(); private final Property<SecretValue> lockPassword = new SimpleObjectProperty<SecretValue>();
private final StringProperty lockCrypt = typed(new SimpleStringProperty(null), String.class); private final StringProperty lockCrypt = typed(new SimpleStringProperty(""), String.class);
private final StringField lockCryptControl = StringField.ofStringType(lockCrypt).render(() -> new SimpleControl<StringField, StackPane>() { private final StringField lockCryptControl = StringField.ofStringType(lockCrypt).render(() -> new SimpleControl<StringField, StackPane>() {
private Region button; private Region button;

3
app/src/main/java/io/xpipe/app/prefs/JsonStorageHandler.java
View file

@ -2,6 +2,7 @@ package io.xpipe.app.prefs;
import com.dlsc.preferencesfx.util.StorageHandler; import com.dlsc.preferencesfx.util.StorageHandler;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.NullNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.CollectionType;
@ -50,7 +51,7 @@ public class JsonStorageHandler implements StorageHandler {
var id = getSaveId(breadcrumb); var id = getSaveId(breadcrumb);
var tree = object instanceof PrefsChoiceValue prefsChoiceValue var tree = object instanceof PrefsChoiceValue prefsChoiceValue
? new TextNode(prefsChoiceValue.getId()) ? new TextNode(prefsChoiceValue.getId())
: JacksonMapper.newMapper().valueToTree(object); : (object != null ? JacksonMapper.newMapper().valueToTree(object) : NullNode.getInstance());
setContent(id, tree); setContent(id, tree);
} }