fix stream agreement no display

netless-io · Sep 18, 2024 · 1560a33 · 1560a33
1 parent 3ee4c6f
commit 1560a33
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/app/src/main/java/io/agora/flat/data/AppEnv.kt b/app/src/main/java/io/agora/flat/data/AppEnv.kt
@@ -59,6 +59,7 @@ class AppEnv @Inject constructor(@ApplicationContext context: Context) {
             loginConfig = LoginConfig(google = false),
 
             showIcp = true,
+            showStreamAgreement = true,
         )
 
         envMap[ENV_CN_PROD] = EnvItem(
@@ -82,6 +83,7 @@ class AppEnv @Inject constructor(@ApplicationContext context: Context) {
             loginConfig = LoginConfig(google = false),
 
             showIcp = true,
+            showStreamAgreement = true,
         )
 
         envMap[ENV_SG_PROD] = EnvItem(
@@ -184,6 +186,8 @@ class AppEnv @Inject constructor(@ApplicationContext context: Context) {
 
     val showIcp get() = currentEnvItem.showIcp
 
+    val showStreamAgreement get() = currentEnvItem.showStreamAgreement
+
     val agreementsUrl get() = "https://flat-storage.oss-cn-hangzhou.aliyuncs.com/versions/latest/stable/android/agreements.json"
 
     data class EnvItem(
@@ -203,6 +207,7 @@ class AppEnv @Inject constructor(@ApplicationContext context: Context) {
         val loginConfig: LoginConfig = LoginConfig(),
 
         val showIcp: Boolean = false,
+        val showStreamAgreement: Boolean = false,
     )
 }
 

diff --git a/app/src/main/java/io/agora/flat/ui/viewmodel/SettingsViewModel.kt b/app/src/main/java/io/agora/flat/ui/viewmodel/SettingsViewModel.kt
@@ -13,6 +13,7 @@ import io.agora.flat.data.repository.MiscRepository
 import io.agora.flat.data.repository.UserRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -34,12 +35,22 @@ class SettingsViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            _state.value = _state.value.copy(versionCheckResult = versionChecker.forceCheck())
+            val checkResult = versionChecker.forceCheck()
+            _state.update {
+                it.copy(versionCheckResult = checkResult)
+            }
         }
 
-        viewModelScope.launch {
-            val value = miscRepository.getStreamAgreement()
-            _state.value = _state.value.copy(isAgreeStream = value)
+        if (env.showStreamAgreement) {
+            _state.update {
+                it.copy(isAgreeStream = false)
+            }
+            viewModelScope.launch {
+                val value = miscRepository.getStreamAgreement() ?: false
+                _state.update {
+                    it.copy(isAgreeStream = value)
+                }
+            }
         }
     }