fix mailbox msg remove bug, add setup for release version

This commit is contained in:
Manfred Karrer 2015-11-18 13:46:47 +01:00
parent 9b1108aa0a
commit 82e766e6b1
38 changed files with 333 additions and 277 deletions

View file

@ -32,7 +32,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
public class DisputeMailMessage extends DisputeMessage {
public final class DisputeMailMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
transient private static final Logger log = LoggerFactory.getLogger(DisputeMailMessage.class);

View file

@ -21,7 +21,7 @@ import io.bitsquare.app.Version;
import io.bitsquare.arbitration.DisputeResult;
import io.bitsquare.p2p.Address;
public class DisputeResultMessage extends DisputeMessage {
public final class DisputeResultMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -21,7 +21,7 @@ import io.bitsquare.app.Version;
import io.bitsquare.arbitration.Dispute;
import io.bitsquare.p2p.Address;
public class OpenNewDisputeMessage extends DisputeMessage {
public final class OpenNewDisputeMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -21,7 +21,7 @@ import io.bitsquare.app.Version;
import io.bitsquare.arbitration.Dispute;
import io.bitsquare.p2p.Address;
public class PeerOpenedDisputeMessage extends DisputeMessage {
public final class PeerOpenedDisputeMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
public final Dispute dispute;

View file

@ -22,7 +22,7 @@ import io.bitsquare.p2p.Address;
import java.util.Arrays;
public class PeerPublishedPayoutTxMessage extends DisputeMessage {
public final class PeerPublishedPayoutTxMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -22,6 +22,7 @@ import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.crypto.KeyRing;
import io.bitsquare.common.handlers.FaultHandler;
import io.bitsquare.common.handlers.ResultHandler;
@ -62,6 +63,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import static io.bitsquare.util.Validator.nonEmptyStringOf;
@ -151,7 +153,8 @@ public class TradeManager {
p2PNetworkReadyListener = new P2PNetworkReadyListener() {
@Override
public void onFirstPeerAuthenticated() {
initPendingTrades();
// give a bit delay to be sure other listeners has dont its jobs
UserThread.runAfter(() -> initPendingTrades(), 100, TimeUnit.MILLISECONDS);
}
};
p2PService.addP2PServiceListener(p2PNetworkReadyListener);

View file

@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.availability.messages;
import io.bitsquare.app.Version;
import io.bitsquare.common.crypto.PubKeyRing;
public class OfferAvailabilityRequest extends OfferMessage {
public final class OfferAvailabilityRequest extends OfferMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.availability.messages;
import io.bitsquare.app.Version;
public class OfferAvailabilityResponse extends OfferMessage {
public final class OfferAvailabilityResponse extends OfferMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -25,7 +25,7 @@ import javax.annotation.concurrent.Immutable;
import java.util.Arrays;
@Immutable
public class DepositTxPublishedMessage extends TradeMessage implements MailboxMessage {
public final class DepositTxPublishedMessage extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -24,7 +24,7 @@ import io.bitsquare.p2p.messaging.MailboxMessage;
import javax.annotation.concurrent.Immutable;
@Immutable
public class FiatTransferStartedMessage extends TradeMessage implements MailboxMessage {
public final class FiatTransferStartedMessage extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -25,7 +25,7 @@ import javax.annotation.concurrent.Immutable;
import java.util.Arrays;
@Immutable
public class FinalizePayoutTxRequest extends TradeMessage implements MailboxMessage {
public final class FinalizePayoutTxRequest extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -29,7 +29,7 @@ import java.util.Arrays;
import java.util.List;
@Immutable
public class PayDepositRequest extends TradeMessage implements MailboxMessage {
public final class PayDepositRequest extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -25,7 +25,7 @@ import javax.annotation.concurrent.Immutable;
import java.util.Arrays;
@Immutable
public class PayoutTxFinalizedMessage extends TradeMessage implements MailboxMessage {
public final class PayoutTxFinalizedMessage extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;

View file

@ -29,7 +29,7 @@ import java.util.ArrayList;
import java.util.List;
@Immutable
public class PublishDepositTxRequest extends TradeMessage {
public final class PublishDepositTxRequest extends TradeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;