Skip to content

Commit c049627

Browse files
committed
Remove unused MatrixClient.availableSlidingSyncVersions().
1 parent 5313f35 commit c049627

File tree

4 files changed

+1
-23
lines changed

4 files changed

+1
-23
lines changed

appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -501,22 +501,16 @@ class LoggedInPresenterTest {
501501

502502
@Test
503503
fun `present - CheckSlidingSyncProxyAvailability forces the sliding sync migration under the right circumstances`() = runTest {
504-
// The migration will be forced if:
505-
// - The user is not using the native sliding sync
506-
// - The sliding sync proxy is no longer supported
507-
// - The native sliding sync is supported
504+
// The migration will be forced if the user is not using the native sliding sync
508505
val matrixClient = FakeMatrixClient(
509506
currentSlidingSyncVersionLambda = { Result.success(SlidingSyncVersion.Proxy) },
510-
availableSlidingSyncVersionsLambda = { Result.success(listOf(SlidingSyncVersion.Native)) },
511507
)
512508
createLoggedInPresenter(
513509
matrixClient = matrixClient,
514510
).test {
515511
val initialState = awaitItem()
516512
assertThat(initialState.forceNativeSlidingSyncMigration).isFalse()
517-
518513
initialState.eventSink(LoggedInEvents.CheckSlidingSyncProxyAvailability)
519-
520514
assertThat(awaitItem().forceNativeSlidingSyncMigration).isTrue()
521515
}
522516
}

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@ interface MatrixClient {
156156
*/
157157
suspend fun currentSlidingSyncVersion(): Result<SlidingSyncVersion>
158158

159-
/**
160-
* Returns the available sliding sync versions for the current user.
161-
*/
162-
suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>>
163-
164159
fun canDeactivateAccount(): Boolean
165160
suspend fun deactivateAccount(password: String, eraseData: Boolean): Result<Unit>
166161

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,6 @@ class RustMatrixClient(
689689
})
690690
}.buffer(Channel.UNLIMITED)
691691

692-
override suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>> = withContext(sessionDispatcher) {
693-
runCatchingExceptions {
694-
innerClient.availableSlidingSyncVersions().map { it.map() }
695-
}
696-
}
697-
698692
override suspend fun currentSlidingSyncVersion(): Result<SlidingSyncVersion> = withContext(sessionDispatcher) {
699693
runCatchingExceptions {
700694
innerClient.session().slidingSyncVersion.map()

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class FakeMatrixClient(
9090
private val canDeactivateAccountResult: () -> Boolean = { lambdaError() },
9191
private val deactivateAccountResult: (String, Boolean) -> Result<Unit> = { _, _ -> lambdaError() },
9292
private val currentSlidingSyncVersionLambda: () -> Result<SlidingSyncVersion> = { lambdaError() },
93-
private val availableSlidingSyncVersionsLambda: () -> Result<List<SlidingSyncVersion>> = { lambdaError() },
9493
private val ignoreUserResult: (UserId) -> Result<Unit> = { lambdaError() },
9594
private var unIgnoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
9695
private val canReportRoomLambda: () -> Boolean = { false },
@@ -339,10 +338,6 @@ class FakeMatrixClient(
339338
return currentSlidingSyncVersionLambda()
340339
}
341340

342-
override suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>> {
343-
return availableSlidingSyncVersionsLambda()
344-
}
345-
346341
override suspend fun canReportRoom(): Boolean {
347342
return canReportRoomLambda()
348343
}

0 commit comments

Comments
 (0)