re-sign offers on edit if applicable

Author: woodser

core/src/main/java/haveno/core/offer/OpenOfferManager.java

@@ -23,7 +23,7 @@
 import haveno.common.taskrunner.TaskRunner;
 import haveno.core.locale.Res;
 import haveno.core.offer.messages.SignOfferResponse;
-import haveno.core.offer.placeoffer.tasks.AddToOfferBook;
+import haveno.core.offer.placeoffer.tasks.MaybeAddToOfferBook;
 import haveno.core.offer.placeoffer.tasks.MakerProcessSignOfferResponse;
 import haveno.core.offer.placeoffer.tasks.MakerReserveOfferFunds;
 import haveno.core.offer.placeoffer.tasks.MakerSendSignOfferRequest;
@@ -135,7 +135,7 @@ public void handleSignOfferResponse(SignOfferResponse response, NodeAddress send
         );
         taskRunner.addTasks(
                 MakerProcessSignOfferResponse.class,
-                AddToOfferBook.class
+                MaybeAddToOfferBook.class
         );
 
         taskRunner.run();

core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java

@@ -20,13 +20,14 @@
 import haveno.common.taskrunner.Task;
 import haveno.common.taskrunner.TaskRunner;
 import haveno.core.offer.Offer;
+import haveno.core.offer.OpenOffer;
 import haveno.core.offer.placeoffer.PlaceOfferModel;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class AddToOfferBook extends Task<PlaceOfferModel> {
+public class MaybeAddToOfferBook extends Task<PlaceOfferModel> {
 
-    public AddToOfferBook(TaskRunner<PlaceOfferModel> taskHandler, PlaceOfferModel model) {
+    public MaybeAddToOfferBook(TaskRunner<PlaceOfferModel> taskHandler, PlaceOfferModel model) {
         super(taskHandler, model);
     }
 
@@ -35,17 +36,22 @@ protected void run() {
         try {
             runInterceptHook();
             checkNotNull(model.getSignOfferResponse().getSignedOfferPayload().getArbitratorSignature(), "Offer's arbitrator signature is null: " + model.getOpenOffer().getOffer().getId());
-            model.getOfferBookService().addOffer(new Offer(model.getSignOfferResponse().getSignedOfferPayload()),
-                    () -> {
-                        model.setOfferAddedToOfferBook(true);
-                        complete();
-                    },
-                    errorMessage -> {
-                        model.getOpenOffer().getOffer().setErrorMessage("Could not add offer to offerbook.\n" +
-                                "Please check your network connection and try again.");
-
-                        failed(errorMessage);
-                    });
+            if (model.getOpenOffer().isPending() || model.getOpenOffer().isAvailable()) {
+                model.getOfferBookService().addOffer(new Offer(model.getSignOfferResponse().getSignedOfferPayload()),
+                        () -> {
+                            model.getOpenOffer().setState(OpenOffer.State.AVAILABLE);
+                            model.setOfferAddedToOfferBook(true);
+                            complete();
+                        },
+                        errorMessage -> {
+                            model.getOpenOffer().getOffer().setErrorMessage("Could not add offer to offerbook.\n" +
+                                    "Please check your network connection and try again.");
+                            failed(errorMessage);
+                        });
+            } else {
+                complete();
+                return;
+            }
         } catch (Throwable t) {
             model.getOpenOffer().getOffer().setErrorMessage("An error occurred.\n" +
                     "Error message:\n"

core/src/main/java/haveno/core/offer/placeoffer/tasks/AddToOfferBook.java renamed to core/src/main/java/haveno/core/offer/placeoffer/tasks/MaybeAddToOfferBook.java

@@ -22,7 +22,7 @@
 import haveno.common.util.Tuple2;
 import haveno.core.offer.availability.tasks.ProcessOfferAvailabilityResponse;
 import haveno.core.offer.availability.tasks.SendOfferAvailabilityRequest;
-import haveno.core.offer.placeoffer.tasks.AddToOfferBook;
+import haveno.core.offer.placeoffer.tasks.MaybeAddToOfferBook;
 import haveno.core.offer.placeoffer.tasks.MakerReserveOfferFunds;
 import haveno.core.offer.placeoffer.tasks.ValidateOffer;
 import haveno.core.trade.protocol.tasks.ApplyFilter;
@@ -72,7 +72,7 @@ public void initialize() {
                 FXCollections.observableArrayList(Arrays.asList(
                         ValidateOffer.class,
                         MakerReserveOfferFunds.class,
-                        AddToOfferBook.class)
+                        MaybeAddToOfferBook.class)
                 ));
 
 

desktop/src/main/java/haveno/desktop/main/debug/DebugView.java

@@ -20,6 +20,8 @@
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
+
+import haveno.common.UserThread;
 import haveno.common.handlers.ErrorMessageHandler;
 import haveno.common.handlers.ResultHandler;
 import haveno.core.account.witness.AccountAgeWitnessService;
@@ -226,8 +228,10 @@ public void onPublishOffer(ResultHandler resultHandler, ErrorMessageHandler erro
 
         openOfferManager.editOpenOfferPublish(editedOffer, triggerPrice, initialState, () -> {
             openOffer = null;
-            resultHandler.handleResult();
-        }, errorMessageHandler);
+            UserThread.execute(() -> resultHandler.handleResult());
+        }, (errorMsg) -> {
+            UserThread.execute(() -> errorMessageHandler.handleErrorMessage(errorMsg));
+        });
     }
 
     public void onCancelEditOffer(ErrorMessageHandler errorMessageHandler) {

desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java

@@ -205,7 +205,8 @@ private void addConfirmEditGroup() {
                 cancelButton.setDisable(true);
                 busyAnimation.play();
                 spinnerInfoLabel.setText(Res.get("editOffer.publishOffer"));
-                //edit offer
+
+                // edit offer
                 model.onPublishOffer(() -> {
                     String key = "editOfferSuccess";
                     if (DontShowAgainLookup.showAgain(key)) {