Start server at onInitWallet and add wallet password handler

- Add onInitWallet to HttpApiMain and start http server there - Add onRequestWalletPassword to BisqSetupListener - Override setupHandlers in HttpApiHeadlessApp and adjust setRequestWalletPasswordHandler (impl. missing) - Add onRequestWalletPassword to HttpApiMain
bisq-network · Oct 1, 2019 · 4c2f270 · 4c2f270
1 parent 4a5d84f
commit 4c2f270
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/app/BisqHeadlessApp.java b/core/src/main/java/bisq/core/app/BisqHeadlessApp.java
@@ -43,7 +43,7 @@ public class BisqHeadlessApp implements HeadlessApp {
     @Setter
     private GracefulShutDownHandler gracefulShutDownHandler;
     private boolean shutDownRequested;
-    private BisqSetup bisqSetup;
+    protected BisqSetup bisqSetup;
     private CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler;
     private TradeManager tradeManager;
 

diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java
@@ -125,6 +125,10 @@ default void onInitWallet() {
             log.info("onInitWallet");
         }
 
+        default void onRequestWalletPassword() {
+            log.info("onRequestWalletPassword");
+        }
+
         void onSetupComplete();
     }
 
@@ -561,6 +565,8 @@ else if (displayTorNetworkSettingsHandler != null)
     private void initWallet() {
         bisqSetupListeners.forEach(BisqSetupListener::onInitWallet);
         Runnable walletPasswordHandler = () -> {
+            log.info("Wallet password required");
+            bisqSetupListeners.forEach(BisqSetupListener::onRequestWalletPassword);
             if (p2pNetworkReady.get())
                 p2PNetworkSetup.setSplashP2PNetworkAnimationVisible(true);
 
@@ -571,6 +577,9 @@ private void initWallet() {
                         if (showFirstPopupIfResyncSPVRequestedHandler != null)
                             showFirstPopupIfResyncSPVRequestedHandler.run();
                     } else {
+                        // TODO no guarantee here that the wallet is really fully initialized
+                        // We would need a new walletInitializedButNotEncrypted state to track
+                        // Usually init is fast and we have our wallet initialized at that state though.
                         walletInitialized.set(true);
                     }
                 });