Skip to content

Commit be3003b

Browse files
infeoinfeo
committed
Merge branch 'release/1.6.0'
2 parents 0bfafe7 + 56ca811 commit be3003b

File tree

7 files changed

+26
-95
lines changed

7 files changed

+26
-95
lines changed

‎.github/workflows/publish-central.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ jobs:
3131
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
3232
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
3333
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
34-
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
34+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
35+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

‎.github/workflows/publish-github.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ jobs:
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
23-
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
23+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
24+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-api</artifactId>
8-
<version>1.5.1</version>
8+
<version>1.6.0</version>
99

1010
<name>Cryptomator Integrations API</name>
1111
<description>Defines optional service interfaces that may be used by Cryptomator</description>
@@ -33,13 +33,13 @@
3333
<jetbrains-annotation.version>26.0.2</jetbrains-annotation.version>
3434

3535
<!-- Test dependencies -->
36-
<junit.version>5.12.0</junit.version>
37-
<mockito.version>5.15.2</mockito.version>
36+
<junit.version>5.12.1</junit.version>
37+
<mockito.version>5.16.1</mockito.version>
3838

3939
<!-- Build dependencies -->
4040
<mvn-compiler.version>3.14.0</mvn-compiler.version>
4141
<mvn-source.version>3.3.1</mvn-source.version>
42-
<mvn-surefire.version>3.5.2</mvn-surefire.version>
42+
<mvn-surefire.version>3.5.3</mvn-surefire.version>
4343
<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
4444
<mvn-gpg.version>3.2.7</mvn-gpg.version>
4545
<central-publishing.version>0.7.0</central-publishing.version>

‎src/main/java/org/cryptomator/integrations/keychain/KeychainAccessProvider.java‎

Lines changed: 3 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.cryptomator.integrations.keychain;
22

