Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-17 19:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve close connection and shutdown handling

Browse source
This commit is contained in:
Manfred Karrer 2016-02-02 21:07:45 +01:00
parent 16f014adb6
commit 85b2cb1d44
19 changed files with 220 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -148,7 +148,8 @@ public class MainViewModel implements ViewModel {
this.walletPasswordPopup = walletPasswordPopup;
this.formatter = formatter;
btcNetworkAsString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork());
btcNetworkAsString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork()) +
(preferences.getUseTorForBitcoinJ() ? " (using Tor)" : "");
TxIdTextField.setPreferences(preferences);
TxIdTextField.setWalletService(walletService);

3
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -27,6 +27,7 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.locale.TradeCurrency;
import io.bitsquare.p2p.P2PService;
import io.bitsquare.p2p.network.CloseConnectionReason;
import io.bitsquare.p2p.network.Connection;
import io.bitsquare.p2p.network.ConnectionListener;
import io.bitsquare.payment.PaymentAccount;
@ -398,7 +399,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
offerStateListener = (ov, oldValue, newValue) -> applyOfferState(newValue);
connectionListener = new ConnectionListener() {
@Override
public void onDisconnect(Reason reason, Connection connection) {
public void onDisconnect(CloseConnectionReason closeConnectionReason, Connection connection) {
if (connection.getPeersNodeAddressOptional().isPresent() &&
connection.getPeersNodeAddressOptional().get().equals(offer.getOffererNodeAddress()))
offerWarning.set("You lost connection to the offerer.\n" +