Skip to content

Commit a8a57c2

Browse files
committed
Replace GnomeKeyringKeychainAccess, KDEWalletKeychainAccess by SecretServiceKeychainAccess
1 parent 34377f1 commit a8a57c2

File tree

8 files changed

+151
-373
lines changed

8 files changed

+151
-373
lines changed

pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<!-- runtime dependencies -->
4242

4343
<api.version>1.7.0</api.version>
44-
<secret-service.version>2.0.1-alpha</secret-service.version>
45-
<kdewallet.version>1.4.0</kdewallet.version>
44+
<secret-service.version>1.0.0-SNAPSHOT</secret-service.version>
4645
<slf4j.version>2.0.17</slf4j.version>
4746
<appindicator.version>1.4.2</appindicator.version>
4847

@@ -73,15 +72,10 @@
7372
<version>${slf4j.version}</version>
7473
</dependency>
7574
<dependency>
76-
<groupId>de.swiesend</groupId>
75+
<groupId>org.purejava</groupId>
7776
<artifactId>secret-service</artifactId>
7877
<version>${secret-service.version}</version>
7978
</dependency>
80-
<dependency>
81-
<groupId>org.purejava</groupId>
82-
<artifactId>kdewallet</artifactId>
83-
<version>${kdewallet.version}</version>
84-
</dependency>
8579
<!-- Java bindings for appindicator -->
8680
<dependency>
8781
<groupId>org.purejava</groupId>

src/main/java/module-info.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import org.cryptomator.integrations.revealpath.RevealPathService;
55
import org.cryptomator.integrations.tray.TrayMenuController;
66
import org.cryptomator.linux.autostart.FreedesktopAutoStartService;
7-
import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
8-
import org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess;
7+
import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
98
import org.cryptomator.linux.quickaccess.DolphinPlaces;
109
import org.cryptomator.linux.quickaccess.NautilusBookmarks;
1110
import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
@@ -16,12 +15,11 @@
1615
requires org.slf4j;
1716
requires org.freedesktop.dbus;
1817
requires org.purejava.appindicator;
19-
requires org.purejava.kwallet;
20-
requires de.swiesend.secretservice;
18+
requires org.purejava.secret;
2119
requires java.xml;
2220

2321
provides AutoStartProvider with FreedesktopAutoStartService;
24-
provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;
22+
provides KeychainAccessProvider with SecretServiceKeychainAccess;
2523
provides RevealPathService with DBusSendRevealPathService;
2624
provides TrayMenuController with AppindicatorTrayMenuController;
2725
provides QuickAccessService with NautilusBookmarks, DolphinPlaces;

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

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

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

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

0 commit comments

Comments
 (0)