Merge branch 'only-show-unsupported-version-in-settings-droid-1103'

3 files changed, 9 insertions, 62 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt
index 91749b468e..78f1563c85 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt
@@ -77,8 +77,7 @@ class InAppNotificationControllerTest {
         tunnelStateNotifications.value = listOf(tunnelStateBlocked, tunnelStateError)
 
         val unsupportedVersion = InAppNotification.UnsupportedVersion(mockk())
-        val updateAvailable = InAppNotification.UpdateAvailable(mockk())
-        versionNotifications.value = listOf(unsupportedVersion, updateAvailable)
+        versionNotifications.value = listOf(unsupportedVersion)
 
         val accountExpiry = InAppNotification.AccountExpiry(DateTime.now())
         accountExpiryNotifications.value = listOf(accountExpiry)
@@ -93,7 +92,6 @@ class InAppNotificationControllerTest {
                     unsupportedVersion,
                     accountExpiry,
                     newDevice,
-                    updateAvailable,
                 ),
                 notifications
             )
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt
index 9d40f9715c..944ebc11a4 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt
@@ -23,10 +23,7 @@ class VersionNotificationUseCaseTest {
 
     private val mockAppVersionInfoRepository: AppVersionInfoRepository = mockk()
 
-    private val versionInfo =
-        MutableStateFlow(
-            VersionInfo(currentVersion = "", isSupported = true, suggestedUpgradeVersion = null)
-        )
+    private val versionInfo = MutableStateFlow(VersionInfo(currentVersion = "", isSupported = true))
     private lateinit var versionNotificationUseCase: VersionNotificationUseCase
 
     @BeforeEach
@@ -53,28 +50,6 @@ class VersionNotificationUseCaseTest {
     }
 
     @Test
-    fun `when a new version is available use case should emit UpdateAvailable with new version`() =
-        runTest {
-            versionNotificationUseCase().test {
-                // Arrange, Act
-                val upgradeVersionInfo =
-                    VersionInfo(
-                        currentVersion = "1.0",
-                        isSupported = true,
-                        suggestedUpgradeVersion = "1.1"
-                    )
-                awaitItem()
-                versionInfo.value = upgradeVersionInfo
-
-                // Assert
-                assertEquals(
-                    awaitItem(),
-                    listOf(InAppNotification.UpdateAvailable(upgradeVersionInfo))
-                )
-            }
-        }
-
-    @Test
     fun `when an unsupported version use case should emit UnsupportedVersion notification`() =
         runTest {
             versionNotificationUseCase().test {
@@ -83,7 +58,6 @@ class VersionNotificationUseCaseTest {
                     VersionInfo(
                         currentVersion = "1.0",
                         isSupported = false,
-                        suggestedUpgradeVersion = null
                     )
                 awaitItem()
                 versionInfo.value = upgradeVersionInfo
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt
index c76e2cd278..416dd7c1a9 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt
@@ -26,9 +26,7 @@ class SettingsViewModelTest {
     private val mockAppVersionInfoRepository: AppVersionInfoRepository = mockk()
 
     private val versionInfo =
-        MutableStateFlow(
-            VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = null)
-        )
+        MutableStateFlow(VersionInfo(currentVersion = "", isSupported = false))
 
     private lateinit var viewModel: SettingsViewModel
 
@@ -60,53 +58,30 @@ class SettingsViewModelTest {
     }
 
     @Test
-    fun `when AppVersionInfoCache returns isOutdated false uiState should return isUpdateAvailable false`() =
+    fun `when AppVersionInfoRepository returns isSupported true uiState should return isSupportedVersion true`() =
         runTest {
             // Arrange
-            val versionInfoTestItem =
-                VersionInfo(
-                    currentVersion = "1.0",
-                    isSupported = true,
-                    suggestedUpgradeVersion = null
-                )
-
-            // Act, Assert
-            viewModel.uiState.test {
-                awaitItem() // Wait for initial value
-
-                versionInfo.value = versionInfoTestItem
-                val result = awaitItem()
-                assertEquals(false, result.isUpdateAvailable)
-            }
-        }
-
-    @Test
-    fun `when AppVersionInfoCache returns isSupported false uiState should return isUpdateAvailable true`() =
-        runTest {
-            // Arrange
-            val versionInfoTestItem =
-                VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = "")
+            val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = true)
             versionInfo.value = versionInfoTestItem
 
             // Act, Assert
             viewModel.uiState.test {
                 val result = awaitItem()
-                assertEquals(true, result.isUpdateAvailable)
+                assertEquals(true, result.isSupportedVersion)
             }
         }
 
     @Test
-    fun `when AppVersionInfoCache returns isOutdated true uiState should return isUpdateAvailable true`() =
+    fun `when AppVersionInfoRepository returns isSupported false uiState should return isSupportedVersion false`() =
         runTest {
             // Arrange
-            val versionInfoTestItem =
-                VersionInfo(currentVersion = "", isSupported = true, suggestedUpgradeVersion = "")
+            val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = false)
             versionInfo.value = versionInfoTestItem
 
             // Act, Assert
             viewModel.uiState.test {
                 val result = awaitItem()
-                assertEquals(true, result.isUpdateAvailable)
+                assertEquals(false, result.isSupportedVersion)
             }
         }
 }