Miscellaneous cleanups (#1934)

* build-logic: cleanups

* coroutine-utils-testing: cleanups

* coroutine-utils: cleanups

* crypto-common: cleanups

* crypto-pgpainless: cleanups

* format-common: cleanups

2 files changed, 4 insertions, 5 deletions

diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt b/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt
index d336e86c..b7dcdd0d 100644
--- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt
+++ b/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt
@@ -38,13 +38,12 @@ public sealed class GpgIdentifier {
   }
 
   public companion object {
-    @OptIn(ExperimentalUnsignedTypes::class)
     public fun fromString(identifier: String): GpgIdentifier? {
       if (identifier.isEmpty()) return null
       // Match long key IDs:
       // FF22334455667788 or 0xFF22334455667788
       val maybeLongKeyId =
-        identifier.removePrefix("0x").takeIf { it.matches("[a-fA-F0-9]{16}".toRegex()) }
+        identifier.removePrefix("0x").takeIf { it.matches("[a-fA-F\\d]{16}".toRegex()) }
       if (maybeLongKeyId != null) {
         val keyId = maybeLongKeyId.toULong(16)
         return KeyId(keyId.toLong())
@@ -53,7 +52,7 @@ public sealed class GpgIdentifier {
       // Match fingerprints:
       // FF223344556677889900112233445566778899 or 0xFF223344556677889900112233445566778899
       val maybeFingerprint =
-        identifier.removePrefix("0x").takeIf { it.matches("[a-fA-F0-9]{40}".toRegex()) }
+        identifier.removePrefix("0x").takeIf { it.matches("[a-fA-F\\d]{40}".toRegex()) }
       if (maybeFingerprint != null) {
         // Truncating to the long key ID is not a security issue since OpenKeychain only
         // accepts
diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt b/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt
index cf33b53f..60436d3b 100644
--- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt
+++ b/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt
@@ -161,17 +161,17 @@ class PGPKeyManagerTest {
   @Test
   fun getAllKeys() =
     scope.runTest {
-      // TODO: Should we check for more than 1 keys?
       // Check if KeyManager returns no key
       val noKeyList = keyManager.getAllKeys().unwrap()
       assertEquals(0, noKeyList.size)
 
       // Add key using KeyManager
       keyManager.addKey(key).unwrap()
+      keyManager.addKey(PGPKey(getArmoredPrivateKeyWithMultipleIdentities())).unwrap()
 
       // Check if KeyManager returns one key
       val singleKeyList = keyManager.getAllKeys().unwrap()
-      assertEquals(1, singleKeyList.size)
+      assertEquals(2, singleKeyList.size)
     }
 
   @Test