Merge branch 'main' into develop

[ci skip]

Author: overheadhunter

.github/workflows/publish-central.yml

@@ -28,6 +28,11 @@ jobs:
       - name: Deploy
         run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
         env:
+          MAVEN_OPTS: >
+            --add-opens=java.base/java.util=ALL-UNNAMED
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens=java.base/java.text=ALL-UNNAMED
+            --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>integrations-api</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <name>Cryptomator Integrations API</name>
     <description>Defines optional service interfaces that may be used by Cryptomator</description>

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

@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.stream.Stream;
 
@@ -55,10 +56,10 @@ default void storePassphrase(String key, CharSequence passphrase) throws Keychai
 	 * @throws KeychainAccessException If storing the password failed
 	 */
 	@Blocking
-	void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException;
+	void storePassphrase(String key, @Nullable String displayName, CharSequence passphrase) throws KeychainAccessException;
 
 	/**
-	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 * @param key Unique key previously used while {@link #storePassphrase(String, String, CharSequence)}  storing a passphrase}.
 	 * @return The stored passphrase for the given key or <code>null</code> if no value for the given key could be found.
 	 * @throws KeychainAccessException If loading the password failed
 	 */
@@ -68,15 +69,15 @@ default void storePassphrase(String key, CharSequence passphrase) throws Keychai
 	/**
 	 * Deletes a passphrase with a given key.
 	 *
-	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 * @param key Unique key previously used while {@link #storePassphrase(String, String, CharSequence)}  storing a passphrase}.
 	 * @throws KeychainAccessException If deleting the password failed
 	 */
 	void deletePassphrase(String key) throws KeychainAccessException;
 
 	/**
 	 * Updates a passphrase with a given key. Noop, if there is no item for the given key.
 	 *
-	 * @param key        Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 * @param key        Unique key previously used while {@link #storePassphrase(String, String, CharSequence)}  storing a passphrase}.
 	 * @param passphrase The secret to be updated in this keychain.
 	 * @throws KeychainAccessException If changing the password failed
 	 * @deprecated Please use {@link #changePassphrase(String, String, CharSequence)} instead
@@ -90,15 +91,15 @@ default void changePassphrase(String key, CharSequence passphrase) throws Keycha
 	/**
 	 * Updates a passphrase with a given key and stores a name for that key. Noop, if there is no item for the given key.
 	 *
-	 * @param key         Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 * @param key         Unique key previously used while {@link #storePassphrase(String, String, CharSequence)}  storing a passphrase}.
 	 * @param displayName The according name to the key. That's the name of the vault displayed in the UI.
 	 *                    It's passed to the keychain as an additional information about the vault besides the key.
 	 *                    The parameter does not need to be unique or be checked by the keychain.
 	 * @param passphrase  The secret to be updated in this keychain.
 	 * @throws KeychainAccessException If changing the password failed
 	 */
 	@Blocking
-	void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException;
+	void changePassphrase(String key, @Nullable String displayName, CharSequence passphrase) throws KeychainAccessException;
 
 	/**
 	 * @return <code>true</code> if this KeychainAccessIntegration works on the current machine.