Merge pull request #3609 from element-hq/feature/bma/slidingSyncCheck

bmarty · web-flow · commit de6b34dc7a23 · 2024-10-07T15:30:39.000+02:00
Remove supportSlidingSync boolean.
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
@@ -14,5 +14,4 @@ data class AccountProvider(
     val isPublic: Boolean = false,
     val isMatrixOrg: Boolean = false,
     val isValid: Boolean = false,
-    val supportSlidingSync: Boolean = false,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt
@@ -15,8 +15,7 @@ open class AccountProviderProvider : PreviewParameterProvider<AccountProvider> {
         get() = sequenceOf(
             anAccountProvider(),
             anAccountProvider().copy(subtitle = null),
-            anAccountProvider().copy(subtitle = null, title = "no.sliding.sync", supportSlidingSync = false),
-            anAccountProvider().copy(subtitle = null, title = "invalid", isValid = false, supportSlidingSync = false),
+            anAccountProvider().copy(subtitle = null, title = "invalid", isValid = false),
             anAccountProvider().copy(subtitle = null, title = "Other", isPublic = false, isMatrixOrg = false),
             // Add other state here
         )
@@ -28,5 +27,4 @@ fun anAccountProvider() = AccountProvider(
     isPublic = true,
     isMatrixOrg = true,
     isValid = true,
-    supportSlidingSync = true,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt
@@ -12,6 +12,4 @@ data class HomeserverData(
     val homeserverUrl: String,
     // True if a wellknown file has been found and is valid. If false, it means that the [homeserverUrl] is valid
     val isWellknownValid: Boolean,
-    // True if a wellknown file has been found and is valid and is claiming a sliding sync Url
-    val supportSlidingSync: Boolean,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
@@ -29,7 +29,7 @@ class HomeserverResolver @Inject constructor(
     private val dispatchers: CoroutineDispatchers,
     private val wellknownRequest: WellknownRequest,
 ) {
-    suspend fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {
+    fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {
         val flowContext = currentCoroutineContext()
         val trimmedUserInput = userInput.trim()
         if (trimmedUserInput.length < 4) return@flow
@@ -46,13 +46,11 @@ class HomeserverResolver @Inject constructor(
                 }
                 val isValid = wellKnown?.isValid().orFalse()
                 if (isValid) {
-                    val supportSlidingSync = wellKnown?.supportSlidingSync().orFalse()
                     // Emit the list as soon as possible
                     currentList.add(
                         HomeserverData(
                             homeserverUrl = url,
                             isWellknownValid = true,
-                            supportSlidingSync = supportSlidingSync
                         )
                     )
                     withContext(flowContext) {
@@ -68,7 +66,6 @@ class HomeserverResolver @Inject constructor(
                     HomeserverData(
                         homeserverUrl = trimmedUserInput,
                         isWellknownValid = false,
-                        supportSlidingSync = false,
                     )
                 )
             )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt
@@ -21,9 +21,6 @@ import kotlinx.serialization.Serializable
  *     "m.identity_server": {
  *         "base_url": "https://vector.im"
  *     },
- *     "org.matrix.msc3575.proxy": {
- *         "url": "https://slidingsync.lab.matrix.org"
- *     }
  * }
  * </pre>
  * .
@@ -34,14 +31,8 @@ data class WellKnown(
     val homeServer: WellKnownBaseConfig? = null,
     @SerialName("m.identity_server")
     val identityServer: WellKnownBaseConfig? = null,
-    @SerialName("org.matrix.msc3575.proxy")
-    val slidingSyncProxy: WellKnownSlidingSyncConfig? = null,
 ) {
     fun isValid(): Boolean {
         return homeServer?.baseURL?.isNotBlank().orFalse()
     }
-
-    fun supportSlidingSync(): Boolean {
-        return slidingSyncProxy?.url?.isNotBlank().orFalse()
-    }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownSlidingSyncConfig.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownSlidingSyncConfig.kt
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
@@ -29,7 +29,6 @@ class ChangeAccountProviderPresenter @Inject constructor(
                     isPublic = true,
                     isMatrixOrg = true,
                     isValid = true,
-                    supportSlidingSync = true,
                 )
             ),
             changeServerState = changeServerState,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
@@ -34,20 +34,18 @@ fun aSearchAccountProviderState(
 
 fun aHomeserverDataList(): List<HomeserverData> {
     return listOf(
-        aHomeserverData(isWellknownValid = true, supportSlidingSync = true),
-        aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true, supportSlidingSync = false),
-        aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false, supportSlidingSync = false),
+        aHomeserverData(isWellknownValid = true),
+        aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true),
+        aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false),
     )
 }
 
 fun aHomeserverData(
     homeserverUrl: String = AuthenticationConfig.MATRIX_ORG_URL,
     isWellknownValid: Boolean = true,
-    supportSlidingSync: Boolean = true,
 ): HomeserverData {
     return HomeserverData(
         homeserverUrl = homeserverUrl,
         isWellknownValid = isWellknownValid,
-        supportSlidingSync = supportSlidingSync,
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -196,7 +196,6 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {
         isPublic = isMatrixOrg,
         isMatrixOrg = isMatrixOrg,
         isValid = isWellknownValid,
-        supportSlidingSync = supportSlidingSync,
     )
 }
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
@@ -46,7 +46,6 @@ class ChangeAccountProviderPresenterTest {
                         isPublic = true,
                         isMatrixOrg = true,
                         isValid = true,
-                        supportSlidingSync = true,
                     )
                 )
             )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
@@ -17,7 +17,6 @@ import io.element.android.features.login.impl.resolver.HomeserverResolver
 import io.element.android.features.login.impl.resolver.network.FakeWellknownRequest
 import io.element.android.features.login.impl.resolver.network.WellKnown
 import io.element.android.features.login.impl.resolver.network.WellKnownBaseConfig
-import io.element.android.features.login.impl.resolver.network.WellKnownSlidingSyncConfig
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
@@ -98,50 +97,15 @@ class SearchAccountProviderPresenterTest {
             assertThat(awaitItem().userInputResult).isEqualTo(
                 AsyncData.Success(
                     listOf(
-                        aHomeserverData(homeserverUrl = "https://test.org", isWellknownValid = false, supportSlidingSync = false)
+                        aHomeserverData(homeserverUrl = "https://test.org", isWellknownValid = false)
                     )
                 )
             )
         }
     }
 
     @Test
-    fun `present - enter text one result no sliding sync`() = runTest {
-        val fakeWellknownRequest = FakeWellknownRequest()
-        fakeWellknownRequest.givenResultMap(
-            mapOf(
-                "https://test.org" to aWellKnown().copy(slidingSyncProxy = null),
-            )
-        )
-        val changeServerPresenter = ChangeServerPresenter(
-            FakeMatrixAuthenticationService(),
-            AccountProviderDataSource()
-        )
-        val presenter = SearchAccountProviderPresenter(
-            HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRequest),
-            changeServerPresenter
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("test"))
-            val withInputState = awaitItem()
-            assertThat(withInputState.userInput).isEqualTo("test")
-            assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
-            assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java)
-            assertThat(awaitItem().userInputResult).isEqualTo(
-                AsyncData.Success(
-                    listOf(
-                        aHomeserverData(homeserverUrl = "https://test.org", isWellknownValid = true, supportSlidingSync = false)
-                    )
-                )
-            )
-        }
-    }
-
-    @Test
-    fun `present - enter text one result with sliding sync`() = runTest {
+    fun `present - enter text one result with wellknown`() = runTest {
         val fakeWellknownRequest = FakeWellknownRequest()
         fakeWellknownRequest.givenResultMap(
             mapOf(
@@ -183,9 +147,6 @@ class SearchAccountProviderPresenterTest {
             identityServer = WellKnownBaseConfig(
                 baseURL = A_HOMESERVER_URL
             ),
-            slidingSyncProxy = WellKnownSlidingSyncConfig(
-                url = A_HOMESERVER_URL
-            )
         )
     }
 }
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5395f34b153a3c453c95970f326e701e7e5619b53b9bf38dd6a9cff107e28407
-size 8460
+oid sha256:5fb195657c1ac0379839bba6acc0935f6b1b946714ba252d5797fd4bc0c514db
+size 6753
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fb195657c1ac0379839bba6acc0935f6b1b946714ba252d5797fd4bc0c514db
-size 6753
+oid sha256:6d742af6422e7f5ce0070831e921180006a5b48d52c042fdc52030435597f242
+size 5835
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_4_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:daed25bb59f0cca8d4bdb5139a177904a407b7d42f9e2d7053fd6f7362c141bf
-size 8372
+oid sha256:ec5654de38a98ee4b078aa3dfa093a686cb89a2f200eb69f59e78041eb8b2f60
+size 6743
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec5654de38a98ee4b078aa3dfa093a686cb89a2f200eb69f59e78041eb8b2f60
-size 6743
+oid sha256:b4731443df36855c8785072a8085fc9968ec231ff46ff24012b0ae72cd084e46
+size 5867
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_4_en.png

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,4 @@ data class AccountProvider(`
`14`	`14`	`val isPublic: Boolean = false,`
`15`	`15`	`val isMatrixOrg: Boolean = false,`
`16`	`16`	`val isValid: Boolean = false,`
`17`		`- val supportSlidingSync: Boolean = false,`
`18`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,4 @@ data class HomeserverData(`
`12`	`12`	`val homeserverUrl: String,`
`13`	`13`	`// True if a wellknown file has been found and is valid. If false, it means that the [homeserverUrl] is valid`
`14`	`14`	`val isWellknownValid: Boolean,`
`15`		`- // True if a wellknown file has been found and is valid and is claiming a sliding sync Url`
`16`		`- val supportSlidingSync: Boolean,`
`17`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class HomeserverResolver @Inject constructor(`
`29`	`29`	`private val dispatchers: CoroutineDispatchers,`
`30`	`30`	`private val wellknownRequest: WellknownRequest,`
`31`	`31`	`) {`
`32`		`- suspend fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {`
	`32`	`+ fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {`
`33`	`33`	`val flowContext = currentCoroutineContext()`
`34`	`34`	`val trimmedUserInput = userInput.trim()`
`35`	`35`	`if (trimmedUserInput.length < 4) return@flow`
`@@ -46,13 +46,11 @@ class HomeserverResolver @Inject constructor(`
`46`	`46`	`}`
`47`	`47`	`val isValid = wellKnown?.isValid().orFalse()`
`48`	`48`	`if (isValid) {`
`49`		`- val supportSlidingSync = wellKnown?.supportSlidingSync().orFalse()`
`50`	`49`	`// Emit the list as soon as possible`
`51`	`50`	`currentList.add(`
`52`	`51`	`HomeserverData(`
`53`	`52`	`homeserverUrl = url,`
`54`	`53`	`isWellknownValid = true,`
`55`		`- supportSlidingSync = supportSlidingSync`
`56`	`54`	`)`
`57`	`55`	`)`
`58`	`56`	`withContext(flowContext) {`
`@@ -68,7 +66,6 @@ class HomeserverResolver @Inject constructor(`
`68`	`66`	`HomeserverData(`
`69`	`67`	`homeserverUrl = trimmedUserInput,`
`70`	`68`	`isWellknownValid = false,`
`71`		`- supportSlidingSync = false,`
`72`	`69`	`)`
`73`	`70`	`)`
`74`	`71`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ class ChangeAccountProviderPresenter @Inject constructor(`
`29`	`29`	`isPublic = true,`
`30`	`30`	`isMatrixOrg = true,`
`31`	`31`	`isValid = true,`
`32`		`- supportSlidingSync = true,`
`33`	`32`	`)`
`34`	`33`	`),`
`35`	`34`	`changeServerState = changeServerState,`
Original file line number	Diff line number	Diff line change
`@@ -34,20 +34,18 @@ fun aSearchAccountProviderState(`
`34`	`34`
`35`	`35`	`fun aHomeserverDataList(): List<HomeserverData> {`
`36`	`36`	`return listOf(`
`37`		`- aHomeserverData(isWellknownValid = true, supportSlidingSync = true),`
`38`		`- aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true, supportSlidingSync = false),`
`39`		`- aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false, supportSlidingSync = false),`
	`37`	`+ aHomeserverData(isWellknownValid = true),`
	`38`	`+ aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true),`
	`39`	`+ aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false),`
`40`	`40`	`)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`fun aHomeserverData(`
`44`	`44`	`homeserverUrl: String = AuthenticationConfig.MATRIX_ORG_URL,`
`45`	`45`	`isWellknownValid: Boolean = true,`
`46`		`- supportSlidingSync: Boolean = true,`
`47`	`46`	`): HomeserverData {`
`48`	`47`	`return HomeserverData(`
`49`	`48`	`homeserverUrl = homeserverUrl,`
`50`	`49`	`isWellknownValid = isWellknownValid,`
`51`		`- supportSlidingSync = supportSlidingSync,`
`52`	`50`	`)`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,6 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {`
`196`	`196`	`isPublic = isMatrixOrg,`
`197`	`197`	`isMatrixOrg = isMatrixOrg,`
`198`	`198`	`isValid = isWellknownValid,`
`199`		`- supportSlidingSync = supportSlidingSync,`
`200`	`199`	`)`
`201`	`200`	`}`
`202`	`201`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ class ChangeAccountProviderPresenterTest {`
`46`	`46`	`isPublic = true,`
`47`	`47`	`isMatrixOrg = true,`
`48`	`48`	`isValid = true,`
`49`		`- supportSlidingSync = true,`
`50`	`49`	`)`
`51`	`50`	`)`
`52`	`51`	`)`