rename SecretServiceto GnomeKeyring

still uses secret-service API, but is only supported if the gnome keyring dbus interface is present

Author: infeo

src/main/java/module-info.java

@@ -5,7 +5,7 @@
 import org.cryptomator.integrations.tray.TrayMenuController;
 import org.cryptomator.linux.autostart.FreedesktopAutoStartService;
 import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
-import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
+import org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess;
 import org.cryptomator.linux.quickaccess.DolphinPlaces;
 import org.cryptomator.linux.quickaccess.NautilusBookmarks;
 import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
@@ -20,7 +20,7 @@
 	requires de.swiesend.secretservice;
 
 	provides AutoStartProvider with FreedesktopAutoStartService;
-	provides KeychainAccessProvider with SecretServiceKeychainAccess, KDEWalletKeychainAccess;
+	provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;
 	provides RevealPathService with DBusSendRevealPathService;
 	provides TrayMenuController with AppindicatorTrayMenuController;
 	provides QuickAccessService with NautilusBookmarks, DolphinPlaces;

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

@@ -14,15 +14,15 @@
 
 @Priority(900)
 @OperatingSystem(OperatingSystem.Value.LINUX)
-public class SecretServiceKeychainAccess implements KeychainAccessProvider {
+public class GnomeKeyringKeychainAccess implements KeychainAccessProvider {
 
-	private static final Logger LOG = LoggerFactory.getLogger(SecretServiceKeychainAccess.class);
+	private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringKeychainAccess.class);
 
 	private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
 
 	@Override
 	public String displayName() {
-		return "Gnome Keyring";
+		return "GNOME Keyring";
 	}
 
 	@Override

src/main/resources/META-INF/services/org.cryptomator.integrations.keychain.KeychainAccessProvider

@@ -1,2 +1,2 @@
 org.cryptomator.linux.keychain.KDEWalletKeychainAccess
-org.cryptomator.linux.keychain.SecretServiceKeychainAccess
+org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess

…ain/SecretServiceKeychainAccessTest.java …hain/GnomeKeyringKeychainAccessTest.javasrc/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java renamed to src/test/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccessTest.java src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java renamed to src/test/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccessTest.java

@@ -20,7 +20,7 @@
  * Unit tests for GNOME keyring access via DBUS.
  */
 @EnabledIfEnvironmentVariable(named = "DISPLAY", matches = ".*")
-public class SecretServiceKeychainAccessTest {
+public class GnomeKeyringKeychainAccessTest {
 
 	private static boolean isInstalled;
 
@@ -42,7 +42,7 @@ public static void checkSystemAndSetup() throws IOException {
 
 	@Test
 	public void testIsSupported() {
-		var gnomeKeyring = new SecretServiceKeychainAccess();
+		var gnomeKeyring = new GnomeKeyringKeychainAccess();
 		Assertions.assertEquals(isInstalled, gnomeKeyring.isSupported());
 	}
 
@@ -52,7 +52,7 @@ public void testIsSupported() {
 	class FunctionalTests {
 
 		static final String KEY_ID = "cryptomator-test-" + UUID.randomUUID();
-		final SecretServiceKeychainAccess gnomeKeyring = new SecretServiceKeychainAccess();
+		final GnomeKeyringKeychainAccess gnomeKeyring = new GnomeKeyringKeychainAccess();
 
 		@Test
 		@Order(1)
@@ -82,7 +82,7 @@ public void testLoadNotExisting() throws KeychainAccessException {
 		}
 
 		public static boolean gnomeKeyringAvailableAndUnlocked() {
-			var secretServiceKeychain = new SecretServiceKeychainAccess();
+			var secretServiceKeychain = new GnomeKeyringKeychainAccess();
 			return secretServiceKeychain.isSupported() && !secretServiceKeychain.isLocked();
 		}
 	}