From 56b187258607bf7e83864ec8a5693bb675e841a2 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Sun, 13 Mar 2022 16:43:12 +0200
Subject: [PATCH] Add default terms item
---
app/src/main/java/com/futo/circles/core/Constants.kt | 3 ++-
.../terms/data_source/AcceptTermsDataSource.kt | 12 +++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/futo/circles/core/Constants.kt b/app/src/main/java/com/futo/circles/core/Constants.kt
index a61385c8f..72c29da76 100644
--- a/app/src/main/java/com/futo/circles/core/Constants.kt
+++ b/app/src/main/java/com/futo/circles/core/Constants.kt
@@ -10,4 +10,5 @@ const val AUTH_EXCEPTION_REASON_KEY = "reason"
const val PENDING_SESSION_PROPERTY_NAME = "pendingSessionData"
const val CURRENT_SESSION_PROPERTY_NAME = "currentSession"
-const val DEFAULT_TERMS_NAME = "Terms and Conditions"
\ No newline at end of file
+const val DEFAULT_TERMS_NAME = "Terms and Conditions"
+const val TERMS_URL_EXTENSION = "_matrix/consent"
diff --git a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt b/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
index 6528ed3bc..1172f0ac1 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
@@ -2,6 +2,9 @@ package com.futo.circles.feature.terms.data_source
import androidx.lifecycle.MutableLiveData
+import com.futo.circles.BuildConfig
+import com.futo.circles.core.DEFAULT_TERMS_NAME
+import com.futo.circles.core.TERMS_URL_EXTENSION
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.createResult
import com.futo.circles.extensions.toTermsListItems
@@ -15,7 +18,7 @@ class AcceptTermsDataSource(
private val signUpDataSource: SignUpDataSource
) {
- val termsListLiveData = MutableLiveData<List<TermsListItem>>(getTermsList())
+ val termsListLiveData = MutableLiveData(getTermsList())
private val wizard by lazy {
MatrixInstanceProvider.matrix.authenticationService().getRegistrationWizard()
@@ -36,5 +39,12 @@ class AcceptTermsDataSource(
private fun getTermsList() =
(signUpDataSource.currentStage as? Stage.Terms)?.policies?.toTermsListItems()
+ ?.takeIf { it.isNotEmpty() }
+ ?: listOf(
+ TermsListItem(
+ 1, DEFAULT_TERMS_NAME,
+ BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
+ )
+ )
}
\ No newline at end of file
--
GitLab