Skip to content

New secret service #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
purejava wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

New secret service #125

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a8a57c2
Replace GnomeKeyringKeychainAccess, KDEWalletKeychainAccess by Secret…
purejava Oct 25, 2025
13e3132
Encrypted session is needed for tests to work
purejava Oct 25, 2025
5163d8b
Ensure unlocking
purejava Oct 26, 2025
9f227d0
Set default alias when missing
purejava Oct 26, 2025
c22f813
Migrate KDE wallet entries
purejava Oct 26, 2025
161ea15
Service 1.0.0 was released 🎉
purejava Oct 27, 2025
b9c6eb1
Get back GnomeKeyringKeychainAccess, KDEWalletKeychainAccess
purejava Oct 27, 2025
1c54f97
Remove added line by IDE
purejava Oct 27, 2025
17a4f69
Keep migrated items
purejava Oct 28, 2025
ca6b4d8
Merge branch 'develop' into new-secret-service
purejava Dec 7, 2025
857c812
Merge branch 'develop' into new-secret-service
purejava Dec 21, 2025
3067f3b
Merge branch 'develop' into new-secret-service
purejava Jan 1, 2026
163ad9a
Service 1.1.0 was released 🎉
purejava Jan 1, 2026
d17d556
Check wether DBus is available on the system
purejava Feb 4, 2026
b8bb5bb
Deprecate KDE Wallet and GNOME keyring
purejava Feb 4, 2026
e8b8bd5
Migration is done with GeneralPreferencesController#migrateKeychainEn…
purejava Feb 5, 2026
e3bae1d
Fix logic
purejava Feb 5, 2026
1f5b1b4
Annotate the actual classes, not the test classes
purejava Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
<!-- runtime dependencies -->

<api.version>1.7.0</api.version>
<secret-service.version>2.0.1-alpha</secret-service.version>
<kdewallet.version>1.4.0</kdewallet.version>
<secret-service.version>1.0.0</secret-service.version>
<slf4j.version>2.0.17</slf4j.version>
<appindicator.version>1.4.2</appindicator.version>

Expand Down Expand Up @@ -73,15 +72,10 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>de.swiesend</groupId>
<groupId>org.purejava</groupId>
<artifactId>secret-service</artifactId>
<version>${secret-service.version}</version>
</dependency>
<dependency>
<groupId>org.purejava</groupId>
<artifactId>kdewallet</artifactId>
<version>${kdewallet.version}</version>
</dependency>
<!-- Java bindings for appindicator -->
<dependency>
<groupId>org.purejava</groupId>
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import org.cryptomator.integrations.revealpath.RevealPathService;
import org.cryptomator.integrations.tray.TrayMenuController;
import org.cryptomator.linux.autostart.FreedesktopAutoStartService;
import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
import org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess;
import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
import org.cryptomator.linux.quickaccess.DolphinPlaces;
import org.cryptomator.linux.quickaccess.NautilusBookmarks;
import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
Expand All @@ -16,12 +15,11 @@
requires org.slf4j;
requires org.freedesktop.dbus;
requires org.purejava.appindicator;
requires org.purejava.kwallet;
requires de.swiesend.secretservice;
requires org.purejava.secret;
requires java.xml;

provides AutoStartProvider with FreedesktopAutoStartService;
provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;
provides KeychainAccessProvider with SecretServiceKeychainAccess;
provides RevealPathService with DBusSendRevealPathService;
provides TrayMenuController with AppindicatorTrayMenuController;
provides QuickAccessService with NautilusBookmarks, DolphinPlaces;
Expand Down
103 changes: 0 additions & 103 deletions src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java
View file
Open in desktop

This file was deleted.

195 changes: 0 additions & 195 deletions src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
View file
Open in desktop

This file was deleted.

Loading