Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #3957 from element-hq/feature/fga/rust_sdk_0.2.67

Browse source 
deps : update rust sdk to 0.2.67 and fix breaking changes
This commit is contained in:
ganfra 2024-11-27 16:29:30 +01:00 • committed by GitHub
commit 74f63c3697
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle/libs.versions.toml
View file

@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0" molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.65" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.67"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" } matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" } matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

3
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt
View file

@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.media.MediaSource
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.Client import org.matrix.rustcomponents.sdk.Client
import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
import org.matrix.rustcomponents.sdk.use import org.matrix.rustcomponents.sdk.use
import java.io.File import java.io.File
import org.matrix.rustcomponents.sdk.MediaSource as RustMediaSource import org.matrix.rustcomponents.sdk.MediaSource as RustMediaSource
@ -86,7 +85,7 @@ class RustMediaLoader(
return if (json != null) { return if (json != null) {
RustMediaSource.fromJson(json) RustMediaSource.fromJson(json)
} else { } else {
mediaSourceFromUrl(url) RustMediaSource.fromUrl(url)
} }
} }
} }

3
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt
View file

@ -7,6 +7,7 @@
package io.element.android.libraries.matrix.impl.room.preview package io.element.android.libraries.matrix.impl.room.preview
import io.element.android.libraries.core.bool.orFalse
import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomAlias
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
@ -25,7 +26,7 @@ object RoomPreviewInfoMapper {
avatarUrl = info.avatarUrl, avatarUrl = info.avatarUrl,
numberOfJoinedMembers = info.numJoinedMembers.toLong(), numberOfJoinedMembers = info.numJoinedMembers.toLong(),
roomType = info.roomType.map(), roomType = info.roomType.map(),
isHistoryWorldReadable = info.isHistoryWorldReadable, isHistoryWorldReadable = info.isHistoryWorldReadable.orFalse(),
isJoined = info.membership == Membership.JOINED, isJoined = info.membership == Membership.JOINED,
isInvited = info.membership == Membership.INVITED, isInvited = info.membership == Membership.INVITED,
isPublic = info.joinRule == JoinRule.Public, isPublic = info.joinRule == JoinRule.Public,