2 files changed, 4 insertions, 3 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index 29bf880f..f9108b7d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -48,6 +48,7 @@ import at.asit.pdfover.signer.BkuSlConnector;
 import at.asit.pdfover.signer.SignatureException;
 import at.asit.pdfover.signer.UserCancelledException;
 import at.asit.pdfover.signer.pdfas.PdfAs4SLRequest;
+import at.asit.webauthn.WebAuthN;
 
 import static at.asit.pdfover.commons.Constants.ISNOTNULL;
 
@@ -57,7 +58,7 @@ public class MobileBKUConnector implements BkuSlConnector {
     private final @Nonnull MobileBKUState state;
     public MobileBKUConnector(@Nonnull MobileBKUState state) {
         this.state = state;
-        this.wantsFido2Default = state.getConfig().getFido2ByDefault();
+        this.wantsFido2Default = WebAuthN.isAvailable() && state.getConfig().getFido2ByDefault();
         state.storeRememberedCredentialsTo(this.credentials);
     }
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java
index 547f217f..b0506596 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java
@@ -48,7 +48,6 @@ public class MobileBKUFido2Composite extends StateComposite {
         this.fido2OptionsString = fido2Options;
         this.credential = null;
         this.userCancel = this.userSms = false;
-        this.btn_authenticate.setEnabled(WebAuthN.isAvailable());
     }
 
     public boolean isDone() { return ((this.credential != null) || this.userCancel || this.userSms); }
@@ -106,6 +105,7 @@ public class MobileBKUFido2Composite extends StateComposite {
         this.btn_authenticate = new Button(containerComposite, SWT.NATIVE);
         SWTUtils.anchor(btn_authenticate).top(50, -15).left(0, 90).right(100, -90);
         SWTUtils.addSelectionListener(btn_authenticate, this::beginAuthentication);
+        btn_authenticate.setEnabled(WebAuthN.isAvailable());
 
         this.btn_cancel = new Button(containerComposite, SWT.NATIVE);
         SWTUtils.anchor(btn_cancel).bottom(100, -10).right(100, -10);
@@ -124,7 +124,7 @@ public class MobileBKUFido2Composite extends StateComposite {
 
     @Override
     public void reloadResources() {
-        SWTUtils.setLocalizedText(btn_authenticate, "mobileBKU.authorize");
+        SWTUtils.setLocalizedText(btn_authenticate, WebAuthN.isAvailable() ? "mobileBKU.authorize" : "common.unavailable");
         SWTUtils.setLocalizedText(btn_cancel, "common.Cancel");
         SWTUtils.setLocalizedText(btn_sms, "tanEnter.SMS");
         SWTUtils.setLocalizedText(lnk_sigData, "mobileBKU.show");