fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.31 (#5657)
* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.31 * Fix API breaks --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
parent
19dcdc1a0c
commit
2f5d0c340c
4 changed files with 9 additions and 9 deletions
|
|
@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
|
||||||
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
|
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
|
||||||
# All new features should not be implemented in the pull request that upgrades the version, developers should
|
# All new features should not be implemented in the pull request that upgrades the version, developers should
|
||||||
# only fix API breaks and may add some TODOs.
|
# only fix API breaks and may add some TODOs.
|
||||||
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.10.29"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.10.31"
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import org.matrix.rustcomponents.sdk.RequestConfig
|
||||||
import org.matrix.rustcomponents.sdk.Session
|
import org.matrix.rustcomponents.sdk.Session
|
||||||
import org.matrix.rustcomponents.sdk.SlidingSyncVersion
|
import org.matrix.rustcomponents.sdk.SlidingSyncVersion
|
||||||
import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
|
import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
|
||||||
|
import org.matrix.rustcomponents.sdk.SqliteStoreBuilder
|
||||||
import org.matrix.rustcomponents.sdk.use
|
import org.matrix.rustcomponents.sdk.use
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import uniffi.matrix_sdk_crypto.CollectStrategy
|
import uniffi.matrix_sdk_crypto.CollectStrategy
|
||||||
|
|
@ -105,12 +106,13 @@ class RustMatrixClientFactory(
|
||||||
slidingSyncType: ClientBuilderSlidingSync,
|
slidingSyncType: ClientBuilderSlidingSync,
|
||||||
): ClientBuilder {
|
): ClientBuilder {
|
||||||
return clientBuilderProvider.provide()
|
return clientBuilderProvider.provide()
|
||||||
.sessionPaths(
|
.sqliteStore(
|
||||||
dataPath = sessionPaths.fileDirectory.absolutePath,
|
SqliteStoreBuilder(
|
||||||
cachePath = sessionPaths.cacheDirectory.absolutePath,
|
dataPath = sessionPaths.fileDirectory.absolutePath,
|
||||||
|
cachePath = sessionPaths.cacheDirectory.absolutePath,
|
||||||
|
).passphrase(passphrase)
|
||||||
)
|
)
|
||||||
.setSessionDelegate(sessionDelegate)
|
.setSessionDelegate(sessionDelegate)
|
||||||
.sessionPassphrase(passphrase)
|
|
||||||
.userAgent(userAgentProvider.provide())
|
.userAgent(userAgentProvider.provide())
|
||||||
.addRootCertificates(userCertificatesProvider.provides())
|
.addRootCertificates(userCertificatesProvider.provides())
|
||||||
.autoEnableBackups(true)
|
.autoEnableBackups(true)
|
||||||
|
|
|
||||||
|
|
@ -285,7 +285,6 @@ class RustMatrixAuthenticationService(
|
||||||
runCatchingExceptions {
|
runCatchingExceptions {
|
||||||
val client = makeQrCodeLoginClient(
|
val client = makeQrCodeLoginClient(
|
||||||
sessionPaths = emptySessionPaths,
|
sessionPaths = emptySessionPaths,
|
||||||
passphrase = pendingPassphrase,
|
|
||||||
qrCodeData = sdkQrCodeLoginData,
|
qrCodeData = sdkQrCodeLoginData,
|
||||||
)
|
)
|
||||||
client.loginWithQrCode(
|
client.loginWithQrCode(
|
||||||
|
|
@ -344,7 +343,6 @@ class RustMatrixAuthenticationService(
|
||||||
|
|
||||||
private suspend fun makeQrCodeLoginClient(
|
private suspend fun makeQrCodeLoginClient(
|
||||||
sessionPaths: SessionPaths,
|
sessionPaths: SessionPaths,
|
||||||
passphrase: String?,
|
|
||||||
qrCodeData: QrCodeData,
|
qrCodeData: QrCodeData,
|
||||||
): Client {
|
): Client {
|
||||||
Timber.d("Creating client for QR Code login with simplified sliding sync")
|
Timber.d("Creating client for QR Code login with simplified sliding sync")
|
||||||
|
|
@ -354,7 +352,6 @@ class RustMatrixAuthenticationService(
|
||||||
passphrase = pendingPassphrase,
|
passphrase = pendingPassphrase,
|
||||||
slidingSyncType = ClientBuilderSlidingSync.Discovered,
|
slidingSyncType = ClientBuilderSlidingSync.Discovered,
|
||||||
)
|
)
|
||||||
.sessionPassphrase(passphrase)
|
|
||||||
.serverNameOrHomeserverUrl(qrCodeData.serverName()!!)
|
.serverNameOrHomeserverUrl(qrCodeData.serverName()!!)
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import org.matrix.rustcomponents.sdk.ClientSessionDelegate
|
||||||
import org.matrix.rustcomponents.sdk.NoHandle
|
import org.matrix.rustcomponents.sdk.NoHandle
|
||||||
import org.matrix.rustcomponents.sdk.RequestConfig
|
import org.matrix.rustcomponents.sdk.RequestConfig
|
||||||
import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
|
import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
|
||||||
|
import org.matrix.rustcomponents.sdk.SqliteStoreBuilder
|
||||||
import uniffi.matrix_sdk.BackupDownloadStrategy
|
import uniffi.matrix_sdk.BackupDownloadStrategy
|
||||||
import uniffi.matrix_sdk_crypto.CollectStrategy
|
import uniffi.matrix_sdk_crypto.CollectStrategy
|
||||||
import uniffi.matrix_sdk_crypto.DecryptionSettings
|
import uniffi.matrix_sdk_crypto.DecryptionSettings
|
||||||
|
|
@ -29,7 +30,6 @@ class FakeFfiClientBuilder(
|
||||||
override fun decryptionSettings(decryptionSettings: DecryptionSettings): ClientBuilder = this
|
override fun decryptionSettings(decryptionSettings: DecryptionSettings): ClientBuilder = this
|
||||||
override fun disableSslVerification() = this
|
override fun disableSslVerification() = this
|
||||||
override fun homeserverUrl(url: String) = this
|
override fun homeserverUrl(url: String) = this
|
||||||
override fun sessionPassphrase(passphrase: String?) = this
|
|
||||||
override fun proxy(url: String) = this
|
override fun proxy(url: String) = this
|
||||||
override fun requestConfig(config: RequestConfig) = this
|
override fun requestConfig(config: RequestConfig) = this
|
||||||
override fun roomKeyRecipientStrategy(strategy: CollectStrategy) = this
|
override fun roomKeyRecipientStrategy(strategy: CollectStrategy) = this
|
||||||
|
|
@ -42,5 +42,6 @@ class FakeFfiClientBuilder(
|
||||||
override fun username(username: String) = this
|
override fun username(username: String) = this
|
||||||
override fun enableShareHistoryOnInvite(enableShareHistoryOnInvite: Boolean): ClientBuilder = this
|
override fun enableShareHistoryOnInvite(enableShareHistoryOnInvite: Boolean): ClientBuilder = this
|
||||||
override fun threadsEnabled(enabled: Boolean, threadSubscriptions: Boolean): ClientBuilder = this
|
override fun threadsEnabled(enabled: Boolean, threadSubscriptions: Boolean): ClientBuilder = this
|
||||||
|
override fun sqliteStore(config: SqliteStoreBuilder): ClientBuilder = this
|
||||||
override suspend fun build() = buildResult()
|
override suspend fun build() = buildResult()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue