adjustments

bitwarden · Oct 3, 2024 · ecf6407 · ecf6407
1 parent 95dfe5e
commit ecf6407
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 19 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerImpl.kt
@@ -21,7 +21,7 @@ class FeatureFlagManagerImpl(
         get() = mapOf(
             CIPHER_KEY_ENCRYPTION_KEY to
                 isServerVersionAtLeast(
-                    serverConfigRepository.getLocalServerConfig(),
+                    serverConfigRepository.serverConfigStateFlow.value,
                     CIPHER_KEY_ENC_MIN_SERVER_VERSION,
                 ),
         )

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepository.kt
@@ -18,9 +18,4 @@ interface ServerConfigRepository {
      * updates the values using server side data.
      */
     suspend fun getServerConfig(forceRefresh: Boolean): ServerConfig?
-
-    /**
-     * Gets the state [ServerConfig] synchronously from local storage only.
-     */
-    fun getLocalServerConfig(): ServerConfig?
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt
@@ -59,10 +59,6 @@ class ServerConfigRepositoryImpl(
         return localConfig
     }
 
-    override fun getLocalServerConfig(): ServerConfig? {
-        return configDiskSource.serverConfig
-    }
-
     private companion object {
         private const val MINIMUM_CONFIG_SYNC_INTERVAL_SEC: Long = 60 * 60
     }

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ServerVersionUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ServerVersionUtils.kt
@@ -10,15 +10,19 @@ private const val SUFFIX_SEPARATOR = "-"
 /**
  * Checks if the server version is greater than another provided version, returns true if it is.
  */
- fun isServerVersionAtLeast(serverConfig: ServerConfig?, version: String): Boolean {
+fun isServerVersionAtLeast(serverConfig: ServerConfig?, version: String?): Boolean {
     val serverVersion = serverConfig
         ?.serverData
         ?.version
 
+    if (serverVersion.isNullOrEmpty() || version.isNullOrEmpty()) {
+        return false
+    }
+
     val serverVersionParts = getVersionComponents(serverVersion)
     val otherVersionParts = getVersionComponents(version)
 
-    if (serverVersionParts == null || otherVersionParts == null) {
+    if (serverVersionParts.isNullOrEmpty() || otherVersionParts.isNullOrEmpty()) {
         return false
     }
 
@@ -33,7 +37,9 @@ private const val SUFFIX_SEPARATOR = "-"
         }
     }
 
-    return true // Versions are equal
+
+    // Versions are equal
+    return true
 }
 
 /**

diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt
@@ -38,7 +38,7 @@ class FeatureFlagManagerTest {
     fun `server version is at least supplied version`() {
         val result =
             isServerVersionAtLeast(
-                fakeServerConfigRepository.getLocalServerConfig(),
+                fakeServerConfigRepository.serverConfigStateFlow.value,
                 "2024.2.0",
             )
 
@@ -50,14 +50,37 @@ class FeatureFlagManagerTest {
     fun `server version is not at least supplied version`() {
         val result =
             isServerVersionAtLeast(
-                fakeServerConfigRepository.getLocalServerConfig(),
+                fakeServerConfigRepository.serverConfigStateFlow.value,
                 "2024.12.0-suffix",
             )
 
         // This relies on the fake server version being "2024.7.0"
         assertFalse(result)
     }
 
+    @Test
+    fun `server version is the same as supplied version`() {
+        val result =
+            isServerVersionAtLeast(
+                fakeServerConfigRepository.serverConfigStateFlow.value,
+                "2024.7.0",
+            )
+
+        // This relies on the fake server version being "2024.7.0"
+        assertTrue(result)
+    }
+
+    @Test
+    fun `server version is not the same as blank supplied version`() {
+        val result =
+            isServerVersionAtLeast(
+                fakeServerConfigRepository.serverConfigStateFlow.value,
+                "",
+            )
+
+        assertFalse(result)
+    }
+
     @Test
     fun `ServerConfigRepository flow with value should trigger new flags`() = runTest {
         fakeServerConfigRepository.serverConfigValue = null

diff --git a/...test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt b/...test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt
@@ -27,10 +27,6 @@ class FakeServerConfigRepository : ServerConfigRepository {
         return serverConfigValue
     }
 
-    override fun getLocalServerConfig(): ServerConfig? {
-        return SERVER_CONFIG
-    }
-
     override val serverConfigStateFlow: StateFlow<ServerConfig?>
         get() = mutableServerConfigFlow
 }