From 287ae046d1d14e87ec30a23c57d36dbda00e0303 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Wed, 24 Jan 2024 13:04:33 +0200
Subject: [PATCH] Enable free signup for Fdroid
---
.../org/futo/circles/auth/feature/log_in/LogInFragment.kt | 1 -
.../sign_up/sign_up_type/SelectSignUpTypeDataSource.kt | 7 +++++--
auth/src/main/res/layout/fragment_log_in.xml | 6 ------
.../main/java/org/futo/circles/core/utils/MatrixUtils.kt | 2 --
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
index e1ea34e4a..36f0c2c50 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
@@ -66,7 +66,6 @@ class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState {
private fun setupViews() {
with(binding) {
- groupSignup.setIsVisible(CirclesAppConfig.isGplayFlavor())
tvDomain.apply {
setAdapter(autocompleteAdapter)
onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
index d723b78c2..a73ca0ea0 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
@@ -6,6 +6,7 @@ import org.futo.circles.auth.R
import org.futo.circles.auth.feature.sign_up.SignUpDataSource
import org.futo.circles.auth.feature.sign_up.SignUpDataSource.Companion.REGISTRATION_FREE_TYPE
import org.futo.circles.auth.feature.sign_up.SignUpDataSource.Companion.REGISTRATION_SUBSCRIPTION_TYPE
+import org.futo.circles.core.base.CirclesAppConfig
import org.futo.circles.core.extensions.createResult
import org.futo.circles.core.provider.MatrixInstanceProvider
import org.futo.circles.core.utils.HomeServerUtils.buildHomeServerConfigFromDomain
@@ -50,8 +51,10 @@ class SelectSignUpTypeDataSource @Inject constructor(
fun getFreeSignupStages(flows: List<List<Stage>>): List<Stage>? =
flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_FREE_TYPE }
- // Must start with org.futo.subscription.google_play
+ // Must start with org.futo.subscription.google_play, available only for gPlay flavor
fun getSubscriptionSignupStages(flows: List<List<Stage>>): List<Stage>? =
- flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_SUBSCRIPTION_TYPE }
+ if (CirclesAppConfig.isGplayFlavor()) {
+ flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_SUBSCRIPTION_TYPE }
+ } else null
}
\ No newline at end of file
diff --git a/auth/src/main/res/layout/fragment_log_in.xml b/auth/src/main/res/layout/fragment_log_in.xml
index 3f5ecbe3b..643b1416a 100644
--- a/auth/src/main/res/layout/fragment_log_in.xml
+++ b/auth/src/main/res/layout/fragment_log_in.xml
@@ -194,12 +194,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
- <androidx.constraintlayout.widget.Group
- android:id="@+id/groupSignup"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:constraint_referenced_ids="tvNotMember, btnSignUp" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt b/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
index d6e393c12..fa57f8681 100644
--- a/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
+++ b/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
@@ -66,8 +66,6 @@ private fun getAllRoomsAndSpacesFilter(membershipFilter: List<Membership>) =
fun getAllJoinedCirclesRoomsAndSpaces(session: Session = MatrixSessionProvider.getSessionOrThrow()) =
session.roomService().getRoomSummaries(getAllRoomsAndSpacesFilter(listOf(Membership.JOIN)))
-fun getAllJoinedCirclesRoomsAndSpacesLiveData(session: Session = MatrixSessionProvider.getSessionOrThrow()) =
- session.roomService().getRoomSummariesLive(getAllRoomsAndSpacesFilter(listOf(Membership.JOIN)))
private fun getAllRoomsFiler(membershipFilter: List<Membership>) = roomSummaryQueryParams {
excludeType = listOf(roomType, spaceType, null)
--
GitLab