Skip to content

Commit c8dc641

Browse files
committed
Merge branch 'develop' into release/1.7.0
2 parents 9b0391c + f958747 commit c8dc641

5 files changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
run: ./mvnw -B verify --no-transfer-progress
2929
- name: Attest
3030
if: startsWith(github.ref, 'refs/tags/')
31-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
31+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
3232
with:
3333
subject-path: |
3434
target/*.jar
3535
target/*.pom
36-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
36+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3737
with:
3838
name: artifacts
3939
path: target/*.jar

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
java-version: 25
2626
cache: 'maven'
2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
28+
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
2929
with:
3030
languages: java
3131
- name: Build
3232
run: ./mvnw -B test
3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
34+
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Changes to prior versions can be found on the [Github release page](https://gith
1818
### Changed
1919
* Require JDK 25
2020
* Pin GitHub action versions used in CI ([#132](https://github.com/cryptomator/integrations-linux/pull/132))
21-
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.21.0
21+
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.21.1
2222

2323

2424
## [1.6.1](https://github.com/cryptomator/integrations-linux/releases/tag/1.6.1) - 2025-09-17

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
<!-- runtime dependencies -->
4242
<api.version>1.8.0-beta1</api.version>
4343
<slf4j.version>2.0.17</slf4j.version>
44-
<jackson.version>2.21.0</jackson.version>
44+
<jackson.version>2.21.1</jackson.version>
4545
<secret-service.version>2.0.1-alpha</secret-service.version>
4646
<kdewallet.version>1.4.0</kdewallet.version>
4747
<secret-service-02.version>1.1.0</secret-service-02.version>
4848
<flatpakupdateportal.version>1.1.1</flatpakupdateportal.version>
4949
<appindicator.version>1.4.2</appindicator.version>
5050

5151
<!-- test dependencies -->
52-
<junit.version>6.0.2</junit.version>
52+
<junit.version>6.0.3</junit.version>
5353

5454
<!-- build plugin dependencies -->
55-
<mvn-compiler.version>3.14.1</mvn-compiler.version>
56-
<mvn-surefire.version>3.5.4</mvn-surefire.version>
55+
<mvn-compiler.version>3.15.0</mvn-compiler.version>
56+
<mvn-surefire.version>3.5.5</mvn-surefire.version>
5757
<mvn-enforcer.version>3.6.2</mvn-enforcer.version>
5858
<mvn-source.version>3.4.0</mvn-source.version>
5959
<mvn-javadoc.version>3.12.0</mvn-javadoc.version>

src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,13 @@ public void changePassphrase(String key, String displayName, CharSequence passph
143143

144144
@Override
145145
public boolean isSupported() {
146-
return session.setupEncryptedSession() &&
147-
session.getService().hasDefaultCollection();
146+
try {
147+
return session.setupEncryptedSession() &&
148+
session.getService().hasDefaultCollection();
149+
} catch (RuntimeException e) {
150+
LOG.debug("Not supported due to exception in isSupported method", e);
151+
return false;
152+
}
148153
}
149154

150155
@Override

0 commit comments

Comments
 (0)