From 4fdf89b77d747ea77ef136c1497e6c26db6bb25b Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 24 Mar 2024 05:53:45 +0000
Subject: [PATCH] Handle askpass without platform

---
 .../io/xpipe/app/exchange/AskpassExchangeImpl.java     | 10 ----------
 app/src/main/java/io/xpipe/app/util/AskpassAlert.java  |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
index b6817191..810d2c71 100644
--- a/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/exchange/AskpassExchangeImpl.java
@@ -1,8 +1,5 @@
 package io.xpipe.app.exchange;
 
-import io.xpipe.app.core.AppStyle;
-import io.xpipe.app.core.AppTheme;
-import io.xpipe.app.util.PlatformState;
 import io.xpipe.app.util.SecretManager;
 import io.xpipe.beacon.BeaconHandler;
 import io.xpipe.beacon.exchange.AskpassExchange;
@@ -19,13 +16,6 @@ public class AskpassExchangeImpl extends AskpassExchange
             return Response.builder().build();
         }
 
-        if (!PlatformState.initPlatformIfNeeded()) {
-            return Response.builder().build();
-        }
-
-        AppStyle.init();
-        AppTheme.init();
-
         var p = found.get();
         var secret = p.process(msg.getPrompt());
         return Response.builder()
diff --git a/app/src/main/java/io/xpipe/app/util/AskpassAlert.java b/app/src/main/java/io/xpipe/app/util/AskpassAlert.java
index 54d30083..f7dd71d2 100644
--- a/app/src/main/java/io/xpipe/app/util/AskpassAlert.java
+++ b/app/src/main/java/io/xpipe/app/util/AskpassAlert.java
@@ -1,6 +1,8 @@
 package io.xpipe.app.util;
 
 import io.xpipe.app.core.AppI18n;
+import io.xpipe.app.core.AppStyle;
+import io.xpipe.app.core.AppTheme;
 import io.xpipe.app.core.AppWindowHelper;
 import io.xpipe.app.fxcomps.impl.SecretFieldComp;
 import io.xpipe.core.util.InPlaceSecretValue;
@@ -17,6 +19,13 @@ import javafx.stage.Stage;
 public class AskpassAlert {
 
     public static SecretQueryResult queryRaw(String prompt, InPlaceSecretValue secretValue) {
+        if (!PlatformState.initPlatformIfNeeded()) {
+            return new SecretQueryResult(null, true);
+        }
+
+        AppStyle.init();
+        AppTheme.init();
+
         var prop = new SimpleObjectProperty<>(secretValue);
         var r = AppWindowHelper.showBlockingAlert(alert -> {
                     alert.setTitle(AppI18n.get("askpassAlertTitle"));