mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove persistence of dsa keypair

Browse source
This commit is contained in:
Manfred Karrer 2014-08-01 18:00:26 +02:00
parent 2a6f0ccc62
commit 2190772370
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/io/bitsquare/settings/Settings.java
View file

@ -7,7 +7,6 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.inject.Inject;
public class Settings implements Serializable
{
@ -15,18 +14,16 @@ public class Settings implements Serializable
private List<Locale> acceptedLanguageLocales = new ArrayList<>();
private List<Country> acceptedCountryLocales = new ArrayList<>();
private List<Arbitrator> acceptedArbitrators = new ArrayList<>();
private int maxCollateral;
private int minCollateral;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public Settings()
{
}

20
src/main/java/io/bitsquare/user/User.java
View file

@ -23,6 +23,7 @@ public class User implements Serializable
private KeyPair messageKeyPair;
private String accountID;
// TODO make it thread safe
private List<BankAccount> bankAccounts;
private BankAccount currentBankAccount;
@ -39,10 +40,11 @@ public class User implements Serializable
{
if (persistedUser != null)
{
accountID = persistedUser.getAccountId();
bankAccounts = persistedUser.getBankAccounts();
setCurrentBankAccount(persistedUser.getCurrentBankAccount());
messageKeyPair = persistedUser.getMessageKeyPair();
accountID = persistedUser.getAccountId();
setCurrentBankAccount(persistedUser.getCurrentBankAccount());
}
else
{
@ -86,10 +88,12 @@ public class User implements Serializable
bankAccountChangedProperty.set(!bankAccountChangedProperty.get());
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
///////////////////////////////////////////////////////////////////////////////////////////
// TODO just a first attempt, refine when working on the embedded data for the reg. tx
public String getStringifiedBankAccounts()
{
String bankAccountUIDs = "";
@ -102,7 +106,6 @@ public class User implements Serializable
{
bankAccountUIDs += ", ";
}
}
return bankAccountUIDs;
}
@ -149,15 +152,8 @@ public class User implements Serializable
return messageKeyPair.getPublic();
}
@Override
public String toString()
public String getMessagePublicKeyAsString()
{
return "User{" +
"bankAccountChangedProperty=" + bankAccountChangedProperty +
", messageKeyPair=" + messageKeyPair +
", accountID='" + accountID + '\'' +
", bankAccounts=" + bankAccounts +
", currentBankAccount=" + currentBankAccount +
'}';
return DSAKeyUtil.getHexStringFromPublicKey(getMessagePublicKey());
}
}