mirror of
https://github.com/xpipe-io/xpipe.git
synced 2026-04-22 15:40:31 -04:00
Rework
This commit is contained in:
@@ -68,7 +68,7 @@ public class SshAgentKeyListComp extends SimpleRegionBuilder {
|
||||
entryButton.setMaxWidth(400);
|
||||
entryButton.getStyleClass().add(Styles.FLAT);
|
||||
entryButton.setOnAction(e -> {
|
||||
value.setValue(useKeyNames && entry.getName() != null ? entry.getName() : entry.toString());
|
||||
value.setValue(useKeyNames && entry.getName() != null ? entry.getName() : entry.getType() + " " + entry.getPublicKey());
|
||||
popover.hide();
|
||||
e.consume();
|
||||
});
|
||||
|
||||
@@ -45,7 +45,7 @@ public class SshIdentityStateManager {
|
||||
|
||||
if (external && !gpgRunning && !opensshRunning) {
|
||||
throw ErrorEventFactory.expected(new IllegalStateException(
|
||||
"An external password manager agent is running, but XPipe requested to use another SSH agent. You have to disable the "
|
||||
"An external password manager agent is running, but XPipe requested to use another SSH agent. You have to disable the other running "
|
||||
+ "password manager agent first."));
|
||||
}
|
||||
|
||||
|
||||
@@ -262,8 +262,9 @@ public class KeePassXcProxyClient {
|
||||
|
||||
Map<String, Object> responseMap = jsonToMap(responseJson);
|
||||
if (responseMap.containsKey("error")) {
|
||||
throw ErrorEventFactory.expected(
|
||||
new IllegalStateException(responseMap.get("error").toString()));
|
||||
var err = responseMap.get("error").toString();
|
||||
var msg = "No logins found".equals(err) ? "No logins found for " + url : err;
|
||||
throw ErrorEventFactory.expected(new IllegalStateException(msg));
|
||||
}
|
||||
|
||||
if (responseMap.containsKey("message") && responseMap.containsKey("nonce")) {
|
||||
|
||||
@@ -79,7 +79,7 @@ public class OnePasswordManager implements PasswordManager {
|
||||
return new OptionsBuilder()
|
||||
.nameAndDescription("onePasswordManagerAccount")
|
||||
.addString(account)
|
||||
.hide(account.isNull().and(availableAccounts.emptyProperty()))
|
||||
.hide(account.isNull().and(availableAccounts.sizeProperty().lessThan(2)))
|
||||
.nameAndDescription("passwordManagerTest")
|
||||
.addComp(new PasswordManagerTestComp(true))
|
||||
.nameAndDescription("passwordManagerKeyStrategy")
|
||||
|
||||
Reference in New Issue
Block a user