33
import org.cryptomator.integrations.common.IntegrationsLoader;
4+
import org.cryptomator.integrations.common.NamedServiceProvider;
45
import org.jetbrains.annotations.ApiStatus;
56
import org.jetbrains.annotations.Blocking;
67
import org.jetbrains.annotations.Nls;
@@ -11,7 +12,7 @@
1112
/**
1213
* This is the interface used by Cryptomator to store passwords securely in external keychains, such as system keychains or password managers.
1314
*/
14-
public interface KeychainAccessProvider {
15+
public interface KeychainAccessProvider extends NamedServiceProvider {
1516

1617
/**
1718
* Loads all available KeychainAccessProvider.
@@ -23,30 +24,6 @@ static Stream<KeychainAccessProvider> get() {
2324
return IntegrationsLoader.loadAll(KeychainAccessProvider.class).filter(KeychainAccessProvider::isSupported);
2425
}
2526

26-
/**
27-
* A name to display in UI elements. If required, this should be localized.
28-
*
29-
* @return user-friendly name (must not be null or empty)
30-
*/
31-
@Nls(capitalization = Nls.Capitalization.Title)
32-
String displayName();
33-
34-
/**
35-
* Associates a passphrase with a given key.
36-
* <p>
37-
* Note: Caller is responsible for zeroing the passphrase array after use.
38-
*
39-
* @param key Key used to retrieve the passphrase via {@link #loadPassphrase(String)}.
40-
* @param passphrase The secret to store in this keychain.
41-
* @throws KeychainAccessException If storing the password failed
42-
* @deprecated Please use {@link #storePassphrase(String, String, CharSequence)} instead
43-
*/
44-
@Deprecated
45-
@ApiStatus.ScheduledForRemoval(inVersion = "1.2.0")
46-
default void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
47-
storePassphrase(key, null, passphrase);
48-
}
49-
5027
/**
5128
* Associates a passphrase with a given key and a name for that key.
5229
* <p>
@@ -60,26 +37,7 @@ default void storePassphrase(String key, CharSequence passphrase) throws Keychai
6037
* @throws KeychainAccessException If storing the password failed
6138
*/
6239
@Blocking
63-
default void storePassphrase(String key, @Nullable String displayName, CharSequence passphrase) throws KeychainAccessException {
64-
storePassphrase(key, displayName, passphrase, false);
65-
}
66-
67-
/**
68-
* Associates a passphrase with a given key and a name for that key.
69-
* <p>
70-
* Note: Caller is responsible for zeroing the passphrase array after use.
71-
*
72-
* @param key Key used to retrieve the passphrase via {@link #loadPassphrase(String)}.
73-
* @param displayName The according name to the key. That's the name of the vault displayed in the UI.
74-
* It's passed to the keychain as an additional information about the vault besides the key.
75-
* The parameter does not need to be unique or be checked by the keychain.
76-
* @param passphrase The secret to store in this keychain.
77-
* @param requireOsAuthentication Defines, whether the user needs to authenticate to store a passphrase.
78-
* The authentication mechanism is provided by the operating system dependent
79-
* implementations of this API.
80-
* @throws KeychainAccessException If storing the password failed
81-
*/
82-
void storePassphrase(String key, @Nullable String displayName, CharSequence passphrase, boolean requireOsAuthentication) throws KeychainAccessException;
40+
void storePassphrase(String key, @Nullable String displayName, CharSequence passphrase) throws KeychainAccessException;
8341

8442
/**
8543
* @param key Unique key previously used while {@link #storePassphrase(String, String, CharSequence)} storing a passphrase}.
@@ -97,22 +55,6 @@ default void storePassphrase(String key, @Nullable String displayName, CharSeque
9755
*/
9856
void deletePassphrase(String key) throws KeychainAccessException;
9957

100-
/**
101-
* Updates a passphrase with a given key. Noop, if there is no item for the given key.
102-
* <p>
103-
* Note: Caller is responsible for zeroing the passphrase array after use.
104-
*
105-
* @param key Unique key previously used while {@link #storePassphrase(String, String, CharSequence)} storing a passphrase}.
106-
* @param passphrase The secret to be updated in this keychain.
107-
* @throws KeychainAccessException If changing the password failed
108-
* @deprecated Please use {@link #changePassphrase(String, String, CharSequence)} instead
109-
*/
110-
@Deprecated
111-
@ApiStatus.ScheduledForRemoval(inVersion = "1.2.0")
112-
default void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
113-
changePassphrase(key, null, passphrase);
114-
}
115-
11658
/**
11759
* Updates a passphrase with a given key and stores a name for that key. Noop, if there is no item for the given key.
11860
* <p>

‎src/main/java/org/cryptomator/integrations/uiappearance/UiAppearanceProvider.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
package org.cryptomator.integrations.uiappearance;
22

33
import org.cryptomator.integrations.common.IntegrationsLoader;
4+
import org.jetbrains.annotations.ApiStatus;
45

56
import java.util.Optional;
67

78
/**
89
* This is the interface used by Cryptomator to get os specific UI appearances and themes.
10+
*
11+
* @deprecated Cryptomator uses since version 1.14.0 the JavaFX framework in version 22, which provides via Platform.Preferences the system color scheme
912
*/
13+
@Deprecated(since = "1.6.0")
14+
@ApiStatus.ScheduledForRemoval(inVersion = "1.7.0")
1015
public interface UiAppearanceProvider {
1116

1217
/**

‎src/main/java/org/cryptomator/integrations/uiappearance/package-info.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Package for getting the OS color theme and listening to theme changes.
3+
*
4+
* @deprecated Cryptomator uses since version 1.14.0 the JavaFX framework in version 22, which provides via Platform.Preferences the system color scheme
5+
*/
6+
@Deprecated(since = "1.6.0")
7+
@ApiStatus.ScheduledForRemoval(inVersion = "1.7.0")
8+
package org.cryptomator.integrations.uiappearance;
9+
10+
import org.jetbrains.annotations.ApiStatus;

‎src/test/java/org/cryptomator/integrations/keychain/KeychainAccessProviderTest.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)