Enable free signup for Fdroid

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 ->

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

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

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)