Merge branch 'release/2.0.1'

This commit is contained in:
Christian Basler 2016-10-07 22:10:00 +02:00
commit 15c6540e16

View File

@ -66,12 +66,12 @@ public class WifImporter {
entry.getKey(),
getSecret(section.get("privsigningkey")),
getSecret(section.get("privencryptionkey")),
section.get("noncetrialsperbyte", long.class),
section.get("payloadlengthextrabytes", long.class),
Long.parseLong(section.get("noncetrialsperbyte")),
Long.parseLong(section.get("payloadlengthextrabytes")),
Pubkey.Feature.bitfield(features)
);
if (section.containsKey("chan")) {
address.setChan(section.get("chan", boolean.class));
address.setChan(Boolean.parseBoolean(section.get("chan")));
}
address.setAlias(section.get("label"));
identities.add(address);