BIT-817: Update storage of Environment on Landing Screen (#203)

app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/Environment.kt

@@ -1,18 +1,15 @@
 package com.x8bit.bitwarden.data.platform.repository.model
 
-import android.os.Parcelable
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
 import com.x8bit.bitwarden.ui.platform.base.util.Text
 import com.x8bit.bitwarden.ui.platform.base.util.asText
-import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.RawValue
 
 /**
  * A higher-level wrapper around [EnvironmentUrlDataJson] that provides type-safety, enumerability,
  * and human-readable labels.
  */
-sealed class Environment : Parcelable {
+sealed class Environment {
     /**
      * The [Type] of the environment.
      */
@@ -31,7 +28,6 @@ sealed class Environment : Parcelable {
     /**
      * The default US environment.
      */
-    @Parcelize
     data object Us : Environment() {
         override val type: Type get() = Type.US
         override val environmentUrlData: EnvironmentUrlDataJson
@@ -41,7 +37,6 @@ sealed class Environment : Parcelable {
     /**
      * The default EU environment.
      */
-    @Parcelize
     data object Eu : Environment() {
         override val type: Type get() = Type.EU
         override val environmentUrlData: EnvironmentUrlDataJson
@@ -51,9 +46,8 @@ sealed class Environment : Parcelable {
     /**
      * A custom self-hosted environment with a fully configurable [environmentUrlData].
      */
-    @Parcelize
     data class SelfHosted(
-        override val environmentUrlData: @RawValue EnvironmentUrlDataJson,
+        override val environmentUrlData: EnvironmentUrlDataJson,
     ) : Environment() {
         override val type: Type get() = Type.SELF_HOSTED
     }

app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt

@@ -142,7 +142,7 @@ fun LandingScreen(
         Spacer(modifier = Modifier.height(10.dp))
 
         EnvironmentSelector(
-            selectedOption = state.selectedEnvironment.type,
+            selectedOption = state.selectedEnvironmentType,
             onOptionSelected = remember(viewModel) {
                 { viewModel.trySendAction(LandingAction.EnvironmentTypeSelect(it)) }
             },

app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt

@@ -34,7 +34,7 @@ class LandingViewModel @Inject constructor(
             emailInput = authRepository.rememberedEmailAddress.orEmpty(),
             isContinueButtonEnabled = authRepository.rememberedEmailAddress != null,
             isRememberMeEnabled = authRepository.rememberedEmailAddress != null,
-            selectedEnvironment = environmentRepository.environment,
+            selectedEnvironmentType = environmentRepository.environment.type,
             errorDialogState = BasicDialogState.Hidden,
         ),
 ) {
@@ -42,11 +42,19 @@ class LandingViewModel @Inject constructor(
     init {
         // As state updates:
         // - write to saved state handle
-        // - updated selected environment
         stateFlow
             .onEach {
                 savedStateHandle[KEY_STATE] = it
-                environmentRepository.environment = it.selectedEnvironment
+            }
+            .launchIn(viewModelScope)
+
+        // Listen for changes in environment triggered both by this VM and externally.
+        environmentRepository
+            .environmentStateFlow
+            .onEach { environment ->
+                sendAction(
+                    LandingAction.Internal.UpdatedEnvironmentReceive(environment = environment),
+                )
             }
             .launchIn(viewModelScope)
     }
@@ -59,6 +67,9 @@ class LandingViewModel @Inject constructor(
             is LandingAction.RememberMeToggle -> handleRememberMeToggled(action)
             is LandingAction.EmailInputChanged -> handleEmailInputUpdated(action)
             is LandingAction.EnvironmentTypeSelect -> handleEnvironmentTypeSelect(action)
+            is LandingAction.Internal.UpdatedEnvironmentReceive -> {
+                handleUpdatedEnvironmentReceive(action)
+            }
         }
     }
 
@@ -119,9 +130,17 @@ class LandingViewModel @Inject constructor(
             }
         }
 
+        // Update the environment in the repo; the VM state will update accordingly because it is
+        // listening for changes.
+        environmentRepository.environment = environment
+    }
+
+    private fun handleUpdatedEnvironmentReceive(
+        action: LandingAction.Internal.UpdatedEnvironmentReceive,
+    ) {
         mutableStateFlow.update {
             it.copy(
-                selectedEnvironment = environment,
+                selectedEnvironmentType = action.environment.type,
             )
         }
     }
@@ -135,7 +154,7 @@ data class LandingState(
     val emailInput: String,
     val isContinueButtonEnabled: Boolean,
     val isRememberMeEnabled: Boolean,
-    val selectedEnvironment: Environment,
+    val selectedEnvironmentType: Environment.Type,
     val errorDialogState: BasicDialogState,
 ) : Parcelable
 
@@ -200,4 +219,17 @@ sealed class LandingAction {
     data class EnvironmentTypeSelect(
         val environmentType: Environment.Type,
     ) : LandingAction()
+
+    /**
+     * Actions for internal use by the ViewModel.
+     */
+    sealed class Internal : LandingAction() {
+
+        /**
+         * Indicates that there has been a change in [environment].
+         */
+        data class UpdatedEnvironmentReceive(
+            val environment: Environment,
+        ) : Internal()
+    }
 }