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

Merge pull request #270 from vector-im/renovate/org.matrix.rustcomponents

Browse source 
Update dependency org.matrix.rustcomponents:sdk-android to v0.1.5
This commit is contained in:
Benoit Marty 2023-03-29 12:03:40 +02:00 • committed by GitHub
commit 3dd4a54f5f
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle/libs.versions.toml
View file

@ -125,7 +125,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" } molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.4" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.5"
sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" } sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" }

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

@ -223,9 +223,9 @@ class RustMatrixClient constructor(
): Result<ByteArray> = ): Result<ByteArray> =
withContext(dispatchers.io) { withContext(dispatchers.io) {
runCatching { runCatching {
mediaSourceFromUrl(url).use { source -> mediaSourceFromUrl(url).use { mediaSource ->
client.getMediaThumbnail( client.getMediaThumbnail(
source = source, mediaSource = mediaSource,
width = width.toULong(), width = width.toULong(),
height = height.toULong() height = height.toULong()
).toUByteArray().toByteArray() ).toUByteArray().toByteArray()

15
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomMemberMapper.kt
View file

@ -25,13 +25,13 @@ object RoomMemberMapper {
fun map(roomMember: RustRoomMember): RoomMember = fun map(roomMember: RustRoomMember): RoomMember =
RoomMember( RoomMember(
roomMember.userId, roomMember.userId(),
roomMember.displayName, roomMember.displayName(),
roomMember.avatarUrl, roomMember.avatarUrl(),
mapMembership(roomMember.membership), mapMembership(roomMember.membership()),
roomMember.isNameAmbiguous, roomMember.isNameAmbiguous(),
roomMember.powerLevel, roomMember.powerLevel(),
roomMember.normalizedPowerLevel, roomMember.normalizedPowerLevel(),
) )
fun mapMembership(membershipState: RustMembershipState): RoomMembershipState = fun mapMembership(membershipState: RustMembershipState): RoomMembershipState =
@ -42,5 +42,4 @@ object RoomMemberMapper {
RustMembershipState.KNOCK -> RoomMembershipState.KNOCK RustMembershipState.KNOCK -> RoomMembershipState.KNOCK
RustMembershipState.LEAVE -> RoomMembershipState.LEAVE RustMembershipState.LEAVE -> RoomMembershipState.LEAVE
} }
} }

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt
View file

@ -53,7 +53,7 @@ internal class RustRoomSummaryDataSource(
private val coroutineScope = CoroutineScope(SupervisorJob() + coroutineDispatchers.io) private val coroutineScope = CoroutineScope(SupervisorJob() + coroutineDispatchers.io)
private val roomSummaries = MutableStateFlow<List<RoomSummary>>(emptyList()) private val roomSummaries = MutableStateFlow<List<RoomSummary>>(emptyList())
private val state = MutableStateFlow(SlidingSyncState.COLD) private val state = MutableStateFlow(SlidingSyncState.NOT_LOADED)
fun init() { fun init() {
coroutineScope.launch { coroutineScope.launch {
@ -101,7 +101,7 @@ internal class RustRoomSummaryDataSource(
private suspend fun didReceiveSyncUpdate(summary: UpdateSummary) { private suspend fun didReceiveSyncUpdate(summary: UpdateSummary) {
Timber.v("UpdateRooms with identifiers: ${summary.rooms}") Timber.v("UpdateRooms with identifiers: ${summary.rooms}")
if (state.value != SlidingSyncState.LIVE) { if (state.value != SlidingSyncState.FULLY_LOADED) {
return return
} }
updateRoomSummaries { updateRoomSummaries {