Skip to content

Commit 826e29d

Browse files
committed
rename SecretServiceto GnomeKeyring
still uses secret-service API, but is only supported if the gnome keyring dbus interface is present
1 parent 2916df0 commit 826e29d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/main/java/module-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.cryptomator.integrations.tray.TrayMenuController;
66
import org.cryptomator.linux.autostart.FreedesktopAutoStartService;
77
import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
8-
import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
8+
import org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess;
99
import org.cryptomator.linux.quickaccess.DolphinPlaces;
1010
import org.cryptomator.linux.quickaccess.NautilusBookmarks;
1111
import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
@@ -20,7 +20,7 @@
2020
requires de.swiesend.secretservice;
2121

2222
provides AutoStartProvider with FreedesktopAutoStartService;
23-
provides KeychainAccessProvider with SecretServiceKeychainAccess, KDEWalletKeychainAccess;
23+
provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;
2424
provides RevealPathService with DBusSendRevealPathService;
2525
provides TrayMenuController with AppindicatorTrayMenuController;
2626
provides QuickAccessService with NautilusBookmarks, DolphinPlaces;

src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java renamed to src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
@Priority(900)
1616
@OperatingSystem(OperatingSystem.Value.LINUX)
17-
public class SecretServiceKeychainAccess implements KeychainAccessProvider {
17+
public class GnomeKeyringKeychainAccess implements KeychainAccessProvider {
1818

19-
private static final Logger LOG = LoggerFactory.getLogger(SecretServiceKeychainAccess.class);
19+
private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringKeychainAccess.class);
2020

2121
private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
2222

2323
@Override
2424
public String displayName() {
25-
return "Gnome Keyring";
25+
return "GNOME Keyring";
2626
}
2727

2828
@Override
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.cryptomator.linux.keychain.KDEWalletKeychainAccess
2-
org.cryptomator.linux.keychain.SecretServiceKeychainAccess
2+
org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess

src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java renamed to src/test/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccessTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* Unit tests for GNOME keyring access via DBUS.
2121
*/
2222
@EnabledIfEnvironmentVariable(named = "DISPLAY", matches = ".*")
23-
public class SecretServiceKeychainAccessTest {
23+
public class GnomeKeyringKeychainAccessTest {
2424

2525
private static boolean isInstalled;
2626

@@ -42,7 +42,7 @@ public static void checkSystemAndSetup() throws IOException {
4242

4343
@Test
4444
public void testIsSupported() {
45-
var gnomeKeyring = new SecretServiceKeychainAccess();
45+
var gnomeKeyring = new GnomeKeyringKeychainAccess();
4646
Assertions.assertEquals(isInstalled, gnomeKeyring.isSupported());
4747
}
4848

@@ -52,7 +52,7 @@ public void testIsSupported() {
5252
class FunctionalTests {
5353

5454
static final String KEY_ID = "cryptomator-test-" + UUID.randomUUID();
55-
final SecretServiceKeychainAccess gnomeKeyring = new SecretServiceKeychainAccess();
55+
final GnomeKeyringKeychainAccess gnomeKeyring = new GnomeKeyringKeychainAccess();
5656

5757
@Test
5858
@Order(1)
@@ -82,7 +82,7 @@ public void testLoadNotExisting() throws KeychainAccessException {
8282
}
8383

8484
public static boolean gnomeKeyringAvailableAndUnlocked() {
85-
var secretServiceKeychain = new SecretServiceKeychainAccess();
85+
var secretServiceKeychain = new GnomeKeyringKeychainAccess();
8686
return secretServiceKeychain.isSupported() && !secretServiceKeychain.isLocked();
8787
}
8888
}

0 commit comments

Comments
 (0)