File tree Expand file tree Collapse file tree 4 files changed +10
-10
lines changed
org/cryptomator/linux/keychain
resources/META-INF/services
test/java/org/cryptomator/linux/keychain Expand file tree Collapse file tree 4 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 5
5
import org .cryptomator .integrations .tray .TrayMenuController ;
6
6
import org .cryptomator .linux .autostart .FreedesktopAutoStartService ;
7
7
import org .cryptomator .linux .keychain .KDEWalletKeychainAccess ;
8
- import org .cryptomator .linux .keychain .SecretServiceKeychainAccess ;
8
+ import org .cryptomator .linux .keychain .GnomeKeyringKeychainAccess ;
9
9
import org .cryptomator .linux .quickaccess .DolphinPlaces ;
10
10
import org .cryptomator .linux .quickaccess .NautilusBookmarks ;
11
11
import org .cryptomator .linux .revealpath .DBusSendRevealPathService ;
20
20
requires de .swiesend .secretservice ;
21
21
22
22
provides AutoStartProvider with FreedesktopAutoStartService ;
23
- provides KeychainAccessProvider with SecretServiceKeychainAccess , KDEWalletKeychainAccess ;
23
+ provides KeychainAccessProvider with GnomeKeyringKeychainAccess , KDEWalletKeychainAccess ;
24
24
provides RevealPathService with DBusSendRevealPathService ;
25
25
provides TrayMenuController with AppindicatorTrayMenuController ;
26
26
provides QuickAccessService with NautilusBookmarks , DolphinPlaces ;
Original file line number Diff line number Diff line change 14
14
15
15
@ Priority (900 )
16
16
@ OperatingSystem (OperatingSystem .Value .LINUX )
17
- public class SecretServiceKeychainAccess implements KeychainAccessProvider {
17
+ public class GnomeKeyringKeychainAccess implements KeychainAccessProvider {
18
18
19
- private static final Logger LOG = LoggerFactory .getLogger (SecretServiceKeychainAccess .class );
19
+ private static final Logger LOG = LoggerFactory .getLogger (GnomeKeyringKeychainAccess .class );
20
20
21
21
private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator" ;
22
22
23
23
@ Override
24
24
public String displayName () {
25
- return "Gnome Keyring" ;
25
+ return "GNOME Keyring" ;
26
26
}
27
27
28
28
@ Override
Original file line number Diff line number Diff line change 1
1
org.cryptomator.linux.keychain.KDEWalletKeychainAccess
2
- org.cryptomator.linux.keychain.SecretServiceKeychainAccess
2
+ org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess
Original file line number Diff line number Diff line change 20
20
* Unit tests for GNOME keyring access via DBUS.
21
21
*/
22
22
@ EnabledIfEnvironmentVariable (named = "DISPLAY" , matches = ".*" )
23
- public class SecretServiceKeychainAccessTest {
23
+ public class GnomeKeyringKeychainAccessTest {
24
24
25
25
private static boolean isInstalled ;
26
26
@@ -42,7 +42,7 @@ public static void checkSystemAndSetup() throws IOException {
42
42
43
43
@ Test
44
44
public void testIsSupported () {
45
- var gnomeKeyring = new SecretServiceKeychainAccess ();
45
+ var gnomeKeyring = new GnomeKeyringKeychainAccess ();
46
46
Assertions .assertEquals (isInstalled , gnomeKeyring .isSupported ());
47
47
}
48
48
@@ -52,7 +52,7 @@ public void testIsSupported() {
52
52
class FunctionalTests {
53
53
54
54
static final String KEY_ID = "cryptomator-test-" + UUID .randomUUID ();
55
- final SecretServiceKeychainAccess gnomeKeyring = new SecretServiceKeychainAccess ();
55
+ final GnomeKeyringKeychainAccess gnomeKeyring = new GnomeKeyringKeychainAccess ();
56
56
57
57
@ Test
58
58
@ Order (1 )
@@ -82,7 +82,7 @@ public void testLoadNotExisting() throws KeychainAccessException {
82
82
}
83
83
84
84
public static boolean gnomeKeyringAvailableAndUnlocked () {
85
- var secretServiceKeychain = new SecretServiceKeychainAccess ();
85
+ var secretServiceKeychain = new GnomeKeyringKeychainAccess ();
86
86
return secretServiceKeychain .isSupported () && !secretServiceKeychain .isLocked ();
87
87
}
88
88
}
You can’t perform that action at this time.
0 commit comments