mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Upgrade SDK bindings to v26.09.26 (#7780)
* Bump SDK bindings to `v26.09.26` This version contains a fix for issues in `v26.09.25` related to certificate verification. * Fix breaking API changes in the latest bindings * Unify `FeatureFlags.RoomThreadList` with `FeatureFlags.Threads`
This commit is contained in:
committed by
GitHub
parent
5c871c0fc2
commit
306e1cb950
+1
-1
@@ -178,7 +178,7 @@ class MessagesPresenter(
|
|||||||
.collectLatest { value = it.toImmutableList() }
|
.collectLatest { value = it.toImmutableList() }
|
||||||
}
|
}
|
||||||
|
|
||||||
val canOpenThreadList by featureFlagService.isFeatureEnabledFlow(FeatureFlags.RoomThreadList).collectAsState(initial = false)
|
val canOpenThreadList by featureFlagService.isFeatureEnabledFlow(FeatureFlags.Threads).collectAsState(initial = false)
|
||||||
val isCurrentlySharingLiveLocationInRoom by remember { liveLocationShareManager.isCurrentlySharing(room.roomId) }.collectAsState()
|
val isCurrentlySharingLiveLocationInRoom by remember { liveLocationShareManager.isCurrentlySharing(room.roomId) }.collectAsState()
|
||||||
|
|
||||||
val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
|
val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
|
||||||
|
|||||||
+1
-1
@@ -1465,7 +1465,7 @@ class MessagesPresenterTest {
|
|||||||
assertThat(initialState.threads.hasThreads).isFalse()
|
assertThat(initialState.threads.hasThreads).isFalse()
|
||||||
|
|
||||||
// Enable the feature flag, now it should reflect the thread list state
|
// Enable the feature flag, now it should reflect the thread list state
|
||||||
featureFlagService.setFeatureEnabled(FeatureFlags.RoomThreadList, true)
|
featureFlagService.setFeatureEnabled(FeatureFlags.Threads, true)
|
||||||
skipItems(1)
|
skipItems(1)
|
||||||
assertThat(awaitItem().threads.hasThreads).isTrue()
|
assertThat(awaitItem().threads.hasThreads).isTrue()
|
||||||
|
|
||||||
|
|||||||
@@ -183,7 +183,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:26.09.9"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.09.26"
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
||||||
|
|||||||
-7
@@ -116,13 +116,6 @@ enum class FeatureFlags(
|
|||||||
defaultValue = { false },
|
defaultValue = { false },
|
||||||
isFinished = false,
|
isFinished = false,
|
||||||
),
|
),
|
||||||
RoomThreadList(
|
|
||||||
key = "feature.room_thread_list",
|
|
||||||
title = "Add a list of threads in a room",
|
|
||||||
description = "Add a new screen with a list of threads in a room.",
|
|
||||||
defaultValue = { false },
|
|
||||||
isFinished = false,
|
|
||||||
),
|
|
||||||
AutomaticBackPagination(
|
AutomaticBackPagination(
|
||||||
key = "feature.automatic_back_pagination",
|
key = "feature.automatic_back_pagination",
|
||||||
title = "Automatic back pagination of rooms",
|
title = "Automatic back pagination of rooms",
|
||||||
|
|||||||
-1
@@ -28,7 +28,6 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
|
|||||||
}
|
}
|
||||||
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
||||||
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
|
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
|
||||||
is ClientBuildException.InvalidRawKey -> AuthenticationException.Generic(message)
|
|
||||||
is ClientBuildException.WellKnownLookupDisabled -> AuthenticationException.Generic(message)
|
is ClientBuildException.WellKnownLookupDisabled -> AuthenticationException.Generic(message)
|
||||||
}
|
}
|
||||||
is OAuthException -> when (this) {
|
is OAuthException -> when (this) {
|
||||||
|
|||||||
+1
-1
@@ -478,7 +478,7 @@ class JoinedRustRoom(
|
|||||||
widgetSettings = widgetSettings,
|
widgetSettings = widgetSettings,
|
||||||
room = innerRoom,
|
room = innerRoom,
|
||||||
widgetCapabilitiesProvider = object : WidgetCapabilitiesProvider {
|
widgetCapabilitiesProvider = object : WidgetCapabilitiesProvider {
|
||||||
override fun acquireCapabilities(capabilities: WidgetCapabilities): WidgetCapabilities {
|
override suspend fun acquireCapabilities(capabilities: WidgetCapabilities): WidgetCapabilities {
|
||||||
return getElementCallRequiredPermissions(sessionId.value, baseRoom.deviceId.value)
|
return getElementCallRequiredPermissions(sessionId.value, baseRoom.deviceId.value)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-2
@@ -31,7 +31,6 @@ import org.matrix.rustcomponents.sdk.EventOrTransactionId
|
|||||||
import org.matrix.rustcomponents.sdk.QueueWedgeError
|
import org.matrix.rustcomponents.sdk.QueueWedgeError
|
||||||
import org.matrix.rustcomponents.sdk.Reaction
|
import org.matrix.rustcomponents.sdk.Reaction
|
||||||
import org.matrix.rustcomponents.sdk.ShieldState
|
import org.matrix.rustcomponents.sdk.ShieldState
|
||||||
import org.matrix.rustcomponents.sdk.TimelineItemContent
|
|
||||||
import uniffi.matrix_sdk_ui.TimelineEventShieldStateCode
|
import uniffi.matrix_sdk_ui.TimelineEventShieldStateCode
|
||||||
import org.matrix.rustcomponents.sdk.EventSendState as RustEventSendState
|
import org.matrix.rustcomponents.sdk.EventSendState as RustEventSendState
|
||||||
import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
|
import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
|
||||||
@@ -52,7 +51,7 @@ class EventTimelineItemMapper(
|
|||||||
isOwn = isOwn,
|
isOwn = isOwn,
|
||||||
isRemote = isRemote,
|
isRemote = isRemote,
|
||||||
localSendState = localSendState?.map(),
|
localSendState = localSendState?.map(),
|
||||||
reactions = (content as? TimelineItemContent.MsgLike)?.content?.reactions.map(),
|
reactions = reactions.map(),
|
||||||
receipts = readReceipts.map(),
|
receipts = readReceipts.map(),
|
||||||
sender = UserId(sender),
|
sender = UserId(sender),
|
||||||
senderProfile = senderProfile.map(),
|
senderProfile = senderProfile.map(),
|
||||||
|
|||||||
+3
@@ -16,6 +16,7 @@ import org.matrix.rustcomponents.sdk.EventSendState
|
|||||||
import org.matrix.rustcomponents.sdk.EventTimelineItem
|
import org.matrix.rustcomponents.sdk.EventTimelineItem
|
||||||
import org.matrix.rustcomponents.sdk.LazyTimelineItemProvider
|
import org.matrix.rustcomponents.sdk.LazyTimelineItemProvider
|
||||||
import org.matrix.rustcomponents.sdk.ProfileDetails
|
import org.matrix.rustcomponents.sdk.ProfileDetails
|
||||||
|
import org.matrix.rustcomponents.sdk.Reaction
|
||||||
import org.matrix.rustcomponents.sdk.Receipt
|
import org.matrix.rustcomponents.sdk.Receipt
|
||||||
import org.matrix.rustcomponents.sdk.TimelineItemContent
|
import org.matrix.rustcomponents.sdk.TimelineItemContent
|
||||||
import uniffi.matrix_sdk_ui.EventItemOrigin
|
import uniffi.matrix_sdk_ui.EventItemOrigin
|
||||||
@@ -37,6 +38,7 @@ internal fun aRustEventTimelineItem(
|
|||||||
readReceipts: Map<String, Receipt> = emptyMap(),
|
readReceipts: Map<String, Receipt> = emptyMap(),
|
||||||
origin: EventItemOrigin? = EventItemOrigin.SYNC,
|
origin: EventItemOrigin? = EventItemOrigin.SYNC,
|
||||||
canBeRepliedTo: Boolean = true,
|
canBeRepliedTo: Boolean = true,
|
||||||
|
reactions: List<Reaction> = emptyList(),
|
||||||
lazyProvider: LazyTimelineItemProvider = FakeFfiLazyTimelineItemProvider(),
|
lazyProvider: LazyTimelineItemProvider = FakeFfiLazyTimelineItemProvider(),
|
||||||
) = EventTimelineItem(
|
) = EventTimelineItem(
|
||||||
isRemote = isRemote,
|
isRemote = isRemote,
|
||||||
@@ -55,5 +57,6 @@ internal fun aRustEventTimelineItem(
|
|||||||
readReceipts = readReceipts,
|
readReceipts = readReceipts,
|
||||||
origin = origin,
|
origin = origin,
|
||||||
canBeRepliedTo = canBeRepliedTo,
|
canBeRepliedTo = canBeRepliedTo,
|
||||||
|
reactions = reactions,
|
||||||
lazyProvider = lazyProvider,
|
lazyProvider = lazyProvider,
|
||||||
)
|
)
|
||||||
|
|||||||
-1
@@ -27,7 +27,6 @@ internal fun aRustTimelineItemContentMsgLike(
|
|||||||
mentions = null,
|
mentions = null,
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
reactions = emptyList(),
|
|
||||||
threadRoot = null,
|
threadRoot = null,
|
||||||
inReplyTo = null,
|
inReplyTo = null,
|
||||||
threadSummary = null,
|
threadSummary = null,
|
||||||
|
|||||||
Reference in New Issue
Block a user