remove persistence of dsa keypair

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

View file

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

View file

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