diff --git a/app/src/main/java/io/xpipe/app/pwman/PasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/PasswordManager.java index e87cbd040..baa702a7a 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/PasswordManager.java @@ -107,14 +107,15 @@ public interface PasswordManager { @AllArgsConstructor class ListEntry { - String title; + String entryTitle; + String listTitle; String key; String internalId; ListEntryType type; List urls; public boolean matches(String filter) { - return title.toLowerCase().contains(filter.toLowerCase()) + return listTitle.toLowerCase().contains(filter.toLowerCase()) || key.toLowerCase().contains(filter.toLowerCase()) || urls.stream().anyMatch(url -> url.toLowerCase().contains(filter.toLowerCase())) || (internalId != null && internalId.equalsIgnoreCase(filter)); diff --git a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerTestComp.java b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerTestComp.java index 2f2fc39a8..73acb91ce 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerTestComp.java +++ b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerTestComp.java @@ -147,7 +147,7 @@ public class PasswordManagerTestComp extends SimpleRegionBuilder { shown, all, entry -> { - var buttonName = entry.getTitle(); + var buttonName = entry.getListTitle(); var entryButton = new ButtonComp(new ReadOnlyObjectWrapper<>(buttonName), () -> { popover.hide(); diff --git a/lang/strings/fixed_en.properties b/lang/strings/fixed_en.properties index 05fd8b5f9..3038e7735 100644 --- a/lang/strings/fixed_en.properties +++ b/lang/strings/fixed_en.properties @@ -167,7 +167,6 @@ neovim=Neovim sms=SMS hashicorpVaultPlaceholder=/path/to/secret[?user=&pass=&private-key=&public-key=] hashicorpVault=Hashicorp Vault -protonPassPasswordPlaceholder=Vault Name/Item name protonPass=Proton Pass passwork=Passwork passworkPlaceholder=Item ID diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index 012506658..573e2193b 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -1497,7 +1497,8 @@ updateReinstallAction=Perform clean reinstall updateReinstallActionDescription=Reinstall XPipe instead of performing an incremental update, your data is preserved updateFailAction=Install update manually updateFailActionDescription=Check out the latest releases at GitHub -onePasswordPlaceholder=Item name or op:// URL +#force +onePasswordPlaceholder=Item name | op:// URL computeDirectorySizes=Compute directory sizes #context: Verb, to compute computeSize=Compute size @@ -2361,10 +2362,12 @@ skipRole=Skip role disableRole=Disable role feedback=Feedback bitwardenCustomServerToggle=Use custom Bitwarden server -bitwardenCustomServerToggleDescription=Whether to use a custom server for Bitwarden instead of the default +#force +bitwardenCustomServerToggleDescription=Whether to use a custom server for Bitwarden instead of bitwarden.com bitwardenCustomServer=Server address bitwardenCustomServerDescription=The address of the Bitwarden server bitwardenCustomServerTitle=Bitwarden server login batchActionsIncompatible=Mixed entry types selected, no actions available batchActionsEmpty=No actions available for selected entries +bitwardenPasswordPlaceholder=Item name | Item UUID