Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-09-18 12:04:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move password check at startup before init rest of app. cleanup, wording improvements

Browse source
This commit is contained in:
Manfred Karrer 2016-04-07 01:45:48 +02:00
parent cc46a81644
commit 5af70848a7
16 changed files with 142 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -383,11 +383,6 @@ public class WalletService {
return ImmutableList.copyOf(addressEntryList);
}
public void swapTradeToSavings(String offerId) {
getOrCreateAddressEntry(offerId, AddressEntry.Context.OFFER_FUNDING);
addressEntryList.swapTradeToSavings(offerId);
}
public void swapTradeEntryToAvailableEntry(String offerId, AddressEntry.Context context) {
Optional<AddressEntry> addressEntryOptional = getAddressEntryListAsImmutableList().stream()
.filter(e -> offerId.equals(e.getOfferId()))

6
core/src/main/java/io/bitsquare/trade/offer/Offer.java
View file

@ -58,9 +58,9 @@ public final class Offer implements StoragePayload, RequiresOwnerIsOnlinePayload
@JsonExclude
private static final Logger log = LoggerFactory.getLogger(Offer.class);
public static final long TTL = TimeUnit.SECONDS.toMillis(4 * 60);
public final static String TAC_OFFERER = "With placing that offer I accept to trade " +
"with anyone who fulfills the conditions as defined above.";
public static final String TAC_TAKER = "With taking that offer I commit to the trade conditions as defined above.";
public final static String TAC_OFFERER = "With placing that offer I agree to trade " +
"with any trader who fulfills the conditions as defined above.";
public static final String TAC_TAKER = "With taking that offer I agree to the trade conditions as defined above.";
///////////////////////////////////////////////////////////////////////////////////////////