laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-10 08:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

followup to script type descriptions

Browse Source
This commit is contained in:
Craig Raw
2021-02-17 11:10:08 +02:00
parent ae2db6e204
commit 173078dd8d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java
+6 -3
View File
@@ -109,12 +109,12 @@ public class SettingsController extends WalletFormController implements Initiali
scriptType.setConverter(new StringConverter<>() {
@Override
public String toString(ScriptType scriptType) {
return scriptType.getDescription();
return scriptType == null ? "" : scriptType.getDescription();
}
@Override
public ScriptType fromString(String string) {
return ScriptType.fromDescriptor(string);
return Arrays.stream(ScriptType.values()).filter(type -> type.getDescription().equals(string)).findFirst().orElse(null);
}
});
@@ -330,7 +330,10 @@ public class SettingsController extends WalletFormController implements Initiali
wallet.setDefaultPolicy(Policy.getPolicy(wallet.getPolicyType(), wallet.getScriptType(), wallet.getKeystores(), (int)multisigControl.getLowValue()));
}
descriptor.setWallet(wallet);
if(ScriptType.getAddressableScriptTypes(wallet.getPolicyType()).contains(wallet.getScriptType())) {
descriptor.setWallet(wallet);
}
revert.setDisable(false);
apply.setDisable(!wallet.isValid());
}