Skip to content

Commit 5c20e25

Browse files
committed
Merge branch 'integrations-api-1.x' into develop
2 parents cb22560 + 057129f commit 5c20e25

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

gradle/libs.versions.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# This file was generated by the Gradle 'init' task.
22
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
33

4+
# ToDo Change to the correct release version of the integrations-api
5+
# ToDo Check, whether JUnit 5 versions are compatible (needs to be the same as for integrations-api)
46
[versions]
57
com-bitwarden-sdk-secrets = "1.0.1"
6-
org-cryptomator-integrations-api = "1.5.1"
7-
org-junit-jupiter-junit-jupiter = "5.12.2"
8-
org-junit-jupiter-junit-jupiter-api = "5.12.2"
9-
org-junit-jupiter-junit-jupiter-engine = "5.12.2"
8+
org-cryptomator-integrations-api = "1.6.0"
9+
org-junit-jupiter-junit-jupiter = "5.12.1"
10+
org-junit-jupiter-junit-jupiter-api = "5.12.1"
11+
org-junit-jupiter-junit-jupiter-engine = "5.12.1"
1012
org-slf4j-slf4j-api = "2.0.17"
1113
org-slf4j-slf4j-simple = "2.0.17"
1214

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public BitwardenAccess() {
5757
}
5858

5959
@Override
60-
public String displayName() { return "Bitwarden"; }
60+
public String getName() { return "Bitwarden"; }
6161

6262
@Override
6363
public boolean isSupported() { return isSupported; }
@@ -66,12 +66,7 @@ public BitwardenAccess() {
6666
public boolean isLocked() { return false; }
6767

6868
@Override
69-
public void storePassphrase(String vault, String displayName, CharSequence password) throws KeychainAccessException {
70-
storePassphrase(vault, displayName, password, false);
71-
}
72-
73-
@Override
74-
public void storePassphrase(String vault, String name, CharSequence password, boolean requireOsAuthentication) throws KeychainAccessException {
69+
public void storePassphrase(String vault, String name, CharSequence password) throws KeychainAccessException {
7570
try {
7671
var projectId = getprojectId();
7772
var secret = getSecret(vault);
@@ -115,11 +110,6 @@ public void deletePassphrase(String vault) throws KeychainAccessException {
115110
}
116111
}
117112

118-
@Override
119-
public void changePassphrase(String vault, CharSequence password) throws KeychainAccessException {
120-
changePassphrase(vault, "Vault", password);
121-
}
122-
123113
@Override
124114
public void changePassphrase(String vault, String name, CharSequence password) throws KeychainAccessException {
125115
try {

0 commit comments

Comments
 (0)