sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-26 01:56:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure keystore source and wallet model is always filled in

Browse source
This commit is contained in:
Craig Raw 2020-04-29 15:43:57 +02:00
parent d740895bd6
commit cbffaf3e41
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/sparrowwallet/drongo/wallet/Keystore.java
View file

@ -66,7 +66,7 @@ public class Keystore {
}
public boolean isValid() {
if(label == null || keyDerivation == null || extendedPublicKey == null) {
if(label == null || source == null || walletModel == null || keyDerivation == null || extendedPublicKey == null) {
return false;
}
@ -85,6 +85,8 @@ public class Keystore {
public Keystore copy() {
Keystore copy = new Keystore(label);
copy.setSource(source);
copy.setWalletModel(walletModel);
if(keyDerivation != null) {
copy.setKeyDerivation(keyDerivation.copy());
}

10
src/main/java/com/sparrowwallet/drongo/wallet/WalletModel.java
View file

@ -15,6 +15,16 @@ public enum WalletModel {
return this.toString();
}
public static WalletModel fromType(String type) {
for(WalletModel model : values()) {
if(model.getType().equals(type)) {
return model;
}
}
return null;
}
public String toDisplayString() {
String line = this.toString().toLowerCase();
String[] words = line.split("_");