lee/xpipe
1
0 Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-10-07 23:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize keepassxc access

Browse Source
This commit is contained in:
crschnick committed 2026-06-09 20:11:35 +00:00
1 parent cafc20fc6c
commit b4113235f7
1 file changed
+18 -19
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/pwman/KeePassXcPasswordManager.java
+18 -19
View File
@@ -119,7 +119,7 @@ public class KeePassXcPasswordManager implements PasswordManager {
p);
}
private static KeePassXcAssociationKey associate() throws Exception {
private static synchronized KeePassXcAssociationKey associate() throws Exception {
var found = findKeePassProxy();
if (found.isEmpty()) {
throw ErrorEventFactory.expected(new UnsupportedOperationException("No KeePassXC installation was found"));
@@ -137,14 +137,14 @@ public class KeePassXcPasswordManager implements PasswordManager {
}
}
public static void reset() {
public static synchronized void reset() {
if (client != null) {
client.disconnect();
client = null;
}
}
private synchronized KeePassXcProxyClient getOrCreateClient() throws Exception {
private KeePassXcProxyClient getOrCreateClient() throws Exception {
if (client == null) {
var found = findKeePassProxy();
if (found.isEmpty()) {
@@ -269,22 +269,21 @@ public class KeePassXcPasswordManager implements PasswordManager {
@Override
public Result query(String key) {
try {
var hasScheme = Pattern.compile("^\\w+://").matcher(key).find();
var fixedKey = hasScheme ? key : "https://" + key;
var isPrefs = this == AppPrefs.get().passwordManager().getValue();
var client = getOrCreateClient();
// The prefs value might be updated during the client creation
var effectiveKeys = isPrefs
? ((KeePassXcPasswordManager)
AppPrefs.get().passwordManager().getValue())
.getAssociationKeys()
: associationKeys;
var credentials = client.getCredentials(effectiveKeys, fixedKey);
return Result.of(credentials, null);
} catch (Exception e) {
ErrorEventFactory.fromThrowable(e).handle();
return null;
synchronized (KeePassXcPasswordManager.class) {
try {
var hasScheme = Pattern.compile("^\\w+://").matcher(key).find();
var fixedKey = hasScheme ? key : "https://" + key;
var isPrefs = this == AppPrefs.get().passwordManager().getValue();
var client = getOrCreateClient();
// The prefs value might be updated during the client creation
var effectiveKeys =
isPrefs ? ((KeePassXcPasswordManager) AppPrefs.get().passwordManager().getValue()).getAssociationKeys() : associationKeys;
var credentials = client.getCredentials(effectiveKeys, fixedKey);
return Result.of(credentials, null);
} catch (Exception e) {
ErrorEventFactory.fromThrowable(e).handle();
return null;
}
}
}