Skip to content

Commit 418c777

Browse files
committed
Merge branch 'develop' into main
2 parents 740e5a0 + 98aa350 commit 418c777

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050

5151
<!-- runtime dependencies -->
52-
<api.version>1.0.0-rc1</api.version>
53-
<keepassxc-proxy.version>0.0.5</keepassxc-proxy.version>
54-
<guava.version>30.0-jre</guava.version>
55-
<slf4j.version>1.7.30</slf4j.version>
56-
<junit.version>5.7.0</junit.version>
52+
<api.version>1.0.0</api.version>
53+
<keepassxc-proxy.version>0.0.6</keepassxc-proxy.version>
54+
<guava.version>31.0.1-jre</guava.version>
55+
<slf4j.version>1.7.32</slf4j.version>
56+
<junit.version>5.8.1</junit.version>
5757
</properties>
5858

5959
<dependencies>

src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@ public void storePassphrase(String vault, CharSequence password) throws Keychain
6363
ensureAssociation();
6464
var urlVault = URL_SCHEME + vault;
6565
var group = proxy.createNewGroup(APP_NAME); // Store passphrase in group APP_NAME
66-
if (proxy.loginExists(urlVault, null, false, List.of(proxy.exportConnection()), password.toString())) {
66+
var login = proxy.loginExists(urlVault, null, false, List.of(proxy.exportConnection()), password.toString());
67+
if (login.isFound() && null != login.getUuid() && !login.getUuid().isBlank()) {
6768
return;
6869
}
69-
if (!proxy.setLogin(urlVault, null, null, "Vault", password.toString(), APP_NAME, group.get("uuid"), null)) {
70+
if (!proxy.setLogin(urlVault, null, null, "Vault", password.toString(), APP_NAME, group.get("uuid"), login.getUuid())) {
7071
throw new KeychainAccessException("Storing of the password failed");
7172
} else {
7273
LOG.info("Password successfully stored for vault " + urlVault.substring(URL_SCHEME.length()));

0 commit comments

Comments
 (0)