Update

StanfordSpezi · Oct 21, 2024 · 930f640 · 930f640
1 parent d57fdd6
commit 930f640
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...rc/androidTest/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialStorageTests.kt b/...rc/androidTest/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialStorageTests.kt
@@ -37,7 +37,7 @@ class CredentialStorageTests {
 
     @After
     fun tearDown() {
-        credentialStorage.deleteAll(CredentialType.ALL)
+        credentialStorage.deleteAll(CredentialType.All)
     }
 
     @Test
@@ -149,7 +149,7 @@ class CredentialStorageTests {
         listOf(serverCredential, nonServerCredential).forEach { credentialStorage.store(it) }
 
         // when
-        credentialStorage.deleteAll(EnumSet.of(CredentialType.SERVER))
+        credentialStorage.deleteAll(CredentialType.Server)
         val storedServerCredential = credentialStorage.retrieve(
             username = serverCredential.username,
         )
@@ -168,7 +168,7 @@ class CredentialStorageTests {
         listOf(serverCredential, nonServerCredential).forEach { credentialStorage.store(it) }
 
         // when
-        credentialStorage.deleteAll(EnumSet.of(CredentialType.NON_SERVER))
+        credentialStorage.deleteAll(CredentialType.NonServer)
         val storedServerCredential = credentialStorage.retrieve(
             username = serverCredential.username,
             server = serverCredential.server,
@@ -188,7 +188,7 @@ class CredentialStorageTests {
         listOf(serverCredential, nonServerCredential).forEach { credentialStorage.store(it) }
 
         // when
-        credentialStorage.deleteAll(CredentialType.ALL)
+        credentialStorage.deleteAll(CredentialType.All)
         val storedServerCredential = credentialStorage.retrieve(
             username = serverCredential.username,
         )

diff --git a/...es/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialStorage.kt b/...es/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialStorage.kt
@@ -66,7 +66,7 @@ internal class CredentialStorageImpl @Inject constructor(
 
     override fun deleteAll(types: EnumSet<CredentialType>) {
         if (types.isEmpty()) return
-        if (types == CredentialType.ALL) return storage.clear()
+        if (types == CredentialType.All) return storage.clear()
         val deleteServer = types.contains(CredentialType.SERVER)
         val deleteNonServer = types.contains(CredentialType.NON_SERVER)
         storage.allKeys().forEach { key ->

diff --git a/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialType.kt b/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/secure/CredentialType.kt
@@ -6,6 +6,8 @@ enum class CredentialType {
     SERVER, NON_SERVER;
 
     companion object {
-        val ALL: EnumSet<CredentialType> = EnumSet.allOf(CredentialType::class.java)
+        val All: EnumSet<CredentialType> = EnumSet.allOf(CredentialType::class.java)
+        val Server = EnumSet.of(CredentialType.SERVER)
+        val NonServer = EnumSet.of(CredentialType.NON_SERVER)
     }
 }