Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-23 12:09:45 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[ci skip] Merge branch 'main' into develop

Browse Source
This commit is contained in:
Armin Schrenk 2024-09-17 10:03:45 +02:00
commit 1954f31910
No known key found for this signature in database
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mac-dmg.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-11
- os: macos-12
architecture: x64
output-suffix: x64
xcode-path: '/Applications/Xcode_13.2.1.app'

3
dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml vendored
View File

@ -74,6 +74,9 @@
</content_rating>
<releases>
<release date="2024-09-17" version="1.14.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.0</url>
</release>
<release date="2024-06-26" version="1.13.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.13.0</url>
</release>

10
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>cryptomator</artifactId>
<version>1.13.0</version>
<version>1.15.0-SNAPSHOT</version>
<name>Cryptomator Desktop App</name>
<organization>
@ -33,11 +33,11 @@
<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents</nonModularGroupIds>
<!-- cryptomator dependencies -->
<cryptomator.cryptofs.version>2.7.0-beta1</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.4.0-beta2</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.3.0-beta1</cryptomator.integrations.win.version> <!-- TODO update to 1.3.0 once released -->
<cryptomator.cryptofs.version>2.7.0</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.4.0</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.3.0</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.2.4</cryptomator.integrations.mac.version>
<cryptomator.integrations.linux.version>1.5.0-beta4</cryptomator.integrations.linux.version> <!-- TODO update to 1.5.0 once released -->
<cryptomator.integrations.linux.version>1.5.0</cryptomator.integrations.linux.version>
<cryptomator.fuse.version>5.0.0</cryptomator.fuse.version>
<cryptomator.webdav.version>2.0.6</cryptomator.webdav.version>

2
src/main/java/org/cryptomator/common/keychain/KeychainManager.java
View File

@ -44,7 +44,7 @@ public class KeychainManager implements KeychainAccessProvider {
}
@Override
public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
getKeychainOrFail().storePassphrase(key, displayName, passphrase);
setPassphraseStored(key, true);
}

5
src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
View File

@ -5,6 +5,7 @@
*******************************************************************************/
package org.cryptomator.common.keychain;
import org.cryptomator.integrations.keychain.KeychainAccessException;
import org.cryptomator.integrations.keychain.KeychainAccessProvider;
import java.util.HashMap;
@ -20,7 +21,7 @@ class MapKeychainAccess implements KeychainAccessProvider {
}
@Override
public void storePassphrase(String key, String displayName,CharSequence passphrase) {
public void storePassphrase(String key, String displayName,CharSequence passphrase, boolean ignored) {
char[] pw = new char[passphrase.length()];
for (int i = 0; i < passphrase.length(); i++) {
pw[i] = passphrase.charAt(i);
@ -39,7 +40,7 @@ class MapKeychainAccess implements KeychainAccessProvider {
}
@Override
public void changePassphrase(String key, String displayName, CharSequence passphrase) {
public void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
map.get(key);
storePassphrase(key, displayName, passphrase);
}