From 8232eeecd8bf40602fd4d6e7dcf09735349d607b Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 7 Oct 2018 21:54:00 -0500 Subject: [PATCH] Deactivate OKPay as it does not exist anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OkPay seems to have rebranded to Weezzo. The OkPay webpage is offline but some links go to Weezzo. Seems pretty unprofessional hwo they did the move... Seems they have been involved with BTC-e… https://bitcointalk.to/index.php?topic=2094721.0 --- core/src/main/java/bisq/core/payment/OKPayAccount.java | 2 +- .../java/bisq/core/payment/payload/OKPayAccountPayload.java | 1 + .../src/main/java/bisq/core/payment/payload/PaymentMethod.java | 2 ++ .../java/bisq/desktop/components/paymentmethods/OKPayForm.java | 1 + .../account/content/fiataccounts/FiatAccountsDataModel.java | 3 ++- .../main/account/content/fiataccounts/FiatAccountsView.java | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/payment/OKPayAccount.java b/core/src/main/java/bisq/core/payment/OKPayAccount.java index 4009ee2c56..42282e93e7 100644 --- a/core/src/main/java/bisq/core/payment/OKPayAccount.java +++ b/core/src/main/java/bisq/core/payment/OKPayAccount.java @@ -24,7 +24,7 @@ import bisq.core.payment.payload.PaymentMethod; import lombok.EqualsAndHashCode; -//TODO missing support for selected trade currency +@Deprecated @EqualsAndHashCode(callSuper = true) public final class OKPayAccount extends PaymentAccount { public OKPayAccount() { diff --git a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java index 111f841ae7..817f7f0cac 100644 --- a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java @@ -34,6 +34,7 @@ import lombok.Setter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; +@Deprecated @EqualsAndHashCode(callSuper = true) @ToString @Setter diff --git a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java b/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java index 209b512df1..e42ddbd8d4 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java +++ b/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java @@ -51,6 +51,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable { // time in blocks (average 10 min for one block confirmation private static final long DAY = TimeUnit.HOURS.toMillis(24); + @Deprecated public static final String OK_PAY_ID = "OK_PAY"; public static final String UPHOLD_ID = "UPHOLD"; @Deprecated @@ -81,6 +82,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable { public static final String F2F_ID = "F2F"; public static final String BLOCK_CHAINS_ID = "BLOCK_CHAINS"; + @Deprecated public static PaymentMethod OK_PAY; public static PaymentMethod UPHOLD; @Deprecated diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java index dd816a0554..21330a13c7 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java @@ -52,6 +52,7 @@ import static bisq.desktop.util.FormBuilder.addLabelInputTextField; import static bisq.desktop.util.FormBuilder.addLabelTextField; import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon; +@Deprecated public class OKPayForm extends PaymentMethodForm { private static final Logger log = LoggerFactory.getLogger(OKPayForm.class); diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java index 8b5ab22ec8..beb75cfc33 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java @@ -89,7 +89,8 @@ class FiatAccountsDataModel extends ActivatableDataModel { List toRemove = new ArrayList<>(); paymentAccounts.stream() .filter(paymentAccount -> paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.VENMO_ID) || - paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.CASH_APP_ID)) + paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.CASH_APP_ID) || + paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.OK_PAY_ID)) .forEach(toRemove::add); toRemove.forEach(paymentAccount -> { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index a233028a10..d32aace01b 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -395,6 +395,7 @@ public class FiatAccountsView extends ActivatableViewAndModel !paymentMethod.getId().equals(PaymentMethod.BLOCK_CHAINS_ID)) .filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.VENMO_ID)) .filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.CASH_APP_ID)) + .filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.OK_PAY_ID)) .collect(Collectors.toList()); paymentMethodComboBox.setItems(FXCollections.observableArrayList(list)); paymentMethodComboBox.setConverter(new StringConverter() {