From 90ada1f01909e49f56344811b8e2a09ec82dbd14 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Sat, 13 Feb 2021 15:51:50 -0600
Subject: [PATCH] Fix issue with TriggerPriceService deactivating offer too
 early

TriggerPriceService is changed to use a BootstrapListener
on the P2PService so that it can start after the P2P network
is ready.

Fixes #5190 : Prevents an Uncaught Exception error at startup.
---
 .../bisq/core/offer/TriggerPriceService.java  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/offer/TriggerPriceService.java b/core/src/main/java/bisq/core/offer/TriggerPriceService.java
index da82858f09a..b4f551969a0 100644
--- a/core/src/main/java/bisq/core/offer/TriggerPriceService.java
+++ b/core/src/main/java/bisq/core/offer/TriggerPriceService.java
@@ -23,6 +23,9 @@
 import bisq.core.provider.price.MarketPrice;
 import bisq.core.provider.price.PriceFeedService;
 
+import bisq.network.p2p.BootstrapListener;
+import bisq.network.p2p.P2PService;
+
 import bisq.common.util.MathUtils;
 
 import org.bitcoinj.utils.Fiat;
@@ -47,17 +50,34 @@
 @Slf4j
 @Singleton
 public class TriggerPriceService {
+    private final P2PService p2PService;
     private final OpenOfferManager openOfferManager;
     private final PriceFeedService priceFeedService;
     private final Map<String, Set<OpenOffer>> openOffersByCurrency = new HashMap<>();
 
     @Inject
-    public TriggerPriceService(OpenOfferManager openOfferManager, PriceFeedService priceFeedService) {
+    public TriggerPriceService(P2PService p2PService,
+                               OpenOfferManager openOfferManager,
+                               PriceFeedService priceFeedService) {
+        this.p2PService = p2PService;
         this.openOfferManager = openOfferManager;
         this.priceFeedService = priceFeedService;
     }
 
     public void onAllServicesInitialized() {
+        if (p2PService.isBootstrapped()) {
+            onBootstrapComplete();
+        } else {
+            p2PService.addP2PServiceListener(new BootstrapListener() {
+                @Override
+                public void onUpdatedDataReceived() {
+                    onBootstrapComplete();
+                }
+            });
+        }
+    }
+
+    private void onBootstrapComplete() {
         openOfferManager.getObservableList().addListener((ListChangeListener<OpenOffer>) c -> {
             c.next();
             if (c.wasAdded()) {