Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix trade protocol check for refund agent ticket close #4615

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Fix trade protocol check for refund agent ticket close #4615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
608166c
When a refund agent closes a case we have checked that the trade prot…
chimp1984 Oct 10, 2020
78dc029
Move onCloseDispute to DisputeAgentView
chimp1984 Oct 11, 2020
f2b41d8
Fix typo
chimp1984 Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@

import bisq.network.p2p.NodeAddress;

import bisq.common.app.Version;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.util.Utilities;
Expand Down Expand Up @@ -475,16 +474,6 @@ protected void reOpenDisputeFromButton() {

protected abstract void handleOnSelectDispute(Dispute dispute);

protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
if (protocolVersion == Version.TRADE_PROTOCOL_VERSION) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox())
.show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}

protected void reOpenDispute() {
if (selectedDispute != null) {
selectedDispute.setIsClosed(false);
Expand Down
2 changes: 2 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ protected void setupTable() {
tableView.getColumns().add(getAlertColumn());
}

protected abstract void onCloseDispute(Dispute dispute);


///////////////////////////////////////////////////////////////////////////////////////////
// Private
Expand Down
15 changes: 15 additions & 0 deletions ...top/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package bisq.desktop.main.support.dispute.agent.arbitration;

import bisq.desktop.common.view.FxmlView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.ContractWindow;
import bisq.desktop.main.overlays.windows.DisputeSummaryWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
Expand All @@ -26,6 +27,7 @@
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.dao.DaoFacade;
import bisq.core.locale.Res;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeSession;
Expand Down Expand Up @@ -84,4 +86,17 @@ protected SupportType getType() {
protected DisputeSession getConcreteDisputeChatSession(Dispute dispute) {
return new ArbitrationSession(dispute, disputeManager.isTrader(dispute));
}

@Override
protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
// Only cases with protocolVersion 1 are candidates for legacy arbitration.
// This code path is not tested and it is not assumed that it is still be used as old arbitrators would use
// their old Bisq version if still cases are pending.
if (protocolVersion == 1) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}
}
3 changes: 1 addition & 2 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ protected DisputeSession getConcreteDisputeChatSession(Dispute dispute) {

@Override
protected void onCloseDispute(Dispute dispute) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox())
.show(dispute);
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
}
}
13 changes: 13 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package bisq.desktop.main.support.dispute.agent.refund;

import bisq.desktop.common.view.FxmlView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.ContractWindow;
import bisq.desktop.main.overlays.windows.DisputeSummaryWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
Expand All @@ -26,6 +27,7 @@
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.dao.DaoFacade;
import bisq.core.locale.Res;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeSession;
Expand Down Expand Up @@ -84,4 +86,15 @@ protected SupportType getType() {
protected DisputeSession getConcreteDisputeChatSession(Dispute dispute) {
return new RefundSession(dispute, disputeManager.isTrader(dispute));
}

@Override
protected void onCloseDispute(Dispute dispute) {
long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion();
// Refund agent was introduced with protocolVersion version 2. We do not support old trade protocol cases.
if (protocolVersion >= 2) {
disputeSummaryWindow.onFinalizeDispute(() -> chatView.removeInputBox()).show(dispute);
} else {
new Popup().warning(Res.get("support.wrongVersion", protocolVersion)).show();
}
}
}