mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-22 06:21:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

WalletApplication: don't use payment protocol ID for filename suffix

Browse source
This commit is contained in:
Sean Gilligan 2022-06-25 18:03:21 +02:00 • committed by Andreas Schildbach
parent a8b83c95e7
commit 3732a61795
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java
View file

@ -27,6 +27,7 @@ import org.bitcoinj.kits.WalletAppKit;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.utils.AppDataDirectory;
import org.bitcoinj.utils.BriefLogFormatter;
import org.bitcoinj.utils.Network;
import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.DeterministicSeed;
import org.bitcoinj.wallet.KeyChainGroupStructure;
@ -55,7 +56,7 @@ public abstract class WalletApplication implements AppDelegate {
public WalletApplication(String applicationName, NetworkParameters params, ScriptType preferredOutputScriptType, KeyChainGroupStructure keyChainGroupStructure) {
instance = this;
this.applicationName = applicationName;
this.walletFileName = applicationName.replaceAll("[^a-zA-Z0-9.-]", "_") + "-" + params.getPaymentProtocolId();
this.walletFileName = applicationName.replaceAll("[^a-zA-Z0-9.-]", "_") + "-" + suffixFromNetParams(params);
this.params = params;
this.preferredOutputScriptType = preferredOutputScriptType;
this.keyChainGroupStructure = keyChainGroupStructure;
@ -175,4 +176,23 @@ public abstract class WalletApplication implements AppDelegate {
// Forcibly terminate the JVM because Orchid likes to spew non-daemon threads everywhere.
Runtime.getRuntime().exit(0);
}
protected String suffixFromNetParams(NetworkParameters params) {
return suffixFromNetwork(params.network());
}
protected String suffixFromNetwork(Network network) {
switch(network) {
case MAIN:
return "main";
case TEST:
return "test";
case SIGNET:
return "signet";
case REGTEST:
return "regtest";
default:
throw new IllegalArgumentException("Unsupported network");
}
}
}