update login agreement

Author: aderan

app/src/main/java/io/agora/flat/common/version/AgreementFetcher.kt

@@ -0,0 +1,39 @@
+package io.agora.flat.common.version
+
+import com.google.gson.Gson
+import io.agora.flat.common.android.LanguageManager
+import io.agora.flat.data.AppEnv
+import io.agora.flat.data.model.Agreement
+import io.agora.flat.data.model.AgreementsResp
+import io.agora.flat.di.NetworkModule
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import javax.inject.Inject
+
+class AgreementFetcher @Inject constructor(
+    @NetworkModule.NormalOkHttpClient private val client: OkHttpClient,
+    private val appEnv: AppEnv,
+    private val gson: Gson = Gson()  // Facilitates testing by allowing injection.
+) {
+    suspend fun fetchAgreement(): Agreement? = withContext(Dispatchers.IO) {
+        try {
+            val request = Request.Builder().url(appEnv.agreementsUrl).build()
+            client.newCall(request).execute().use { response ->
+                if (response.isSuccessful) {
+                    val respJson = response.body?.string()
+                    if (respJson != null) {
+                        val env = appEnv.getEnv()
+                        val lang = LanguageManager.currentLocale().language
+                        val agreementsResp = gson.fromJson(respJson, AgreementsResp::class.java)
+                        return@withContext agreementsResp.data[env]?.get(lang)
+                    }
+                }
+                null
+            }
+        } catch (e: Exception) {
+            null
+        }
+    }
+}

app/src/main/java/io/agora/flat/data/AppEnv.kt

