From 9865c80b9635cbb9939729caf4ca7f3da44ae441 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Thu, 14 Nov 2019 21:34:14 -0500
Subject: [PATCH] Add getRandomOfferId method

---
 .../main/java/bisq/core/offer/CreateOfferService.java | 11 ++++++++++-
 .../desktop/main/offer/MutableOfferDataModel.java     |  7 ++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/bisq/core/offer/CreateOfferService.java b/core/src/main/java/bisq/core/offer/CreateOfferService.java
index dc609912ec..04704dd645 100644
--- a/core/src/main/java/bisq/core/offer/CreateOfferService.java
+++ b/core/src/main/java/bisq/core/offer/CreateOfferService.java
@@ -17,9 +17,14 @@
 
 package bisq.core.offer;
 
+import bisq.common.app.Version;
+import bisq.common.util.Utilities;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import java.util.UUID;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -40,5 +45,9 @@ public class CreateOfferService {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-
+    public String getRandomOfferId() {
+        return Utilities.getRandomPrefix(5, 8) + "-" +
+                UUID.randomUUID().toString() + "-" +
+                Version.VERSION.replace(".", "");
+    }
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
index e586d35798..f634a85047 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
@@ -89,7 +89,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 
 import javax.annotation.Nullable;
 
@@ -169,8 +168,8 @@ public abstract class MutableOfferDataModel extends OfferDataModel implements Bs
                                  MakerFeeProvider makerFeeProvider,
                                  Navigation navigation) {
         super(btcWalletService);
-        this.createOfferService = createOfferService;
 
+        this.createOfferService = createOfferService;
         this.openOfferManager = openOfferManager;
         this.bsqWalletService = bsqWalletService;
         this.preferences = preferences;
@@ -187,9 +186,7 @@ public abstract class MutableOfferDataModel extends OfferDataModel implements Bs
         this.makerFeeProvider = makerFeeProvider;
         this.navigation = navigation;
 
-        offerId = Utilities.getRandomPrefix(5, 8) + "-" +
-                UUID.randomUUID().toString() + "-" +
-                Version.VERSION.replace(".", "");
+        offerId = createOfferService.getRandomOfferId();
         shortOfferId = Utilities.getShortId(offerId);
         addressEntry = btcWalletService.getOrCreateAddressEntry(offerId, AddressEntry.Context.OFFER_FUNDING);