beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 00:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dashlane fixes

Browse source
This commit is contained in:
crschnick 2024-09-28 10:04:57 +00:00
parent 9f5446e8cd
commit d0bd6a176b
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/io/xpipe/app/prefs/ExternalPasswordManager.java
View file

@ -1,7 +1,7 @@
package io.xpipe.app.prefs;
import io.xpipe.app.ext.LocalStore;
import io.xpipe.app.ext.PrefsChoiceValue;
import io.xpipe.app.ext.ProcessControlProvider;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.util.LocalShell;
import io.xpipe.core.process.OsType;
@ -22,8 +22,16 @@ public interface ExternalPasswordManager extends PrefsChoiceValue {
return null;
}
try (var cc = new LocalStore().control().command(cmd).start()) {
return cc.readStdoutOrThrow();
try (var cc = ProcessControlProvider.get().createLocalProcessControl(true).command(cmd).start()) {
var out = cc.readStdoutOrThrow();
// Dashlane fixes
var rawCmd = AppPrefs.get().passwordManagerCommand.get();
if (rawCmd.contains("dcli")) {
out = out.lines().findFirst().map(s -> s.trim().replaceAll("\\s+$", "")).orElse(null);
}
return out;
} catch (Exception ex) {
ErrorEvent.fromThrowable("Unable to retrieve password with command " + cmd, ex)
.expected()