@@ -184,6 +184,8 @@ class AppEnv @Inject constructor(@ApplicationContext context: Context) {
 
     val showIcp get() = currentEnvItem.showIcp
 
+    val agreementsUrl get() = "https://flat-storage.oss-cn-hangzhou.aliyuncs.com/versions/latest/stable/android/agreements.json"
+
     data class EnvItem(
         val agoraAppId: String,
         val serviceUrl: String,

app/src/main/java/io/agora/flat/data/model/AgreementsResp.kt

@@ -0,0 +1,10 @@
+package io.agora.flat.data.model
+
+data class AgreementsResp(
+    val data: Map<String, Map<String, Agreement>>
+)
+
+data class Agreement(
+    val title: String,
+    val message: String,
+)

app/src/main/java/io/agora/flat/di/NetworkModule.kt

@@ -7,6 +7,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.agora.flat.BuildConfig
+import io.agora.flat.common.version.AgreementFetcher
 import io.agora.flat.common.version.VersionChecker
 import io.agora.flat.data.AppEnv
 import io.agora.flat.data.AppKVCenter
@@ -135,4 +136,13 @@ object NetworkModule {
     ): VersionChecker {
         return VersionChecker(client, appKVCenter, context.getAppVersion(), appEnv.versionCheckUrl)
     }
+
+    @Provides
+    @Singleton
+    fun providerAgreementFetcher(
+        @NormalOkHttpClient client: OkHttpClient,
+        appEnv: AppEnv
+    ): AgreementFetcher {
+        return AgreementFetcher(client, appEnv)
+    }
 }

app/src/main/java/io/agora/flat/ui/activity/LoginActivity.kt

@@ -362,7 +362,14 @@ private fun LoginArea(state: LoginUiState, modifier: Modifier, actioner: (LoginU
             LoginAgreement(
                 modifier = Modifier.padding(horizontal = 24.dp),
                 checked = agreementChecked,
-                onCheckedChange = { agreementChecked = it },
+                onCheckedChange = { target ->
+                    // force show agreement dialog when not checked
+                    if (target) {
+                        showAgreement = true
+                    } else {
+                        agreementChecked = target
+                    }
+                },
             )
         }
 
@@ -382,6 +389,7 @@ private fun LoginArea(state: LoginUiState, modifier: Modifier, actioner: (LoginU
 
     if (showAgreement) {
         AgreementDialog(
+            agreement = state.agreement,
             onAgree = {
                 agreementChecked = true
                 showAgreement = false

app/src/main/java/io/agora/flat/ui/activity/login/LoginViewModel.kt

@@ -3,9 +3,11 @@ package io.agora.flat.ui.activity.login
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.agora.flat.common.android.CallingCodeManager
+import io.agora.flat.common.version.AgreementFetcher
 import io.agora.flat.data.AppEnv
 import io.agora.flat.data.AppKVCenter
 import io.agora.flat.data.LoginConfig
+import io.agora.flat.data.model.Agreement
 import io.agora.flat.data.model.PhoneOrEmailInfo
 import io.agora.flat.data.onFailure
 import io.agora.flat.data.onSuccess
@@ -25,12 +27,14 @@ class LoginViewModel @Inject constructor(
     private val userRepository: UserRepository,
     private val appKVCenter: AppKVCenter,
     private val appEnv: AppEnv,
+    private val agreementFetcher: AgreementFetcher,
 ) : BaseAccountViewModel() {
     private val loading = ObservableLoadingCounter()
     private val messageManager = UiMessageManager()
 
     private var _state = MutableStateFlow(
         LoginUiState(
+            agreement = null,
             loginConfig = appEnv.loginConfig,
             inputState = PhoneOrEmailInfo(
                 cc = CallingCodeManager.getDefaultCC(),
@@ -77,6 +81,13 @@ class LoginViewModel @Inject constructor(
                 )
             }
         }
+
+        viewModelScope.launch {
+            val fetchAgreement = agreementFetcher.fetchAgreement()
+            if (fetchAgreement != null) {
+                _state.value = _state.value.copy(agreement = fetchAgreement)
+            }
+        }
     }
 
     fun needBindPhone(): Boolean {
@@ -163,4 +174,5 @@ data class LoginUiState(
     val message: UiMessage? = null,
 
     val loginConfig: LoginConfig = LoginConfig(),
+    val agreement: Agreement? = null,
 )

app/src/main/java/io/agora/flat/ui/compose/FlatAgreement.kt

@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import io.agora.flat.Constants
 import io.agora.flat.R
+import io.agora.flat.data.model.Agreement
 import io.agora.flat.ui.theme.Shapes
 
 @Composable
@@ -55,7 +56,7 @@ fun GlobalAgreementDialog(onAgree: () -> Unit, onRefuse: () -> Unit) {
 }
 
 @Composable
-internal fun AgreementDialog(onAgree: () -> Unit, onRefuse: () -> Unit) {
+internal fun AgreementDialog(agreement: Agreement? = null, onAgree: () -> Unit, onRefuse: () -> Unit) {
     Dialog(onDismissRequest = onRefuse) {
         Surface(
             Modifier.widthIn(max = 400.dp),
@@ -64,7 +65,7 @@ internal fun AgreementDialog(onAgree: () -> Unit, onRefuse: () -> Unit) {
             Column(Modifier.padding(horizontal = 24.dp, vertical = 20.dp)) {
                 FlatTextTitle(stringResource(R.string.login_agreement_dialog_title))
                 FlatNormalVerticalSpacer()
-                LoginAgreementDialogMessage()
+                LoginAgreementDialogMessage(agreement)
                 FlatNormalVerticalSpacer()
                 Row {
                     FlatSmallSecondaryTextButton(stringResource(R.string.refuse), Modifier.weight(1f)) { onRefuse() }
@@ -78,8 +79,8 @@ internal fun AgreementDialog(onAgree: () -> Unit, onRefuse: () -> Unit) {
 
 
 @Composable
-private fun LoginAgreementDialogMessage() {
-    val text = stringResource(R.string.login_agreement_dialog_message)
+private fun LoginAgreementDialogMessage(agreement: Agreement?) {
+    var text = agreement?.message ?: stringResource(R.string.login_agreement_dialog_message)
     val items = listOf(
         ClickableItem(stringResource(R.string.agreement_global_privacy), "privacy", Constants.URL.Privacy),
         ClickableItem(stringResource(R.string.agreement_global_service), "service", Constants.URL.Service)